diff options
| -rw-r--r-- | Documentation/Makefile | 2 | ||||
| -rw-r--r-- | Documentation/vDSO/Makefile | 17 | ||||
| -rw-r--r-- | tools/testing/selftests/vDSO/.gitignore (renamed from Documentation/vDSO/.gitignore) | 0 | ||||
| -rw-r--r-- | tools/testing/selftests/vDSO/Makefile | 20 | ||||
| -rw-r--r-- | tools/testing/selftests/vDSO/parse_vdso.c (renamed from Documentation/vDSO/parse_vdso.c) | 0 | ||||
| -rw-r--r-- | tools/testing/selftests/vDSO/vdso_standalone_test_x86.c (renamed from Documentation/vDSO/vdso_standalone_test_x86.c) | 0 | ||||
| -rw-r--r-- | tools/testing/selftests/vDSO/vdso_test.c (renamed from Documentation/vDSO/vdso_test.c) | 0 |
7 files changed, 21 insertions, 18 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile index 8cd6d1aaabfa..085b917b4695 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -1,3 +1,3 @@ subdir-y := accounting auxdisplay blackfin \ ia64 laptops mic misc-devices \ - networking pcmcia timers vDSO watchdog + networking pcmcia timers watchdog diff --git a/Documentation/vDSO/Makefile b/Documentation/vDSO/Makefile deleted file mode 100644 index b12e98770e1f..000000000000 --- a/Documentation/vDSO/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -ifndef CROSS_COMPILE -# vdso_test won't build for glibc < 2.16, so disable it -# hostprogs-y := vdso_test -hostprogs-$(CONFIG_X86) := vdso_standalone_test_x86 -vdso_standalone_test_x86-objs := vdso_standalone_test_x86.o parse_vdso.o -vdso_test-objs := parse_vdso.o vdso_test.o - -# Tell kbuild to always build the programs -always := $(hostprogs-y) - -HOSTCFLAGS := -I$(objtree)/usr/include -std=gnu99 -HOSTCFLAGS_vdso_standalone_test_x86.o := -fno-asynchronous-unwind-tables -fno-stack-protector -HOSTLOADLIBES_vdso_standalone_test_x86 := -nostdlib -ifeq ($(CONFIG_X86_32),y) -HOSTLOADLIBES_vdso_standalone_test_x86 += -lgcc_s -endif -endif diff --git a/Documentation/vDSO/.gitignore b/tools/testing/selftests/vDSO/.gitignore index 133bf9ee986c..133bf9ee986c 100644 --- a/Documentation/vDSO/.gitignore +++ b/tools/testing/selftests/vDSO/.gitignore diff --git a/tools/testing/selftests/vDSO/Makefile b/tools/testing/selftests/vDSO/Makefile new file mode 100644 index 000000000000..706b68b1c372 --- /dev/null +++ b/tools/testing/selftests/vDSO/Makefile @@ -0,0 +1,20 @@ +ifndef CROSS_COMPILE +CFLAGS := -std=gnu99 +CFLAGS_vdso_standalone_test_x86 := -nostdlib -fno-asynchronous-unwind-tables -fno-stack-protector +ifeq ($(CONFIG_X86_32),y) +LDLIBS += -lgcc_s +endif + +TEST_PROGS := vdso_test vdso_standalone_test_x86 + +all: $(TEST_PROGS) +vdso_test: parse_vdso.c vdso_test.c +vdso_standalone_test_x86: vdso_standalone_test_x86.c parse_vdso.c + $(CC) $(CFLAGS) $(CFLAGS_vdso_standalone_test_x86) \ + vdso_standalone_test_x86.c parse_vdso.c \ + -o vdso_standalone_test_x86 + +include ../lib.mk +clean: + rm -fr $(TEST_PROGS) +endif diff --git a/Documentation/vDSO/parse_vdso.c b/tools/testing/selftests/vDSO/parse_vdso.c index 1dbb4b87268f..1dbb4b87268f 100644 --- a/Documentation/vDSO/parse_vdso.c +++ b/tools/testing/selftests/vDSO/parse_vdso.c diff --git a/Documentation/vDSO/vdso_standalone_test_x86.c b/tools/testing/selftests/vDSO/vdso_standalone_test_x86.c index 93b0ebf8cc38..93b0ebf8cc38 100644 --- a/Documentation/vDSO/vdso_standalone_test_x86.c +++ b/tools/testing/selftests/vDSO/vdso_standalone_test_x86.c diff --git a/Documentation/vDSO/vdso_test.c b/tools/testing/selftests/vDSO/vdso_test.c index 8daeb7d7032c..8daeb7d7032c 100644 --- a/Documentation/vDSO/vdso_test.c +++ b/tools/testing/selftests/vDSO/vdso_test.c |