diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | conform/Makefile | 23 |
2 files changed, 26 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index 49e0ae7fed..fe64cc2d65 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,17 @@ 2016-11-16 Joseph Myers <joseph@codesourcery.com> + * conform/Makefile (linknamespace-libs): Rename to + linknamespace-libs-thr. + (linknamespace-libs-posix): New variable. + (linknamespace-libs-xsi): Likewise. + (linknamespace-libs-XPG3): Include libcrypt.a. + (linknamespace-libs-XPG4): Use $(linknamespace-libs-XPG3). + (linknamespace-libs-POSIX): Use $(linknamespace-libs-thr). + (linknamespace-libs-UNIX98): Use $(linknamespace-libs-xsi). + (linknamespace-libs-XOPEN2K): Likewise. + (linknamespace-libs-XOPEN2K8): Likewise. + (linknamespace-libs-POSIX2008): Use $(linknamespace-libs-posix). + [BZ #20829] * stdio-common/Versions (__snprintf): Add to version GLIBC_PRIVATE. diff --git a/conform/Makefile b/conform/Makefile index 7883624c81..5862f702d2 100644 --- a/conform/Makefile +++ b/conform/Makefile @@ -209,18 +209,23 @@ $(linknamespace-symlists-tests): $(objpfx)symlist-%: list-header-symbols.pl $(evaluate-test) linknamespace-libs-isoc = $(common-objpfx)libc.a $(common-objpfx)math/libm.a -linknamespace-libs = $(linknamespace-libs-isoc) \ - $(common-objpfx)rt/librt.a $(static-thread-library) +linknamespace-libs-thr = $(linknamespace-libs-isoc) \ + $(common-objpfx)rt/librt.a $(static-thread-library) +linknamespace-libs-posix = $(linknamespace-libs-thr) \ + $(common-objpfx)dlfcn/libdl.a +linknamespace-libs-xsi = $(linknamespace-libs-posix) \ + $(common-objpfx)crypt/libcrypt.a linknamespace-libs-ISO = $(linknamespace-libs-isoc) linknamespace-libs-ISO99 = $(linknamespace-libs-isoc) linknamespace-libs-ISO11 = $(linknamespace-libs-isoc) -linknamespace-libs-XPG3 = $(linknamespace-libs-isoc) -linknamespace-libs-XPG4 = $(linknamespace-libs-isoc) -linknamespace-libs-POSIX = $(linknamespace-libs) -linknamespace-libs-UNIX98 = $(linknamespace-libs) -linknamespace-libs-XOPEN2K = $(linknamespace-libs) -linknamespace-libs-POSIX2008 = $(linknamespace-libs) -linknamespace-libs-XOPEN2K8 = $(linknamespace-libs) +linknamespace-libs-XPG3 = $(linknamespace-libs-isoc) \ + $(common-objpfx)crypt/libcrypt.a +linknamespace-libs-XPG4 = $(linknamespace-libs-XPG3) +linknamespace-libs-POSIX = $(linknamespace-libs-thr) +linknamespace-libs-UNIX98 = $(linknamespace-libs-xsi) +linknamespace-libs-XOPEN2K = $(linknamespace-libs-xsi) +linknamespace-libs-POSIX2008 = $(linknamespace-libs-posix) +linknamespace-libs-XOPEN2K8 = $(linknamespace-libs-xsi) $(linknamespace-symlist-stdlibs-tests): $(objpfx)symlist-stdlibs-%: \ $(linknamespace-libs) |