From fe534fe8980fa214c410e3661a4216e781073353 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Tue, 10 Nov 2015 12:27:24 -0800 Subject: [PATCH] Add a test for prelink output This test applies to i386 and x86_64 which set R_386_GLOB_DAT and R_X86_64_GLOB_DAT to ELF_RTYPE_CLASS_EXTERN_PROTECTED_DATA. [BZ #19178] * sysdeps/x86/Makefile (tests): Add tst-prelink. (tst-prelink-ENV): New. ($(objpfx)tst-prelink-conflict.out): Likewise. ($(objpfx)tst-prelink-cmp.out): Likewise. (tests-special): Add $(objpfx)tst-prelink-cmp.out. * sysdeps/x86/tst-prelink.c: New file. * sysdeps/x86/tst-prelink.exp: Likewise. --- ChangeLog | 11 +++++++++++ sysdeps/x86/Makefile | 15 +++++++++++++++ sysdeps/x86/tst-prelink.c | 30 ++++++++++++++++++++++++++++++ sysdeps/x86/tst-prelink.exp | 1 + 4 files changed, 57 insertions(+) create mode 100644 sysdeps/x86/tst-prelink.c create mode 100644 sysdeps/x86/tst-prelink.exp diff --git a/ChangeLog b/ChangeLog index 8a0882c661..51faaed4c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2015-11-10 H.J. Lu + + [BZ #19178] + * sysdeps/x86/Makefile (tests): Add tst-prelink. + (tst-prelink-ENV): New. + ($(objpfx)tst-prelink-conflict.out): Likewise. + ($(objpfx)tst-prelink-cmp.out): Likewise. + (tests-special): Add $(objpfx)tst-prelink-cmp.out. + * sysdeps/x86/tst-prelink.c: New file. + * sysdeps/x86/tst-prelink.exp: Likewise. + 2015-11-10 Joseph Myers * math/auto-libm-test-in: Add another test of pow. diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile index 0de4f42168..a2f4f8adf5 100644 --- a/sysdeps/x86/Makefile +++ b/sysdeps/x86/Makefile @@ -7,4 +7,19 @@ sysdep-dl-routines += dl-get-cpu-features tests += tst-get-cpu-features tests-static += tst-get-cpu-features-static + +tests += tst-prelink +tst-prelink-ENV = LD_TRACE_PRELINKING=1 + +$(objpfx)tst-prelink-conflict.out: $(objpfx)tst-prelink.out + grep stdout $< | grep conflict | $(AWK) '{ print $$10, $$11 }' > $@ + +$(objpfx)tst-prelink-cmp.out: $(..)sysdeps/x86/tst-prelink.exp \ + $(objpfx)tst-prelink-conflict.out + cmp $^ > $@; \ + $(evaluate-test) + +ifeq ($(run-built-tests),yes) +tests-special += $(objpfx)tst-prelink-cmp.out +endif endif diff --git a/sysdeps/x86/tst-prelink.c b/sysdeps/x86/tst-prelink.c new file mode 100644 index 0000000000..ab61c4ef31 --- /dev/null +++ b/sysdeps/x86/tst-prelink.c @@ -0,0 +1,30 @@ +/* Test the output from the environment variable, LD_TRACE_PRELINKING, + for prelink. + Copyright (C) 2015 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include + +static int +do_test (void) +{ + fprintf (stdout, "hello\n"); + return 0; +} + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/sysdeps/x86/tst-prelink.exp b/sysdeps/x86/tst-prelink.exp new file mode 100644 index 0000000000..b35b4c9705 --- /dev/null +++ b/sysdeps/x86/tst-prelink.exp @@ -0,0 +1 @@ +/0 stdout