Merge remote-tracking branch 'tip/auto-latest'

[karo-tx-linux.git] / tools / perf / config / feature-checks / Makefile

diff --git a/tools/perf/config/feature-checks/Makefile b/tools/perf/config/feature-checks/Makefile
index 8ecac1908d5e4c2716f5c55a95866d978856fd71..abaf8f4ea93a56f93c9ca7feb3a7c51b2d10ddbc 100644 (file)
--- a/tools/perf/config/feature-checks/Makefile
+++ b/tools/perf/config/feature-checks/Makefile
@@ -23,10 +23,10 @@ FILES=                                      \
        test-libpython-version          \
        test-libslang                   \
        test-libunwind                  \
+       test-libunwind-debug-frame      \
        test-on-exit                    \
        test-stackprotector-all         \
-       test-stackprotector             \
-       test-volatile-register-var
+       test-stackprotector
 
 CC := $(CC) -MD
 
@@ -37,7 +37,7 @@ BUILD = $(CC) $(LDFLAGS) -o $(OUTPUT)$@ $@.c
 ###############################
 
 test-all:
-       $(BUILD) -Werror -fstack-protector -fstack-protector-all -Wvolatile-register-var -O2 -Werror -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma -lunwind -lunwind-x86_64 -lelf -laudit -I/usr/include/slang -lslang $(shell pkg-config --libs --cflags gtk+-2.0 2>/dev/null) $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -DPACKAGE='perf' -DPACKAGE=perf -lbfd -ldl
+       $(BUILD) -Werror -fstack-protector -fstack-protector-all -O2 -Werror -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma -lunwind -lunwind-x86_64 -lelf -laudit -I/usr/include/slang -lslang $(shell pkg-config --libs --cflags gtk+-2.0 2>/dev/null) $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl
 
 test-hello:
        $(BUILD)
@@ -46,10 +46,7 @@ test-stackprotector-all:
        $(BUILD) -Werror -fstack-protector-all
 
 test-stackprotector:
-       $(BUILD) -Werror -fstack-protector
-
-test-volatile-register-var:
-       $(BUILD) -Werror -Wvolatile-register-var
+       $(BUILD) -Werror -fstack-protector -Wstack-protector
 
 test-fortify-source:
        $(BUILD) -O2 -Werror -D_FORTIFY_SOURCE=2
@@ -78,6 +75,9 @@ test-libnuma:
 test-libunwind:
        $(BUILD) -lunwind -lunwind-x86_64 -lelf
 
+test-libunwind-debug-frame:
+       $(BUILD) -lunwind -lunwind-x86_64 -lelf
+
 test-libaudit:
        $(BUILD) -laudit
 
@@ -123,13 +123,13 @@ test-libpython-version:
        $(BUILD) $(FLAGS_PYTHON_EMBED)
 
 test-libbfd:
-       $(BUILD) -DPACKAGE='perf' -DPACKAGE=perf -lbfd -ldl
+       $(BUILD) -DPACKAGE='"perf"' -lbfd -ldl
 
 test-liberty:
-       $(CC) -o $(OUTPUT)$@ test-libbfd.c -DPACKAGE='perf' -DPACKAGE=perf -lbfd -ldl -liberty
+       $(CC) -o $(OUTPUT)$@ test-libbfd.c -DPACKAGE='"perf"' -lbfd -ldl -liberty
 
 test-liberty-z:
-       $(CC) -o $(OUTPUT)$@ test-libbfd.c -DPACKAGE='perf' -DPACKAGE=perf -lbfd -ldl -liberty -lz
+       $(CC) -o $(OUTPUT)$@ test-libbfd.c -DPACKAGE='"perf"' -lbfd -ldl -liberty -lz
 
 test-cplus-demangle:
        $(BUILD) -liberty
@@ -140,7 +140,7 @@ test-on-exit:
 test-backtrace:
        $(BUILD)
 
--include *.d */*.d
+-include *.d
 
 ###############################