--- tools/perf/Makefile

+++ tools/perf/Makefile

@@ -2,6 +2,7 @@

all::

# Define V=1 to have a more verbose compile.

+# Define V=2 to have an even more verbose compile.

#

# Define SNPRINTF_RETURNS_BOGUS if your are on a system which snprintf()

# or vsnprintf() return -1 instead of number of characters which would

@@ -145,6 +146,10 @@ all::

# Define NO_EXTERNAL_GREP if you don't want "perf grep" to ever call

# your external grep (e.g., if your system lacks grep, if its grep is

# broken, or spawning external process is slower than built-in grep perf has).

+#

+# Define LDFLAGS=-static to build a static binary.

+#

+# Define EXTRA_CFLAGS=-m64 or EXTRA_CFLAGS=-m32 as appropriate for cross-builds.

PERF-VERSION-FILE: .FORCE-PERF-VERSION-FILE

@$(SHELL_PATH) util/PERF-VERSION-GEN

@@ -157,20 +162,6 @@ uname_R := $(shell sh -c 'uname -r 2>/de

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

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

-#

-# 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))

- MBITS := -m64

- endif

-endif

-

# CFLAGS and LDFLAGS are for the users to override from the command line.

#

@@ -200,8 +191,15 @@ EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wol

EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wstrict-prototypes

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

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

-LDFLAGS = -lpthread -lrt -lelf -lm

+ifeq ("$(origin DEBUG)", "command line")

+ PERF_DEBUG = $(DEBUG)

+endif

+ifndef PERF_DEBUG

+ CFLAGS_OPTIMIZE = -O6

+endif

+

+CFLAGS = -ggdb3 -Wall -Wextra -std=gnu99 -Werror $(CFLAGS_OPTIMIZE) -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS) $(EXTRA_CFLAGS)

+EXTLIBS = -lpthread -lrt -lelf -lm

ALL_CFLAGS = $(CFLAGS)

ALL_LDFLAGS = $(LDFLAGS)

STRIP ?= strip

@@ -254,6 +252,21 @@ PTHREAD_LIBS = -lpthread

# explicitly what architecture to check for. Fix this up for yours..

SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__

+ifeq ($(V), 2)

+ QUIET_STDERR = ">/dev/null"

+else

+ QUIET_STDERR = ">/dev/null 2>&1"

+endif

+

+BITBUCKET = "/dev/null"

+

+ifneq ($(shell sh -c "(echo '\#include <stdio.h>'; echo 'int main(void) { return puts(\"hi\"); }') | $(CC) -x c - $(ALL_CFLAGS) -o $(BITBUCKET) "$(QUIET_STDERR)" && echo y"), y)

+ BITBUCKET = .perf.dev.null

+endif

+

+ifeq ($(shell sh -c "echo 'int foo(void) {char X[2]; return 3;}' | $(CC) -x c -c -Werror -fstack-protector-all - -o $(BITBUCKET) "$(QUIET_STDERR)" && echo y"), y)

+ CFLAGS := $(CFLAGS) -fstack-protector-all

+endif

### --- END CONFIGURATION SECTION ---

@@ -423,36 +436,43 @@ ifeq ($(uname_S),Darwin)

PTHREAD_LIBS =

endif

