diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | elf/Makefile | 13 | ||||
| -rw-r--r-- | elf/tst-linkall-static.c | 45 |
3 files changed, 63 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 997431eea9..0034c74f9e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2016-10-28 Florian Weimer <fweimer@redhat.com> + + * elf/tst-linkall-static.c: New file. + * elf/Makefile (tests-static): Add tst-linkall-static. + (tst-linkall-static): Link against static libraries. + 2016-10-27 Florian Weimer <fweimer@redhat.com> * malloc/malloc.c (sysmalloc): Initialize previous size field of diff --git a/elf/Makefile b/elf/Makefile index caffd92059..82c7e0559d 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -122,7 +122,8 @@ tests = tst-tls1 tst-tls2 tst-tls9 tst-leaks1 \ tests-static = tst-tls1-static tst-tls2-static tst-stackguard1-static \ tst-leaks1-static tst-array1-static tst-array5-static \ tst-ptrguard1-static tst-dl-iter-static \ - tst-tlsalign-static tst-tlsalign-extern-static + tst-tlsalign-static tst-tlsalign-extern-static \ + tst-linkall-static ifeq (yes,$(build-shared)) tests-static += tst-tls9-static tst-tls9-static-ENV = \ @@ -1278,3 +1279,13 @@ $(objpfx)tst-ldconfig-X.out : tst-ldconfig-X.sh $(objpfx)ldconfig $(evaluate-test) $(objpfx)tst-dlsym-error: $(libdl) + +$(objpfx)tst-linkall-static: \ + $(common-objpfx)math/libm.a \ + $(common-objpfx)crypt/libcrypt.a \ + $(common-objpfx)resolv/libresolv.a \ + $(common-objpfx)dlfcn/libdl.a \ + $(common-objpfx)login/libutil.a \ + $(common-objpfx)rt/librt.a \ + $(common-objpfx)resolv/libanl.a \ + $(static-thread-library) \ diff --git a/elf/tst-linkall-static.c b/elf/tst-linkall-static.c new file mode 100644 index 0000000000..7a4aaccf58 --- /dev/null +++ b/elf/tst-linkall-static.c @@ -0,0 +1,45 @@ +/* Test static linking against multiple libraries, to find symbol conflicts. + Copyright (C) 2016 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; see the file COPYING.LIB. If + not, see <http://www.gnu.org/licenses/>. */ + +#include <math.h> +#include <pthread.h> +#include <crypt.h> +#include <resolv.h> +#include <dlfcn.h> +#include <utmp.h> +#include <aio.h> +#include <netdb.h> + +/* These references force linking the executable against central + functions in the static libraries, pulling significant parts of + each library into the link. */ +void *references[] = + { + &pow, /* libm */ + &pthread_create, /* libpthread */ + &crypt, /* libcrypt */ + &res_send, /* libresolv */ + &dlopen, /* libdl */ + &login, /* libutil */ + &aio_init, /* librt */ + &getaddrinfo_a, /* libanl */ + }; + +/* This is a link-time test. There is nothing to run here. */ +#define TEST_FUNCTION 0 +#include "../test-skeleton.c" |