From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:42923 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751892AbbEBRDK (ORCPT ); Sat, 2 May 2015 13:03:10 -0400 Subject: Patch "perf tools: Fix perf-read-vdsox32 not building and lib64 install dir" has been added to the 4.0-stable tree To: hjl.tools@gmail.com, acme@redhat.com, adrian.hunter@intel.com, gregkh@linuxfoundation.org, jolsa@kernel.org Cc: , From: Date: Sat, 02 May 2015 19:01:19 +0200 Message-ID: <143058607917594@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled perf tools: Fix perf-read-vdsox32 not building and lib64 install dir to the 4.0-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: perf-tools-fix-perf-read-vdsox32-not-building-and-lib64-install-dir.patch and it can be found in the queue-4.0 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 76aea7731e7050c066943a1d7456ec6510702601 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Tue, 17 Mar 2015 15:27:48 -0700 Subject: perf tools: Fix perf-read-vdsox32 not building and lib64 install dir From: "H.J. Lu" commit 76aea7731e7050c066943a1d7456ec6510702601 upstream. Commit: c6e5e9fbc3ea ("perf tools: Fix building error in x86_64 when dwarf unwind is on") removed the definition of IS_X86_64 but not all places using it, with the consequence that perf-read-vdsox32 would not be built anymore, and the default lib install directory was 'lib' instead of 'lib64'. Also needs to go to v3.19. Signed-off-by: H.J. Lu Acked-by: Adrian Hunter Acked-by: Jiri Olsa Link: http://lkml.kernel.org/r/CAMe9rOqpGVq3D88w+D15ef7sv6G6k57ZeTvxBm46=WFgzo9p1w@mail.gmail.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Greg Kroah-Hartman --- tools/perf/config/Makefile | 4 ++-- tools/perf/tests/make | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile @@ -651,7 +651,7 @@ ifeq (${IS_64_BIT}, 1) NO_PERF_READ_VDSO32 := 1 endif endif - ifneq (${IS_X86_64}, 1) + ifneq ($(ARCH), x86) NO_PERF_READ_VDSOX32 := 1 endif ifndef NO_PERF_READ_VDSOX32 @@ -699,7 +699,7 @@ sysconfdir = $(prefix)/etc ETC_PERFCONFIG = etc/perfconfig endif ifndef lib -ifeq ($(IS_X86_64),1) +ifeq ($(ARCH)$(IS_64_BIT), x861) lib = lib64 else lib = lib --- a/tools/perf/tests/make +++ b/tools/perf/tests/make @@ -5,7 +5,7 @@ include config/Makefile.arch # FIXME looks like x86 is the only arch running tests ;-) # we need some IS_(32/64) flag to make this generic -ifeq ($(IS_X86_64),1) +ifeq ($(ARCH)$(IS_64_BIT), x861) lib = lib64 else lib = lib Patches currently in stable-queue which might be from hjl.tools@gmail.com are queue-4.0/perf-tools-fix-perf-read-vdsox32-not-building-and-lib64-install-dir.patch