Commit 55621ccf authored by Ingo Molnar's avatar Ingo Molnar
Browse files

perf tools: Fix the NO_64BIT build on pure 64-bit systems 



Randy Dunlap reported that 'make NO_64BIT=1' fails to build
a pure 32-b it binary on 64-bit/64-bit x86 systems.

The reason is that we dont pass in the -m32 and GCC defaults
to -m64.

So pass it in - and also extend the warning message about libelf
dependencies - glibc-dev[el] is needed as well beyond the libelf
library.

Reported-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
LKML-Reference: Message-Id: <20091005131729.78444bfb.randy.dunlap@oracle.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent cbef79a8

tools/perf/Makefile

+14 −7
Original line number Diff line number Diff line
@@ -157,10 +157,17 @@ uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') 
uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo not')

uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo not')



# If we're on a 64-bit kernel, use -m64

ifndef NO_64BIT

#

# Add -m32 for cross-builds:

#

ifdef NO_64BIT

  MBITS := -m32

else

  #

  # If we're on a 64-bit kernel, use -m64:

  #

  ifneq ($(patsubst %64,%,$(uname_M)),$(uname_M))

	  M64 := -m64

    MBITS := -m64

  endif

endif
@@ -194,7 +201,7 @@ EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wold-style-definition 
EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wstrict-prototypes

EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wdeclaration-after-statement



CFLAGS = $(M64) -ggdb3 -Wall -Wextra -std=gnu99 -Werror -O6 -fstack-protector-all -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS)

CFLAGS = $(MBITS) -ggdb3 -Wall -Wextra -std=gnu99 -Werror -O6 -fstack-protector-all -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS)

LDFLAGS = -lpthread -lrt -lelf -lm

ALL_CFLAGS = $(CFLAGS)

ALL_LDFLAGS = $(LDFLAGS)
@@ -416,7 +423,7 @@ ifeq ($(uname_S),Darwin) 
endif



ifneq ($(shell sh -c "(echo '\#include <libelf.h>'; echo 'int main(void) { Elf * elf = elf_begin(0, ELF_C_READ_MMAP, 0); return (long)elf; }') | $(CC) -x c - $(ALL_CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -o /dev/null $(ALL_LDFLAGS) > /dev/null 2>&1 && echo y"), y)

	msg := $(error No libelf.h/libelf found, please install libelf-dev/elfutils-libelf-devel);

	msg := $(error No libelf.h/libelf found, please install libelf-dev/elfutils-libelf-devel and glibc-dev[el]);

endif



ifdef NO_DEMANGLE

CRA Git | Maintained and supported by SUSTech CRA and CCSE