From 6266fd7804dd3bd1134c2228a307d3838ebbb651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Thu, 14 Jan 2016 20:24:01 -0300 Subject: glibc-static: add pkg to [libre] repo --- libre/glibc-static/PKGBUILD | 92 +++ libre/glibc-static/glibc-2.22-roundup.patch | 1097 +++++++++++++++++++++++++++ 2 files changed, 1189 insertions(+) create mode 100644 libre/glibc-static/PKGBUILD create mode 100644 libre/glibc-static/glibc-2.22-roundup.patch diff --git a/libre/glibc-static/PKGBUILD b/libre/glibc-static/PKGBUILD new file mode 100644 index 000000000..dc2cd3233 --- /dev/null +++ b/libre/glibc-static/PKGBUILD @@ -0,0 +1,92 @@ +# Maintainer: Márcio Silva +# based of glibc + +_pkgname=glibc +pkgname=glibc-static +pkgver=2.22 +pkgrel=4 +pkgdesc="GNU C Library (static libraries only)" +arch=('i686' 'x86_64' 'armv7h') +url="http://www.gnu.org/software/libc" +license=('GPL' 'LGPL') +depends=('glibc') +makedepends=('gcc>=5.2') +options=('!strip' '!docs' 'staticlibs' '!emptydirs') +source=(http://ftp.gnu.org/gnu/libc/${_pkgname}-${pkgver}.tar.xz{,.sig} + glibc-2.22-roundup.patch) +md5sums=('e51e02bf552a0a1fbbdc948fb2f5e83c' + 'SKIP' + '8476d7f2bceaacde30ea2b9d4afb4bd1') +validpgpkeys=('F37CDAB708E65EA183FD1AF625EF0A436C2A4AFF') # Carlos O'Donell + +prepare() { + cd ${srcdir}/glibc-${pkgver} + + # glibc-2.21..g2b529a8 + patch -p1 -i $srcdir/glibc-2.22-roundup.patch + + mkdir ${srcdir}/glibc-build +} + +build() { + cd ${srcdir}/glibc-build + + if [[ ${CARCH} = "i686" ]]; then + # Hack to fix NPTL issues with Xen, only required on 32bit platforms + # TODO: make separate glibc-xen package for i686 + export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs" + fi + + echo "slibdir=/usr/lib" >> configparms + echo "rtlddir=/usr/lib" >> configparms + + # remove hardening options for building libraries + CFLAGS=${CFLAGS/-fstack-protector-strong/} + CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2/} + + ${srcdir}/${_pkgname}-${pkgver}/configure --prefix=/usr \ + --libdir=/usr/lib \ + --with-headers=/usr/include \ + --with-bugurl=https://labs.parabola.no/ \ + --enable-add-ons \ + --enable-obsolete-rpc \ + --enable-kernel=2.6.32 \ + --enable-bind-now --disable-profile \ + --enable-stackguard-randomization \ + --enable-lock-elision \ + --enable-multi-arch \ + --disable-werror + + # build libraries with hardening disabled + echo "build-programs=no" >> configparms + make + + # re-enable hardening for programs + sed -i "/build-programs=/s#no#yes#" configparms + echo "CC += -fstack-protector-strong -D_FORTIFY_SOURCE=2" >> configparms + echo "CXX += -fstack-protector-strong -D_FORTIFY_SOURCE=2" >> configparms + make + + # remove harding in preparation to run test-suite + sed -i '5,7d' configparms +} + +check() { + cd ${srcdir}/glibc-build + + # some failures are "expected" + make check || true +} + +package() { + cd ${srcdir}/glibc-build + + make install_root=${pkgdir} install + + rm -vr ${pkgdir}/{etc,sbin,usr/{bin,lib/{audit,gconv},include,libexec,share,sbin},var} + rm -v ${pkgdir}/usr/lib/*.o + rm -v ${pkgdir}/usr/lib/*.so* + rm -v ${pkgdir}/usr/lib/lib{c{,_nonshared},crypt,dl,g,ieee,m,mcheck,pthread{,_nonshared},rpcsvc}.a + + strip $STRIP_STATIC ${pkgdir}/usr/lib/*.a +} diff --git a/libre/glibc-static/glibc-2.22-roundup.patch b/libre/glibc-static/glibc-2.22-roundup.patch new file mode 100644 index 000000000..46847942c --- /dev/null +++ b/libre/glibc-static/glibc-2.22-roundup.patch @@ -0,0 +1,1097 @@ +diff --git a/ChangeLog b/ChangeLog +index cb9124e..491d5c7 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,130 @@ ++2015-10-09 Carlos O'Donell ++ ++ [BZ #18589] ++ * string/bug-strcoll2.c: Adjust copyright, and remove contributed by. ++ * string/Makefile ($(objpfx)bug-strcoll2.out): Depend on ++ $(gen-locales). ++ ++2015-10-08 Carlos O'Donell ++ ++ [BZ #18589] ++ * string/Makefile (tests): Add bug-strcoll2. ++ (LOCALES): Add cs_CZ.UTF-8. ++ ++2015-09-28 Martin Sebor ++ ++ [BZ #18969] ++ * string/Makefile (LOCALES): Define. ++ (gen-locales.mk): Include. ++ (test-strcasecmp.out, test-strncasecmp.out, tst-strxfrm.out) ++ (tst-strxfrm2.out): Add deppendency on $(gen-locales). ++ * string/tst-strxfrm2.c (do_test): Print the name of the locale ++ on setlocale failure. ++ ++2015-10-08 Carlos O'Donell ++ ++ [BZ #18589] ++ * string/bug-strcoll2.c: New file. ++ * locale/categories.def: Revert commit ++ f13c2a8dff2329c6692a80176262ceaaf8a6f74e. ++ * locale/langinfo.h: Likewise. ++ * locale/localeinfo.h: Likewise. ++ * locale/C-collate.c: Likewise. ++ * programs/ld-collate.c (collate_output): Likewise. ++ * string/strcoll_l.c (STRDIFF): Likewise. ++ (STRCOLL): Likewise. ++ * wcsmbs/wcscoll_l.c: Likewise. ++ ++2015-09-15 Roland McGrath ++ ++ * misc/sys/param.h [!MAXHOSTNAMELEN && HOST_NAME_MAX] ++ (MAXHOSTNAMELEN): Define it to HOST_NAME_MAX. ++ ++2015-09-11 Roland McGrath ++ ++ * sysdeps/nacl/Makefile [$(subdir) = misc] (sysdep_headers): ++ Use 'override' keyword to freeze the value here, preventing ++ the addition of sys/mtio.h by sysdeps/gnu/Makefile. ++ ++2015-09-04 Roland McGrath ++ ++ [BZ #18921] ++ * sysdeps/posix/opendir.c (need_isdir_precheck) [O_DIRECTORY]: ++ Fix inverted sense of test of 'o_directory_works' value. ++ Reported by Pádraig Brady , diagnosed by ++ Bernhard Voelker . ++ ++2015-08-31 Brett Neumeier ++ ++ [BZ #18870] ++ * sysdeps/sparc/sparc32/sem_open.c: Add missing #include ++ ++2015-08-28 Mike Frysinger ++ ++ [BZ #18887] ++ * misc/Makefile (tests): Add tst-mntent-blank-corrupt and ++ tst-mntent-blank-passno. ++ * misc/mntent_r.c (__getmntent_r): Do not read past buffer[0]. ++ * misc/tst-mntent-blank-corrupt.c: New test. ++ * misc/tst-mntent-blank-passno.c: New test ripped from ... ++ * misc/tst-mntent.c (do_test): ... here. ++ ++2015-08-25 Roland McGrath ++ ++ * sysdeps/nacl/start.c (_start): Call __nacl_main instead of main ++ if the weak reference is not null. ++ ++2015-08-19 Andrew Senkevich ++ ++ [BZ #18796] ++ * scripts/test-installation.pl: Don't add -lmvec to build options ++ if libmvec wasn't built. ++ * NEWS: Mention this fix. ++ ++2015-08-10 Maxim Ostapenko ++ ++ [BZ #18778] ++ * elf/Makefile (tests): Add Add tst-nodelete2. ++ (modules-names): Add tst-nodelete2mod. ++ (tst-nodelete2mod.so-no-z-defs): New. ++ ($(objpfx)tst-nodelete2): Likewise. ++ ($(objpfx)tst-nodelete2.out): Likewise. ++ (LDFLAGS-tst-nodelete2): Likewise. ++ * elf/dl-close.c (_dl_close_worker): Move DF_1_NODELETE clearing ++ out of loop through all loaded libraries. ++ * elf/tst-nodelete2.c: New file. ++ * elf/tst-nodelete2mod.c: Likewise. ++ ++2015-08-10 Andreas Schwab ++ ++ [BZ #18781] ++ * sysdeps/unix/sysv/linux/openat.c (__OPENAT) [MORE_OFLAGS]: Add ++ MORE_OFLAGS to oflag. ++ * io/test-lfs.c (do_test): Test openat64. ++ ++2015-08-08 John David Anglin ++ ++ [BZ #18787] ++ * sysdeps/unix/sysv/linux/hppa/bits/atomic.h (_LWS_CLOBBER): Revise ++ clobber registers. ++ (atomic_compare_and_exchange_val_acq): Use register asms to assign ++ operand registers. Use register %r20 for EAGAIN and EDEADLOCK checks. ++ Cast return to __typeof (oldval). ++ ++2015-08-08 Mike Frysinger ++ ++ * sysdeps/unix/sysv/linux/microblaze/sysdep.h: Wrap the whole file ++ in _LINUX_MICROBLAZE_SYSDEP_H defines. Include sysdeps/unix/sysdep.h ++ and delete sys/syscall.h include. ++ ++2015-08-07 Mike Frysinger ++ ++ * sysdeps/hppa/dl-symaddr.c (_dl_symbol_address): Add rtld_hidden_def. ++ ++2015-08-05 Zack Weinberg ++ ++ * misc/regexp.h: Update comments. ++ + 2015-08-05 Carlos O'Donell + + * version.h (RELEASE): Set to "stable". +diff --git a/NEWS b/NEWS +index 4c31de7..9b10bff 100644 +--- a/NEWS ++++ b/NEWS +@@ -5,6 +5,12 @@ See the end for copying conditions. + Please send GNU C library bug reports via + using `glibc' in the "product" field. + ++Version 2.22.1 ++ ++* The following bugs are resolved with this release: ++ ++ 18589, 18778, 18781, 18787, 18796, 18870, 18887, 18921, 18969. ++ + Version 2.22 + + * The following bugs are resolved with this release: +@@ -84,7 +90,7 @@ Version 2.22 + release. Use of this header will trigger a deprecation warning. + Application developers should update their code to use instead. + +- This header was formerly part of SUSv2, but was deprecated in 1997 and ++ This header was formerly part of SUS, but was deprecated in 1994 and + removed from the standard in 2001. Also, the glibc implementation + leaks memory. See BZ#18681 for more details. + +diff --git a/elf/Makefile b/elf/Makefile +index 4ceeaf8..71a18a1 100644 +--- a/elf/Makefile ++++ b/elf/Makefile +@@ -148,7 +148,8 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \ + tst-unique1 tst-unique2 $(if $(CXX),tst-unique3 tst-unique4 \ + tst-nodelete) \ + tst-initorder tst-initorder2 tst-relsort1 tst-null-argv \ +- tst-ptrguard1 tst-tlsalign tst-tlsalign-extern tst-nodelete-opened ++ tst-ptrguard1 tst-tlsalign tst-tlsalign-extern tst-nodelete-opened \ ++ tst-nodelete2 + # reldep9 + ifeq ($(build-hardcoded-path-in-tests),yes) + tests += tst-dlopen-aout +@@ -218,7 +219,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ + tst-initorder2d \ + tst-relsort1mod1 tst-relsort1mod2 tst-array2dep \ + tst-array5dep tst-null-argv-lib \ +- tst-tlsalign-lib tst-nodelete-opened-lib ++ tst-tlsalign-lib tst-nodelete-opened-lib tst-nodelete2mod + ifeq (yes,$(have-protected-data)) + modules-names += tst-protected1moda tst-protected1modb + tests += tst-protected1a tst-protected1b +@@ -594,6 +595,7 @@ tst-auditmod9b.so-no-z-defs = yes + tst-nodelete-uniquemod.so-no-z-defs = yes + tst-nodelete-rtldmod.so-no-z-defs = yes + tst-nodelete-zmod.so-no-z-defs = yes ++tst-nodelete2mod.so-no-z-defs = yes + + ifeq ($(build-shared),yes) + # Build all the modules even when not actually running test programs. +@@ -1164,6 +1166,11 @@ $(objpfx)tst-nodelete.out: $(objpfx)tst-nodelete-uniquemod.so \ + LDFLAGS-tst-nodelete = -rdynamic + LDFLAGS-tst-nodelete-zmod.so = -Wl,--enable-new-dtags,-z,nodelete + ++$(objpfx)tst-nodelete2: $(libdl) ++$(objpfx)tst-nodelete2.out: $(objpfx)tst-nodelete2mod.so ++ ++LDFLAGS-tst-nodelete2 = -rdynamic ++ + $(objpfx)tst-initorder-cmp.out: tst-initorder.exp $(objpfx)tst-initorder.out + cmp $^ > $@; \ + $(evaluate-test) +diff --git a/elf/dl-close.c b/elf/dl-close.c +index 9105277..c897247 100644 +--- a/elf/dl-close.c ++++ b/elf/dl-close.c +@@ -144,6 +144,14 @@ _dl_close_worker (struct link_map *map, bool force) + char done[nloaded]; + struct link_map *maps[nloaded]; + ++ /* Clear DF_1_NODELETE to force object deletion. We don't need to touch ++ l_tls_dtor_count because forced object deletion only happens when an ++ error occurs during object load. Destructor registration for TLS ++ non-POD objects should not have happened till then for this ++ object. */ ++ if (force) ++ map->l_flags_1 &= ~DF_1_NODELETE; ++ + /* Run over the list and assign indexes to the link maps and enter + them into the MAPS array. */ + int idx = 0; +@@ -153,13 +161,6 @@ _dl_close_worker (struct link_map *map, bool force) + maps[idx] = l; + ++idx; + +- /* Clear DF_1_NODELETE to force object deletion. We don't need to touch +- l_tls_dtor_count because forced object deletion only happens when an +- error occurs during object load. Destructor registration for TLS +- non-POD objects should not have happened till then for this +- object. */ +- if (force) +- l->l_flags_1 &= ~DF_1_NODELETE; + } + assert (idx == nloaded); + +diff --git a/elf/tst-nodelete2.c b/elf/tst-nodelete2.c +new file mode 100644 +index 0000000..388e8af +--- /dev/null ++++ b/elf/tst-nodelete2.c +@@ -0,0 +1,37 @@ ++#include "../dlfcn/dlfcn.h" ++#include ++#include ++#include ++ ++static int ++do_test (void) ++{ ++ int result = 0; ++ ++ printf ("\nOpening pthread library.\n"); ++ void *pthread = dlopen (LIBPTHREAD_SO, RTLD_LAZY); ++ ++ /* This is a test for correct DF_1_NODELETE clearing when dlopen failure ++ happens. We should clear DF_1_NODELETE for failed library only, because ++ doing this for others (e.g. libpthread) might cause them to be unloaded, ++ that may lead to some global references (e.g. __rtld_lock_unlock) to be ++ broken. The dlopen should fail because of undefined symbols in shared ++ library, that cause DF_1_NODELETE to be cleared. For libpthread, this ++ flag should be set, because if not, SIGSEGV will happen in dlclose. */ ++ if (dlopen ("tst-nodelete2mod.so", RTLD_NOW) != NULL) ++ { ++ printf ("Unique symbols test failed\n"); ++ result = 1; ++ } ++ ++ if (pthread) ++ dlclose (pthread); ++ ++ if (result == 0) ++ printf ("SUCCESS\n"); ++ ++ return result; ++} ++ ++#define TEST_FUNCTION do_test () ++#include "../test-skeleton.c" +diff --git a/elf/tst-nodelete2mod.c b/elf/tst-nodelete2mod.c +new file mode 100644 +index 0000000..e88c756 +--- /dev/null ++++ b/elf/tst-nodelete2mod.c +@@ -0,0 +1,7 @@ ++/* Undefined symbol. */ ++extern int not_exist (void); ++ ++int foo (void) ++{ ++ return not_exist (); ++} +diff --git a/elf/tst-znodelete-zlib.cc b/elf/tst-znodelete-zlib.cc +deleted file mode 100644 +index 1e8f368..0000000 +--- a/elf/tst-znodelete-zlib.cc ++++ /dev/null +@@ -1,6 +0,0 @@ +-extern int not_exist (void); +- +-int foo (void) +-{ +- return not_exist (); +-} +diff --git a/io/test-lfs.c b/io/test-lfs.c +index 539c2a2..b6ebae4 100644 +--- a/io/test-lfs.c ++++ b/io/test-lfs.c +@@ -144,7 +144,7 @@ test_ftello (void) + int + do_test (int argc, char *argv[]) + { +- int ret; ++ int ret, fd2; + struct stat64 statbuf; + + ret = lseek64 (fd, TWO_GB+100, SEEK_SET); +@@ -195,6 +195,25 @@ do_test (int argc, char *argv[]) + error (EXIT_FAILURE, 0, "stat reported size %lld instead of %lld.", + (long long int) statbuf.st_size, (TWO_GB + 100 + 5)); + ++ fd2 = openat64 (AT_FDCWD, name, O_RDWR); ++ if (fd2 == -1) ++ { ++ if (errno == ENOSYS) ++ { ++ /* Silently ignore this test. */ ++ error (0, 0, "openat64 is not supported"); ++ } ++ else ++ error (EXIT_FAILURE, errno, "openat64 failed to open big file"); ++ } ++ else ++ { ++ ret = close (fd2); ++ ++ if (ret == -1) ++ error (EXIT_FAILURE, errno, "error closing file"); ++ } ++ + test_ftello (); + + return 0; +diff --git a/locale/C-collate.c b/locale/C-collate.c +index d7f3c55..06dfdfa 100644 +--- a/locale/C-collate.c ++++ b/locale/C-collate.c +@@ -144,8 +144,6 @@ const struct __locale_data _nl_C_LC_COLLATE attribute_hidden = + /* _NL_COLLATE_COLLSEQWC */ + { .string = (const char *) collseqwc }, + /* _NL_COLLATE_CODESET */ +- { .string = _nl_C_codeset }, +- /* _NL_COLLATE_ENCODING_TYPE */ +- { .word = __cet_8bit } ++ { .string = _nl_C_codeset } + } + }; +diff --git a/locale/categories.def b/locale/categories.def +index 045489d..a8dda53 100644 +--- a/locale/categories.def ++++ b/locale/categories.def +@@ -58,7 +58,6 @@ DEFINE_CATEGORY + DEFINE_ELEMENT (_NL_COLLATE_COLLSEQMB, "collate-collseqmb", std, wstring) + DEFINE_ELEMENT (_NL_COLLATE_COLLSEQWC, "collate-collseqwc", std, wstring) + DEFINE_ELEMENT (_NL_COLLATE_CODESET, "collate-codeset", std, string) +- DEFINE_ELEMENT (_NL_COLLATE_ENCODING_TYPE, "collate-encoding-type", std, word) + ), NO_POSTLOAD) + + +diff --git a/locale/langinfo.h b/locale/langinfo.h +index ffc5c7f..a565d9d 100644 +--- a/locale/langinfo.h ++++ b/locale/langinfo.h +@@ -255,7 +255,6 @@ enum + _NL_COLLATE_COLLSEQMB, + _NL_COLLATE_COLLSEQWC, + _NL_COLLATE_CODESET, +- _NL_COLLATE_ENCODING_TYPE, + _NL_NUM_LC_COLLATE, + + /* LC_CTYPE category: character classification. +diff --git a/locale/localeinfo.h b/locale/localeinfo.h +index bdab9fe..1d2ee00 100644 +--- a/locale/localeinfo.h ++++ b/locale/localeinfo.h +@@ -110,14 +110,6 @@ enum coll_sort_rule + sort_mask + }; + +-/* Collation encoding type. */ +-enum collation_encoding_type +-{ +- __cet_other, +- __cet_8bit, +- __cet_utf8 +-}; +- + /* We can map the types of the entries into a few categories. */ + enum value_type + { +diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c +index a39a94f..dc0fe30 100644 +--- a/locale/programs/ld-collate.c ++++ b/locale/programs/ld-collate.c +@@ -32,7 +32,6 @@ + #include "linereader.h" + #include "locfile.h" + #include "elem-hash.h" +-#include "../localeinfo.h" + + /* Uncomment the following line in the production version. */ + /* #define NDEBUG 1 */ +@@ -2131,8 +2130,6 @@ collate_output (struct localedef_t *locale, const struct charmap_t *charmap, + /* The words have to be handled specially. */ + if (idx == _NL_ITEM_INDEX (_NL_COLLATE_SYMB_HASH_SIZEMB)) + add_locale_uint32 (&file, 0); +- else if (idx == _NL_ITEM_INDEX (_NL_COLLATE_ENCODING_TYPE)) +- add_locale_uint32 (&file, __cet_other); + else + add_locale_empty (&file); + } +@@ -2496,12 +2493,6 @@ collate_output (struct localedef_t *locale, const struct charmap_t *charmap, + add_locale_raw_data (&file, collate->mbseqorder, 256); + add_locale_collseq_table (&file, &collate->wcseqorder); + add_locale_string (&file, charmap->code_set_name); +- if (strcmp (charmap->code_set_name, "UTF-8") == 0) +- add_locale_uint32 (&file, __cet_utf8); +- else if (charmap->mb_cur_max == 1) +- add_locale_uint32 (&file, __cet_8bit); +- else +- add_locale_uint32 (&file, __cet_other); + write_locale_data (output_path, LC_COLLATE, "LC_COLLATE", &file); + + obstack_free (&weightpool, NULL); +diff --git a/misc/Makefile b/misc/Makefile +index aecb0da..2f5edf6 100644 +--- a/misc/Makefile ++++ b/misc/Makefile +@@ -76,7 +76,8 @@ install-lib := libg.a + gpl2lgpl := error.c error.h + + tests := tst-dirname tst-tsearch tst-fdset tst-efgcvt tst-mntent tst-hsearch \ +- tst-error1 tst-pselect tst-insremque tst-mntent2 bug-hsearch1 ++ tst-error1 tst-pselect tst-insremque tst-mntent2 bug-hsearch1 \ ++ tst-mntent-blank-corrupt tst-mntent-blank-passno + ifeq ($(run-built-tests),yes) + tests-special += $(objpfx)tst-error1-mem.out + endif +diff --git a/misc/mntent_r.c b/misc/mntent_r.c +index 6159873..4f26998 100644 +--- a/misc/mntent_r.c ++++ b/misc/mntent_r.c +@@ -136,7 +136,9 @@ __getmntent_r (FILE *stream, struct mntent *mp, char *buffer, int bufsiz) + end_ptr = strchr (buffer, '\n'); + if (end_ptr != NULL) /* chop newline */ + { +- while (end_ptr[-1] == ' ' || end_ptr[-1] == '\t') ++ /* Do not walk past the start of buffer if it's all whitespace. */ ++ while (end_ptr != buffer ++ && (end_ptr[-1] == ' ' || end_ptr[-1] == '\t')) + end_ptr--; + *end_ptr = '\0'; + } +diff --git a/misc/regexp.h b/misc/regexp.h +index 3460989..42394f7 100644 +--- a/misc/regexp.h ++++ b/misc/regexp.h +@@ -19,10 +19,11 @@ + #ifndef _REGEXP_H + #define _REGEXP_H 1 + +-/* The contents of this header file were standardized in the +- Single Unix Specification, Version 2 (1997) but marked as +- LEGACY; new applications were already being encouraged to +- use instead. POSIX.1-2001 removed this header. ++/* The contents of this header file were originally standardized in ++ the Single Unix Specification, Issue 3 (1992). In Issue 4 (1994) ++ the header was marked as TO BE WITHDRAWN, and new applications ++ were encouraged to use instead. It was officially ++ withdrawn from the standard in Issue 6 (aka POSIX.1-2001). + + This header is provided only for backward compatibility. + It will be removed in the next release of the GNU C Library. +diff --git a/misc/sys/param.h b/misc/sys/param.h +index 62b7ed2..1908b93 100644 +--- a/misc/sys/param.h ++++ b/misc/sys/param.h +@@ -50,6 +50,9 @@ + #if !defined NOFILE && defined OPEN_MAX + # define NOFILE OPEN_MAX + #endif ++#if !defined MAXHOSTNAMELEN && defined HOST_NAME_MAX ++# define MAXHOSTNAMELEN HOST_NAME_MAX ++#endif + #ifndef NCARGS + # ifdef ARG_MAX + # define NCARGS ARG_MAX +diff --git a/misc/tst-mntent-blank-corrupt.c b/misc/tst-mntent-blank-corrupt.c +new file mode 100644 +index 0000000..92266a3 +--- /dev/null ++++ b/misc/tst-mntent-blank-corrupt.c +@@ -0,0 +1,45 @@ ++/* Make sure blank lines does not cause memory corruption BZ #18887. ++ ++ Copyright (C) 2009-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 ++#include ++#include ++ ++/* Make sure blank lines don't trigger memory corruption. This doesn't happen ++ for all targets though, so it's a best effort test BZ #18887. */ ++static int ++do_test (void) ++{ ++ FILE *fp; ++ ++ fp = tmpfile (); ++ fputs ("\n \n/foo\\040dir /bar\\040dir auto bind \t \n", fp); ++ rewind (fp); ++ ++ /* The corruption happens here ... */ ++ getmntent (fp); ++ /* ... but trigers here. */ ++ endmntent (fp); ++ ++ /* If the test failed, we would crash, and not hit this point. */ ++ return 0; ++} ++ ++#define TEST_FUNCTION do_test () ++#include "../test-skeleton.c" +diff --git a/misc/tst-mntent-blank-passno.c b/misc/tst-mntent-blank-passno.c +new file mode 100644 +index 0000000..fc04291 +--- /dev/null ++++ b/misc/tst-mntent-blank-passno.c +@@ -0,0 +1,53 @@ ++/* Make sure trailing whitespace is handled properly BZ #17273. ++ ++ Copyright (C) 2009-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 ++#include ++#include ++ ++/* Check entries to make sure trailing whitespace is ignored and we return the ++ correct passno value BZ #17273. */ ++static int ++do_test (void) ++{ ++ int result = 0; ++ FILE *fp; ++ struct mntent *mnt; ++ ++ fp = tmpfile (); ++ fputs ("/foo\\040dir /bar\\040dir auto bind \t \n", fp); ++ rewind (fp); ++ ++ mnt = getmntent (fp); ++ if (strcmp (mnt->mnt_fsname, "/foo dir") != 0 ++ || strcmp (mnt->mnt_dir, "/bar dir") != 0 ++ || strcmp (mnt->mnt_type, "auto") != 0 ++ || strcmp (mnt->mnt_opts, "bind") != 0 ++ || mnt->mnt_freq != 0 ++ || mnt->mnt_passno != 0) ++ { ++ puts ("Error while reading entry with trailing whitespaces"); ++ result = 1; ++ } ++ ++ return result; ++} ++ ++#define TEST_FUNCTION do_test () ++#include "../test-skeleton.c" +diff --git a/misc/tst-mntent.c b/misc/tst-mntent.c +index 876c89f..820b354 100644 +--- a/misc/tst-mntent.c ++++ b/misc/tst-mntent.c +@@ -73,26 +73,6 @@ main (int argc, char *argv[]) + puts ("Error while reading written entry back in"); + result = 1; + } +- +- /* Part III: Entry with whitespaces at the end of a line. */ +- rewind (fp); +- +- fputs ("/foo\\040dir /bar\\040dir auto bind \t \n", fp); +- +- rewind (fp); +- +- mnt = getmntent (fp); +- +- if (strcmp (mnt->mnt_fsname, "/foo dir") != 0 +- || strcmp (mnt->mnt_dir, "/bar dir") != 0 +- || strcmp (mnt->mnt_type, "auto") != 0 +- || strcmp (mnt->mnt_opts, "bind") != 0 +- || mnt->mnt_freq != 0 +- || mnt->mnt_passno != 0) +- { +- puts ("Error while reading entry with trailing whitespaces"); +- result = 1; +- } + } + + return result; +diff --git a/scripts/test-installation.pl b/scripts/test-installation.pl +index cac1562..79b2b3e 100755 +--- a/scripts/test-installation.pl ++++ b/scripts/test-installation.pl +@@ -80,16 +80,25 @@ arglist: while (@ARGV) { + # We expect none or one argument. + if ($#ARGV == -1) { + $soversions="soversions.mk"; ++ $config="config.make"; + } elsif ($#ARGV == 0) { + if (-d $ARGV[0]) { + $soversions = "$ARGV[0]/soversions.mk"; ++ $config = "$ARGV[0]/config.make"; + } else { +- $soversions = $ARGV[0]; ++ $soversions = $dir = $ARGV[0]; ++ $dir =~ s!/?[^/]*/*$!!; ++ $config = $dir . "/config.make"; + } + } else { + die "Wrong number of arguments."; + } + ++if (system ("grep -q \"build-mathvec = yes\" $config") == 0) { ++ $build_mathvec = 1; ++} else { ++ $build_mathvec = 0; ++} + + # Read names and versions of all shared libraries that are part of + # glibc +@@ -111,6 +120,8 @@ while () { + # - libthread_db since it contains unresolved references + # - it's just a test NSS module + # - We don't provide the libgcc so we don't test it ++ # - libmvec if it wasn't built ++ next if ($build_mathvec == 0 && $name eq "mvec"); + if ($name ne "nss_ldap" && $name ne "db1" + && !($name =~/^nss1_/) && $name ne "thread_db" + && $name ne "nss_test1" && $name ne "libgcc_s") { +diff --git a/string/Makefile b/string/Makefile +index 8424a61..ebe9354 100644 +--- a/string/Makefile ++++ b/string/Makefile +@@ -54,7 +54,7 @@ tests := tester inl-tester noinl-tester testcopy test-ffs \ + tst-strtok tst-strxfrm bug-strcoll1 tst-strfry \ + bug-strtok1 $(addprefix test-,$(strop-tests)) \ + bug-envz1 tst-strxfrm2 tst-endian tst-svc2 \ +- tst-strtok_r ++ tst-strtok_r bug-strcoll2 + + xtests = tst-strcoll-overflow + +@@ -75,4 +75,17 @@ ifeq ($(run-built-tests),yes) + $(objpfx)tst-svc-cmp.out: tst-svc.expect $(objpfx)tst-svc.out + cmp $^ > $@; \ + $(evaluate-test) ++ ++LOCALES := de_DE.UTF-8 en_US.ISO-8859-1 en_US.UTF-8 \ ++ tr_TR.ISO-8859-9 tr_TR.UTF-8 cs_CZ.UTF-8 \ ++ da_DK.ISO-8859-1 ++include ../gen-locales.mk ++ ++$(objpfx)test-strcasecmp.out: $(gen-locales) ++$(objpfx)test-strncasecmp.out: $(gen-locales) ++$(objpfx)tst-strxfrm.out: $(gen-locales) ++$(objpfx)tst-strxfrm2.out: $(gen-locales) ++# bug-strcoll2 needs cs_CZ.UTF-8 and da_DK.ISO-8859-1. ++$(objpfx)bug-strcoll2.out: $(gen-locales) ++ + endif +diff --git a/string/bug-strcoll2.c b/string/bug-strcoll2.c +new file mode 100644 +index 0000000..72a9ff2 +--- /dev/null ++++ b/string/bug-strcoll2.c +@@ -0,0 +1,92 @@ ++/* Bug 18589: sort-test.sh fails at random. ++ 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 ++#include ++#include ++ ++/* An incorrect strcoll optimization resulted in incorrect ++ results from strcoll for cs_CZ and da_DK. */ ++ ++int ++test_cs_CZ (void) ++{ ++ const char t1[] = "config"; ++ const char t2[] = "choose"; ++ if (setlocale (LC_ALL, "cs_CZ.UTF-8") == NULL) ++ { ++ perror ("setlocale"); ++ return 1; ++ } ++ /* In Czech the digraph ch sorts after c, therefore we expect ++ config to sort before choose. */ ++ int a = strcoll (t1, t2); ++ int b = strcoll (t2, t1); ++ printf ("strcoll (\"%s\", \"%s\") = %d\n", t1, t2, a); ++ printf ("strcoll (\"%s\", \"%s\") = %d\n", t2, t1, b); ++ if (a < 0 && b > 0) ++ { ++ puts ("PASS: config < choose"); ++ return 0; ++ } ++ else ++ { ++ puts ("FAIL: Wrong sorting in cs_CZ.UTF-8."); ++ return 1; ++ } ++} ++ ++int ++test_da_DK (void) ++{ ++ const char t1[] = "AS"; ++ const char t2[] = "AA"; ++ if (setlocale (LC_ALL, "da_DK.ISO-8859-1") == NULL) ++ { ++ perror ("setlocale"); ++ return 1; ++ } ++ /* AA should be treated as the last letter of the Danish alphabet, ++ hence sorting after AS. */ ++ int a = strcoll (t1, t2); ++ int b = strcoll (t2, t1); ++ printf ("strcoll (\"%s\", \"%s\") = %d\n", t1, t2, a); ++ printf ("strcoll (\"%s\", \"%s\") = %d\n", t2, t1, b); ++ if (a < 0 && b > 0) ++ { ++ puts ("PASS: AS < AA"); ++ return 0; ++ } ++ else ++ { ++ puts ("FAIL: Wrong sorting in da_DK.ISO-8859-1"); ++ return 1; ++ } ++} ++ ++static int ++do_test (void) ++{ ++ int err = 0; ++ err |= test_cs_CZ (); ++ err |= test_da_DK (); ++ return err; ++} ++ ++#define TEST_FUNCTION do_test () ++#include "../test-skeleton.c" +diff --git a/string/strcoll_l.c b/string/strcoll_l.c +index 8f1225f..35bc0e4 100644 +--- a/string/strcoll_l.c ++++ b/string/strcoll_l.c +@@ -29,7 +29,6 @@ + # define STRING_TYPE char + # define USTRING_TYPE unsigned char + # define STRCOLL __strcoll_l +-# define STRDIFF __strdiff + # define STRCMP strcmp + # define WEIGHT_H "../locale/weight.h" + # define SUFFIX MB +@@ -42,20 +41,6 @@ + #include "../locale/localeinfo.h" + #include WEIGHT_H + +-#define MASK_UTF8_7BIT (1 << 7) +-#define MASK_UTF8_START (3 << 6) +- +-size_t +-STRDIFF (const STRING_TYPE *s, const STRING_TYPE *t) +-{ +- size_t n; +- +- for (n = 0; *s != '\0' && *s++ == *t++; ++n) +- continue; +- +- return n; +-} +- + /* Track status while looking for sequences in a string. */ + typedef struct + { +@@ -269,29 +254,9 @@ STRCOLL (const STRING_TYPE *s1, const STRING_TYPE *s2, __locale_t l) + const USTRING_TYPE *extra; + const int32_t *indirect; + +- /* In case there is no locale specific sort order (C / POSIX). */ + if (nrules == 0) + return STRCMP (s1, s2); + +- /* Fast forward to the position of the first difference. Needs to be +- encoding aware as the byte-by-byte comparison can stop in the middle +- of a char sequence for multibyte encodings like UTF-8. */ +- uint_fast32_t encoding = +- current->values[_NL_ITEM_INDEX (_NL_COLLATE_ENCODING_TYPE)].word; +- if (encoding != __cet_other) +- { +- size_t diff = STRDIFF (s1, s2); +- if (diff > 0) +- { +- if (encoding == __cet_utf8 && (*(s1 + diff) & MASK_UTF8_7BIT) != 0) +- do +- diff--; +- while (diff > 0 && (*(s1 + diff) & MASK_UTF8_START) != MASK_UTF8_START); +- s1 += diff; +- s2 += diff; +- } +- } +- + /* Catch empty strings. */ + if (__glibc_unlikely (*s1 == '\0') || __glibc_unlikely (*s2 == '\0')) + return (*s1 != '\0') - (*s2 != '\0'); +@@ -358,8 +323,7 @@ STRCOLL (const STRING_TYPE *s1, const STRING_TYPE *s2, __locale_t l) + byte-level comparison to ensure that we don't waste time + going through multiple passes for totally equal strings + before proceeding to subsequent passes. */ +- if (pass == 0 && encoding == __cet_other && +- STRCMP (s1, s2) == 0) ++ if (pass == 0 && STRCMP (s1, s2) == 0) + return result; + else + break; +diff --git a/string/tst-strxfrm2.c b/string/tst-strxfrm2.c +index d5a1115..bea5aa2 100644 +--- a/string/tst-strxfrm2.c ++++ b/string/tst-strxfrm2.c +@@ -5,6 +5,8 @@ + static int + do_test (void) + { ++ static const char test_locale[] = "de_DE.UTF-8"; ++ + int res = 0; + + char buf[20]; +@@ -38,9 +40,9 @@ do_test (void) + res = 1; + } + +- if (setlocale (LC_ALL, "de_DE.UTF-8") == NULL) ++ if (setlocale (LC_ALL, test_locale) == NULL) + { +- puts ("setlocale failed"); ++ printf ("cannot set locale \"%s\"\n", test_locale); + res = 1; + } + else +diff --git a/sysdeps/hppa/dl-symaddr.c b/sysdeps/hppa/dl-symaddr.c +index b707c19..89d8baf 100644 +--- a/sysdeps/hppa/dl-symaddr.c ++++ b/sysdeps/hppa/dl-symaddr.c +@@ -33,3 +33,4 @@ _dl_symbol_address (struct link_map *map, const ElfW(Sym) *ref) + else + return (void *) value; + } ++rtld_hidden_def (_dl_symbol_address) +diff --git a/sysdeps/nacl/Makefile b/sysdeps/nacl/Makefile +index 6749a44..1748886 100644 +--- a/sysdeps/nacl/Makefile ++++ b/sysdeps/nacl/Makefile +@@ -132,4 +132,13 @@ ifeq ($(subdir),misc) + # sysdeps/.../linux/ directories, but it's still a sysdeps decision to + # install it. + sysdep_headers += bits/mman-linux.h ++ ++# This defeats sysdeps/gnu/Makefile's addition of sys/mtio.h, which ++# we do not want. This is a total kludge, but it seems no worse for ++# now than making the sysdeps/gnu/Makefile code conditional on a ++# variable we set here. If some sysdeps/.../Makefile that is later ++# in the list than sysdeps/gnu needed to add to sysdep_headers, this ++# would break it. But sysdeps/gnu is close to last in the list and ++# this coming up seems unlikely. ++override sysdep_headers := $(sysdep_headers) + endif +diff --git a/sysdeps/nacl/start.c b/sysdeps/nacl/start.c +index a4b6dd3..8e8bc1a 100644 +--- a/sysdeps/nacl/start.c ++++ b/sysdeps/nacl/start.c +@@ -44,6 +44,10 @@ + /* The application defines this, of course. */ + extern int main (int argc, char **argv, char **envp); + ++/* But maybe it defines this too, in which case it takes precedence. */ ++extern int __nacl_main (int argc, char **argv, char **envp) ++ __attribute__ ((weak)); ++ + /* These are defined in libc. */ + extern int __libc_csu_init (int argc, char **argv, char **envp); + extern void __libc_csu_fini (void); +@@ -59,7 +63,7 @@ _start (uint32_t info[]) + { + /* The generic code actually assumes that envp follows argv. */ + +- __libc_start_main (&main, ++ __libc_start_main (&__nacl_main ?: &main, + nacl_startup_argc (info), + nacl_startup_argv (info), + nacl_startup_auxv (info), +diff --git a/sysdeps/posix/opendir.c b/sysdeps/posix/opendir.c +index 6509f5c..9edf056 100644 +--- a/sysdeps/posix/opendir.c ++++ b/sysdeps/posix/opendir.c +@@ -105,7 +105,7 @@ need_isdir_precheck (void) + tryopen_o_directory (); + + /* We can skip the expensive `stat' call if O_DIRECTORY works. */ +- return o_directory_works > 0; ++ return o_directory_works < 0; + #endif + return true; + } +diff --git a/sysdeps/sparc/sparc32/sem_open.c b/sysdeps/sparc/sparc32/sem_open.c +index 16cb9ad..59df2d7 100644 +--- a/sysdeps/sparc/sparc32/sem_open.c ++++ b/sysdeps/sparc/sparc32/sem_open.c +@@ -29,6 +29,7 @@ + #include + #include + #include "semaphoreP.h" ++#include + #include + + +diff --git a/sysdeps/unix/sysv/linux/hppa/bits/atomic.h b/sysdeps/unix/sysv/linux/hppa/bits/atomic.h +index abde83e..6e73504 100644 +--- a/sysdeps/unix/sysv/linux/hppa/bits/atomic.h ++++ b/sysdeps/unix/sysv/linux/hppa/bits/atomic.h +@@ -56,42 +56,41 @@ typedef uintmax_t uatomic_max_t; + #define _LWS "0xb0" + #define _LWS_CAS "0" + /* Note r31 is the link register. */ +-#define _LWS_CLOBBER "r1", "r26", "r25", "r24", "r23", "r22", "r21", "r20", "r28", "r31", "memory" ++#define _LWS_CLOBBER "r1", "r23", "r22", "r20", "r31", "memory" + /* String constant for -EAGAIN. */ + #define _ASM_EAGAIN "-11" + /* String constant for -EDEADLOCK. */ + #define _ASM_EDEADLOCK "-45" + + #if __ASSUME_LWS_CAS +-/* The only basic operation needed is compare and exchange. */ ++/* The only basic operation needed is compare and exchange. The mem ++ pointer must be word aligned. */ + # define atomic_compare_and_exchange_val_acq(mem, newval, oldval) \ + ({ \ +- volatile int lws_errno; \ +- __typeof__ (*mem) lws_ret; \ +- asm volatile( \ ++ register long lws_errno asm("r21"); \ ++ register unsigned long lws_ret asm("r28"); \ ++ register unsigned long lws_mem asm("r26") = (unsigned long)(mem); \ ++ register unsigned long lws_old asm("r25") = (unsigned long)(oldval);\ ++ register unsigned long lws_new asm("r24") = (unsigned long)(newval);\ ++ __asm__ __volatile__( \ + "0: \n\t" \ +- "copy %2, %%r26 \n\t" \ +- "copy %3, %%r25 \n\t" \ +- "copy %4, %%r24 \n\t" \ + "ble " _LWS "(%%sr2, %%r0) \n\t" \ + "ldi " _LWS_CAS ", %%r20 \n\t" \ +- "ldi " _ASM_EAGAIN ", %%r24 \n\t" \ +- "cmpb,=,n %%r24, %%r21, 0b \n\t" \ ++ "ldi " _ASM_EAGAIN ", %%r20 \n\t" \ ++ "cmpb,=,n %%r20, %%r21, 0b \n\t" \ + "nop \n\t" \ +- "ldi " _ASM_EDEADLOCK ", %%r25 \n\t" \ +- "cmpb,=,n %%r25, %%r21, 0b \n\t" \ ++ "ldi " _ASM_EDEADLOCK ", %%r20 \n\t" \ ++ "cmpb,=,n %%r20, %%r21, 0b \n\t" \ + "nop \n\t" \ +- "stw %%r28, %0 \n\t" \ +- "stw %%r21, %1 \n\t" \ +- : "=m" (lws_ret), "=m" (lws_errno) \ +- : "r" (mem), "r" (oldval), "r" (newval) \ ++ : "=r" (lws_ret), "=r" (lws_errno) \ ++ : "r" (lws_mem), "r" (lws_old), "r" (lws_new) \ + : _LWS_CLOBBER \ + ); \ + \ +- if(lws_errno == -EFAULT || lws_errno == -ENOSYS) \ ++ if (lws_errno == -EFAULT || lws_errno == -ENOSYS) \ + ABORT_INSTRUCTION; \ + \ +- lws_ret; \ ++ (__typeof (oldval)) lws_ret; \ + }) + + # define atomic_compare_and_exchange_bool_acq(mem, newval, oldval) \ +diff --git a/sysdeps/unix/sysv/linux/microblaze/sysdep.h b/sysdeps/unix/sysv/linux/microblaze/sysdep.h +index 83c0340..9d5c542 100644 +--- a/sysdeps/unix/sysv/linux/microblaze/sysdep.h ++++ b/sysdeps/unix/sysv/linux/microblaze/sysdep.h +@@ -16,8 +16,11 @@ + License along with the GNU C Library; if not, see + . */ + ++#ifndef _LINUX_MICROBLAZE_SYSDEP_H ++#define _LINUX_MICROBLAZE_SYSDEP_H 1 ++ ++#include + #include +-#include + + /* Defines RTLD_PRIVATE_ERRNO. */ + #include +@@ -305,3 +308,5 @@ SYSCALL_ERROR_LABEL_DCL: \ + # define PTR_DEMANGLE(var) (void) (var) + + #endif /* not __ASSEMBLER__ */ ++ ++#endif /* _LINUX_MICROBLAZE_SYSDEP_H */ +diff --git a/sysdeps/unix/sysv/linux/openat.c b/sysdeps/unix/sysv/linux/openat.c +index 6777123..ad8e31d 100644 +--- a/sysdeps/unix/sysv/linux/openat.c ++++ b/sysdeps/unix/sysv/linux/openat.c +@@ -68,6 +68,11 @@ __OPENAT (int fd, const char *file, int oflag, ...) + va_end (arg); + } + ++ /* We have to add the O_LARGEFILE flag for openat64. */ ++#ifdef MORE_OFLAGS ++ oflag |= MORE_OFLAGS; ++#endif ++ + return SYSCALL_CANCEL (openat, fd, file, oflag, mode); + } + libc_hidden_def (__OPENAT) +diff --git a/wcsmbs/wcscoll_l.c b/wcsmbs/wcscoll_l.c +index 6d9384a..87f240d 100644 +--- a/wcsmbs/wcscoll_l.c ++++ b/wcsmbs/wcscoll_l.c +@@ -23,7 +23,6 @@ + #define STRING_TYPE wchar_t + #define USTRING_TYPE wint_t + #define STRCOLL __wcscoll_l +-#define STRDIFF __wcsdiff + #define STRCMP __wcscmp + #define WEIGHT_H "../locale/weightwc.h" + #define SUFFIX WC -- cgit v1.2.3-2-g168b