-ifeq ($(shell sh -c "(echo '\#include <libelf.h>'; echo 'int main(void) { Elf * elf = elf_begin(0, ELF_C_READ, 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)

- 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)

+ifneq ($(shell sh -c "(echo '\#include <gnu/libc-version.h>'; echo 'int main(void) { const char * version = gnu_get_libc_version(); return (long)version; }') | $(CC) -x c - $(ALL_CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -o $(BITBUCKET) $(ALL_LDFLAGS) $(EXTLIBS) "$(QUIET_STDERR)" && echo y"), y)

+ msg := $(error No gnu/libc-version.h found, please install glibc-dev[el]/glibc-static);

+endif

+

+ifeq ($(shell sh -c "(echo '\#include <libelf.h>'; echo 'int main(void) { Elf * elf = elf_begin(0, ELF_C_READ, 0); return (long)elf; }') | $(CC) -x c - $(ALL_CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -o $(BITBUCKET) $(ALL_LDFLAGS) $(EXTLIBS) "$(QUIET_STDERR)" && echo y"), y)

+ 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 $(BITBUCKET) $(ALL_LDFLAGS) $(EXTLIBS) "$(QUIET_STDERR)" && echo y"), y)

BASIC_CFLAGS += -DLIBELF_NO_MMAP

endif

else

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

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

endif

ifdef NO_DEMANGLE

BASIC_CFLAGS += -DNO_DEMANGLE

+else ifdef HAVE_CPLUS_DEMANGLE

+ EXTLIBS += -liberty

+ BASIC_CFLAGS += -DHAVE_CPLUS_DEMANGLE

else

- has_bfd := $(shell sh -c "(echo '\#include <bfd.h>'; echo 'int main(void) { bfd_demangle(0, 0, 0); return 0; }') | $(CC) -x c - $(ALL_CFLAGS) -o /dev/null $(ALL_LDFLAGS) -lbfd > /dev/null 2>&1 && echo y")

+ has_bfd := $(shell sh -c "(echo '\#include <bfd.h>'; echo 'int main(void) { bfd_demangle(0, 0, 0); return 0; }') | $(CC) -x c - $(ALL_CFLAGS) -o $(BITBUCKET) $(ALL_LDFLAGS) $(EXTLIBS) -lbfd "$(QUIET_STDERR)" && echo y")

ifeq ($(has_bfd),y)

EXTLIBS += -lbfd

else

- has_bfd_iberty := $(shell sh -c "(echo '\#include <bfd.h>'; echo 'int main(void) { bfd_demangle(0, 0, 0); return 0; }') | $(CC) -x c - $(ALL_CFLAGS) -o /dev/null $(ALL_LDFLAGS) -lbfd -liberty > /dev/null 2>&1 && echo y")

+ has_bfd_iberty := $(shell sh -c "(echo '\#include <bfd.h>'; echo 'int main(void) { bfd_demangle(0, 0, 0); return 0; }') | $(CC) -x c - $(ALL_CFLAGS) -o $(BITBUCKET) $(ALL_LDFLAGS) $(EXTLIBS) -lbfd -liberty "$(QUIET_STDERR)" && echo y")

ifeq ($(has_bfd_iberty),y)

EXTLIBS += -lbfd -liberty

else

- has_bfd_iberty_z := $(shell sh -c "(echo '\#include <bfd.h>'; echo 'int main(void) { bfd_demangle(0, 0, 0); return 0; }') | $(CC) -x c - $(ALL_CFLAGS) -o /dev/null $(ALL_LDFLAGS) -lbfd -liberty -lz > /dev/null 2>&1 && echo y")

+ has_bfd_iberty_z := $(shell sh -c "(echo '\#include <bfd.h>'; echo 'int main(void) { bfd_demangle(0, 0, 0); return 0; }') | $(CC) -x c - $(ALL_CFLAGS) -o $(BITBUCKET) $(ALL_LDFLAGS) $(EXTLIBS) -lbfd -liberty -lz "$(QUIET_STDERR)" && echo y")

ifeq ($(has_bfd_iberty_z),y)

EXTLIBS += -lbfd -liberty -lz

else

- has_cplus_demangle := $(shell sh -c "(echo 'extern char *cplus_demangle(const char *, int);'; echo 'int main(void) { cplus_demangle(0, 0); return 0; }') | $(CC) -x c - $(ALL_CFLAGS) -o /dev/null $(ALL_LDFLAGS) -liberty > /dev/null 2>&1 && echo y")

+ has_cplus_demangle := $(shell sh -c "(echo 'extern char *cplus_demangle(const char *, int);'; echo 'int main(void) { cplus_demangle(0, 0); return 0; }') | $(CC) -x c - $(ALL_CFLAGS) -o $(BITBUCKET) $(ALL_LDFLAGS) $(EXTLIBS) -liberty "$(QUIET_STDERR)" && echo y")

ifeq ($(has_cplus_demangle),y)

EXTLIBS += -liberty

BASIC_CFLAGS += -DHAVE_CPLUS_DEMANGLE

else

- msg := $(warning No bfd.h/libbfd found, install binutils-dev[el] to gain symbol demangling)

+ msg := $(warning No bfd.h/libbfd found, install binutils-dev[el]/zlib-static to gain symbol demangling)

BASIC_CFLAGS += -DNO_DEMANGLE

endif

endif

@@ -695,7 +715,7 @@ export TAR INSTALL DESTDIR SHELL_PATH

SHELL = $(SHELL_PATH)

-all:: shell_compatibility_test $(ALL_PROGRAMS) $(BUILT_INS) $(OTHER_PROGRAMS) PERF-BUILD-OPTIONS

+all:: .perf.dev.null shell_compatibility_test $(ALL_PROGRAMS) $(BUILT_INS) $(OTHER_PROGRAMS) PERF-BUILD-OPTIONS

ifneq (,$X)

$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) perf$X)), test '$p' -ef '$p$X' || $(RM) '$p';)

endif

@@ -998,6 +1018,11 @@ clean:

.PHONY: .FORCE-PERF-VERSION-FILE TAGS tags cscope .FORCE-PERF-CFLAGS

.PHONY: .FORCE-PERF-BUILD-OPTIONS

+.perf.dev.null:

+ touch .perf.dev.null

+

+.INTERMEDIATE: .perf.dev.null

+

### Make sure built-ins do not have dups and listed in perf.c

#

check-builtins::