Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78e9d655 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

tools/perf/build: Split out feature check: 'bionic' 

Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lkml.kernel.org/n/tip-xjfVewprrfhlo2wuzbnpVb1k@git.kernel.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 1ea6f99e

tools/perf/config/Makefile

+7 −5
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ FEATURE_TESTS = \ 
	stackprotector			\

	volatile-register-var		\

	fortify-source			\

	bionic				\

	libnuma



$(foreach test,$(FEATURE_TESTS),$(call feature_check,$(test),$(test)))
@@ -150,12 +151,13 @@ CFLAGS += -I$(LIB_INCLUDE) 
CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE



ifndef NO_BIONIC

ifeq ($(call try-cc,$(SOURCE_BIONIC),$(CFLAGS),bionic),y)

  $(feature_check,bionic)

  ifeq ($(feature-bionic), 1)

    BIONIC := 1

    EXTLIBS := $(filter-out -lrt,$(EXTLIBS))

    EXTLIBS := $(filter-out -lpthread,$(EXTLIBS))

  endif

endif # NO_BIONIC

endif



ifdef NO_LIBELF

  NO_DWARF := 1

tools/perf/config/feature-checks/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ FILES= \ 
	test-stackprotector		\

	test-volatile-register-var	\

	test-fortify-source		\

	test-bionic			\

	test-libnuma



CC := $(CC) -MD
@@ -30,6 +31,9 @@ test-volatile-register-var: 
test-fortify-source:

	$(BUILD) -O2 -Werror -D_FORTIFY_SOURCE=2



test-bionic:

	$(BUILD)



test-libnuma:

	$(BUILD) -lnuma

tools/perf/config/feature-checks/test-bionic.c

0 → 100644
+6 −0
Original line number Diff line number Diff line 
#include <android/api-level.h>



int main(void)

{

	return __ANDROID_API__;

}