Author: adconrad
Date: 2015-09-17 19:00:13 +0000 (Thu, 17 Sep 2015)
New Revision: 6582
Removed:
glibc-package/branches/glibc-2.22/debian/patches/all/local-alias-UTF-8.diff
glibc-package/branches/glibc-2.22/debian/patches/any/cvs-ldconfig-aux-cache.diff
glibc-package/branches/glibc-2.22/debian/patches/any/cvs-localplt-new-readelf.diff
glibc-package/branches/glibc-2.22/debian/patches/any/cvs-logbl-accuracy.diff
glibc-package/branches/glibc-2.22/debian/patches/any/cvs-make-typo.diff
glibc-package/branches/glibc-2.22/debian/patches/any/cvs-vismain-pie.diff
glibc-package/branches/glibc-2.22/debian/patches/any/local-xfail-stdlib-linkns.diff
glibc-package/branches/glibc-2.22/debian/patches/arm/cvs-arm-sfi_breg.diff
glibc-package/branches/glibc-2.22/debian/patches/arm/cvs-memcpy-memmove-always-bx.diff
glibc-package/branches/glibc-2.22/debian/patches/hppa/cvs-alloca-werror.diff
glibc-package/branches/glibc-2.22/debian/patches/hppa/cvs-fpu-r2.diff
glibc-package/branches/glibc-2.22/debian/patches/hppa/cvs-fpu2.diff
glibc-package/branches/glibc-2.22/debian/patches/hppa/local-fcntl-osync.diff
glibc-package/branches/glibc-2.22/debian/patches/hppa/local-setcontext.diff
glibc-package/branches/glibc-2.22/debian/patches/powerpc/cvs-power7-strncpy.diff
glibc-package/branches/glibc-2.22/debian/patches/powerpc/cvs-ppc-feraiseexcept.diff
glibc-package/branches/glibc-2.22/debian/patches/powerpc/cvs-ppc-pow.diff
glibc-package/branches/glibc-2.22/debian/patches/powerpc/cvs-ppc-sqrt.diff
glibc-package/branches/glibc-2.22/debian/patches/powerpc/cvs-ppc-sqrtf.diff
glibc-package/branches/glibc-2.22/debian/patches/powerpc/cvs-ppc-tabort-le.diff
Modified:
glibc-package/branches/glibc-2.22/debian/changelog
glibc-package/branches/glibc-2.22/debian/control
glibc-package/branches/glibc-2.22/debian/copyright
glibc-package/branches/glibc-2.22/debian/patches/all/local-alias-et_EE.diff
glibc-package/branches/glibc-2.22/debian/patches/amd64/local-blacklist-on-TSX-Haswell.diff
glibc-package/branches/glibc-2.22/debian/patches/any/local-libgcc-compat-ports.diff
glibc-package/branches/glibc-2.22/debian/patches/any/local-libpic.diff
glibc-package/branches/glibc-2.22/debian/patches/any/local-no-pagesize.diff
glibc-package/branches/glibc-2.22/debian/patches/any/submitted-longdouble.diff
glibc-package/branches/glibc-2.22/debian/patches/any/submitted-missing-etc-hosts.diff
glibc-package/branches/glibc-2.22/debian/patches/any/submitted-resolv-ipv6-nameservers.diff
glibc-package/branches/glibc-2.22/debian/patches/git-updates.diff
glibc-package/branches/glibc-2.22/debian/patches/i386/submitted-i686-timing.diff
glibc-package/branches/glibc-2.22/debian/patches/localedata/local-all-no-archive.diff
glibc-package/branches/glibc-2.22/debian/patches/localedata/submitted-locale-bo.diff
glibc-package/branches/glibc-2.22/debian/patches/mips/submitted-rld_map.diff
glibc-package/branches/glibc-2.22/debian/patches/series
glibc-package/branches/glibc-2.22/debian/symbols.wildcards
Log:
* New upstream release: version 2.22, with git updates up to 2015-09-17:
- debian/patches/all/local-alias-UTF-8.diff: Fixed upstream.
- debian/patches/any/cvs-ldconfig-aux-cache.diff: Upstreamed.
- debian/patches/any/cvs-localplt-new-readelf.diff: Upstreamed.
- debian/patches/any/cvs-logbl-accuracy.diff: Upstreamed.
- debian/patches/any/cvs-make-typo.diff: Upstreamed.
- debian/patches/any/cvs-vismain-pie.diff: Upstreamed.
- debian/patches/any/local-xfail-stdlib-linkns.diff: Dropped.
- debian/patches/arm/cvs-arm-sfi_breg.diff: Upstreamed.
- debian/patches/arm/cvs-memcpy-memmove-always-bx.diff: Upstreamed.
- debian/patches/hppa/cvs-alloca-werror.diff: Upstreamed.
- debian/patches/hppa/cvs-fpu-r2.diff: Upstreamed.
- debian/patches/hppa/cvs-fpu2.diff: Upstreamed.
- debian/patches/hppa/local-fcntl-osync.diff: Fixed upstream.
- debian/patches/hppa/local-setcontext.diff: Fixed upstream.
- debian/patches/powerpc/cvs-power7-strncpy.diff: Upstreamed.
- debian/patches/powerpc/cvs-ppc-feraiseexcept.diff: Upstreamed.
- debian/patches/powerpc/cvs-ppc-pow.diff: Upstreamed.
- debian/patches/powerpc/cvs-ppc-sqrt.diff: Upstreamed.
- debian/patches/powerpc/cvs-ppc-sqrtf.diff: Upstreamed.
- debian/patches/powerpc/cvs-ppc-tabort-le.diff: Upstreamed.
- debian/patches/all/local-alias-et_EE.diff: Rebased.
- debian/patches/amd64/local-blacklist-on-TSX-Haswell.diff: Rebased.
- debian/patches/any/local-libgcc-compat-ports.diff: Rebased.
- debian/patches/any/local-libpic.diff: Rebased.
- debian/patches/any/local-no-pagesize.diff: Rebased.
- debian/patches/any/submitted-longdouble.diff: Rebased.
- debian/patches/any/submitted-missing-etc-hosts.diff: Rebased.
- debian/patches/any/submitted-resolv-ipv6-nameservers.diff: Rebased.
- debian/patches/i386/submitted-i686-timing.diff: Rebased.
- debian/patches/localedata/local-all-no-archive.diff: Rebased.
- debian/patches/localedata/submitted-locale-bo.diff: Rebased.
- debian/patches/mips/submitted-rld_map.diff: Rebased.
* debian/{control,symbols.wildcards,copyright}: Updated strings for 2.22.
Modified: glibc-package/branches/glibc-2.22/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.22/debian/changelog 2015-09-17 18:58:37 UTC
(rev 6581)
+++ glibc-package/branches/glibc-2.22/debian/changelog 2015-09-17 19:00:13 UTC
(rev 6582)
@@ -1,3 +1,42 @@
+glibc (2.22-0experimental0) UNRELEASED; urgency=medium
+
+ * New upstream release: version 2.22, with git updates up to 2015-09-17:
+ - debian/patches/all/local-alias-UTF-8.diff: Fixed upstream.
+ - debian/patches/any/cvs-ldconfig-aux-cache.diff: Upstreamed.
+ - debian/patches/any/cvs-localplt-new-readelf.diff: Upstreamed.
+ - debian/patches/any/cvs-logbl-accuracy.diff: Upstreamed.
+ - debian/patches/any/cvs-make-typo.diff: Upstreamed.
+ - debian/patches/any/cvs-vismain-pie.diff: Upstreamed.
+ - debian/patches/any/local-xfail-stdlib-linkns.diff: Dropped.
+ - debian/patches/arm/cvs-arm-sfi_breg.diff: Upstreamed.
+ - debian/patches/arm/cvs-memcpy-memmove-always-bx.diff: Upstreamed.
+ - debian/patches/hppa/cvs-alloca-werror.diff: Upstreamed.
+ - debian/patches/hppa/cvs-fpu-r2.diff: Upstreamed.
+ - debian/patches/hppa/cvs-fpu2.diff: Upstreamed.
+ - debian/patches/hppa/local-fcntl-osync.diff: Fixed upstream.
+ - debian/patches/hppa/local-setcontext.diff: Fixed upstream.
+ - debian/patches/powerpc/cvs-power7-strncpy.diff: Upstreamed.
+ - debian/patches/powerpc/cvs-ppc-feraiseexcept.diff: Upstreamed.
+ - debian/patches/powerpc/cvs-ppc-pow.diff: Upstreamed.
+ - debian/patches/powerpc/cvs-ppc-sqrt.diff: Upstreamed.
+ - debian/patches/powerpc/cvs-ppc-sqrtf.diff: Upstreamed.
+ - debian/patches/powerpc/cvs-ppc-tabort-le.diff: Upstreamed.
+ - debian/patches/all/local-alias-et_EE.diff: Rebased.
+ - debian/patches/amd64/local-blacklist-on-TSX-Haswell.diff: Rebased.
+ - debian/patches/any/local-libgcc-compat-ports.diff: Rebased.
+ - debian/patches/any/local-libpic.diff: Rebased.
+ - debian/patches/any/local-no-pagesize.diff: Rebased.
+ - debian/patches/any/submitted-longdouble.diff: Rebased.
+ - debian/patches/any/submitted-missing-etc-hosts.diff: Rebased.
+ - debian/patches/any/submitted-resolv-ipv6-nameservers.diff: Rebased.
+ - debian/patches/i386/submitted-i686-timing.diff: Rebased.
+ - debian/patches/localedata/local-all-no-archive.diff: Rebased.
+ - debian/patches/localedata/submitted-locale-bo.diff: Rebased.
+ - debian/patches/mips/submitted-rld_map.diff: Rebased.
+ * debian/{control,symbols.wildcards,copyright}: Updated strings for 2.22.
+
+ -- Adam Conrad <[email protected]> Tue, 15 Sep 2015 17:57:41 -0600
+
glibc (2.21-0experimental2) UNRELEASED; urgency=medium
[ Samuel Thibault ]
Modified: glibc-package/branches/glibc-2.22/debian/control
===================================================================
--- glibc-package/branches/glibc-2.22/debian/control 2015-09-17 18:58:37 UTC
(rev 6581)
+++ glibc-package/branches/glibc-2.22/debian/control 2015-09-17 19:00:13 UTC
(rev 6582)
@@ -96,7 +96,7 @@
Architecture: all
Section: localization
Priority: standard
-Depends: libc-bin (>> 2.21), libc-l10n (>> 2.21), ${misc:Depends}, debconf |
debconf-2.0
+Depends: libc-bin (>> 2.22), libc-l10n (>> 2.22), ${misc:Depends}, debconf |
debconf-2.0
Replaces: manpages-fr-extra (<< 20141022)
Build-Profiles: <!stage1>
Description: GNU C Library: National Language (locale) data [support]
@@ -114,7 +114,7 @@
Section: localization
Priority: extra
Multi-Arch: foreign
-Depends: libc-l10n (>> 2.21), ${misc:Depends}
+Depends: libc-l10n (>> 2.22), ${misc:Depends}
Breaks: locales (<< 2.13-17)
Provides: locales
Build-Profiles: <!stage1>
@@ -165,7 +165,7 @@
Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
Conflicts: prelink (<= 0.0.20090311-1), libc6-loongson2f
-Breaks: nscd (<< 2.21), locales (<< 2.21), locales-all (<< 2.21), lsb-core (<=
3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386],
libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1),
libtirpc1 (<< 0.2.3)
+Breaks: nscd (<< 2.22), locales (<< 2.22), locales-all (<< 2.22), lsb-core (<=
3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386],
libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1),
libtirpc1 (<< 0.2.3)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
libc6-x32 [x32],
@@ -251,7 +251,7 @@
Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
Conflicts: prelink (<= 0.0.20090311-1), libc6-loongson2f
-Breaks: nscd (<< 2.21), locales (<< 2.21), locales-all (<< 2.21), lsb-core (<=
3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386],
libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1),
libtirpc1 (<< 0.2.3)
+Breaks: nscd (<< 2.22), locales (<< 2.22), locales-all (<< 2.22), lsb-core (<=
3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386],
libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1),
libtirpc1 (<< 0.2.3)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
libc6-x32 [x32],
@@ -337,7 +337,7 @@
Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
Conflicts: prelink (<= 0.0.20090311-1), libc6-loongson2f
-Breaks: nscd (<< 2.21), locales (<< 2.21), locales-all (<< 2.21), lsb-core (<=
3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386],
libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1),
libtirpc1 (<< 0.2.3)
+Breaks: nscd (<< 2.22), locales (<< 2.22), locales-all (<< 2.22), lsb-core (<=
3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386],
libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1),
libtirpc1 (<< 0.2.3)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
libc6-x32 [x32],
@@ -423,7 +423,7 @@
Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
Conflicts: prelink (<= 0.0.20090311-1), libc6-loongson2f
-Breaks: nscd (<< 2.21), locales (<< 2.21), locales-all (<< 2.21), lsb-core (<=
3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386],
libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1),
libtirpc1 (<< 0.2.3)
+Breaks: nscd (<< 2.22), locales (<< 2.22), locales-all (<< 2.22), lsb-core (<=
3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386],
libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1),
libtirpc1 (<< 0.2.3)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
libc6-x32 [x32],
Modified: glibc-package/branches/glibc-2.22/debian/copyright
===================================================================
--- glibc-package/branches/glibc-2.22/debian/copyright 2015-09-17 18:58:37 UTC
(rev 6581)
+++ glibc-package/branches/glibc-2.22/debian/copyright 2015-09-17 19:00:13 UTC
(rev 6582)
@@ -1,4 +1,4 @@
-This is the Debian prepackaged version of the GNU C Library version 2.21.
+This is the Debian prepackaged version of the GNU C Library version 2.22.
It was put together by the GNU Libc Maintainers <[email protected]>
from <git://sourceware.org/git/glibc.git>
Deleted:
glibc-package/branches/glibc-2.22/debian/patches/all/local-alias-UTF-8.diff
===================================================================
--- glibc-package/branches/glibc-2.22/debian/patches/all/local-alias-UTF-8.diff
2015-09-17 18:58:37 UTC (rev 6581)
+++ glibc-package/branches/glibc-2.22/debian/patches/all/local-alias-UTF-8.diff
2015-09-17 19:00:13 UTC (rev 6582)
@@ -1,24 +0,0 @@
----
- intl/locale.alias | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/intl/locale.alias
-+++ b/intl/locale.alias
-@@ -25,7 +25,7 @@
- # Locales should always be specified by their full name.
-
- bokmal nb_NO.ISO-8859-1
--bokm�l nb_NO.ISO-8859-1
-+bokmål nb_NO.ISO-8859-1
- catalan ca_ES.ISO-8859-1
- croatian hr_HR.ISO-8859-2
- czech cs_CZ.ISO-8859-2
-@@ -36,7 +36,7 @@
- eesti et_EE.ISO-8859-1
- estonian et_EE.ISO-8859-1
- finnish fi_FI.ISO-8859-1
--fran�ais fr_FR.ISO-8859-1
-+français fr_FR.ISO-8859-1
- french fr_FR.ISO-8859-1
- galego gl_ES.ISO-8859-1
- galician gl_ES.ISO-8859-1
Modified:
glibc-package/branches/glibc-2.22/debian/patches/all/local-alias-et_EE.diff
===================================================================
--- glibc-package/branches/glibc-2.22/debian/patches/all/local-alias-et_EE.diff
2015-09-17 18:58:37 UTC (rev 6581)
+++ glibc-package/branches/glibc-2.22/debian/patches/all/local-alias-et_EE.diff
2015-09-17 19:00:13 UTC (rev 6582)
@@ -13,5 +13,5 @@
+eesti et_EE.ISO-8859-15
+estonian et_EE.ISO-8859-15
finnish fi_FI.ISO-8859-1
- français fr_FR.ISO-8859-1
french fr_FR.ISO-8859-1
+ galego gl_ES.ISO-8859-1
Modified:
glibc-package/branches/glibc-2.22/debian/patches/amd64/local-blacklist-on-TSX-Haswell.diff
===================================================================
---
glibc-package/branches/glibc-2.22/debian/patches/amd64/local-blacklist-on-TSX-Haswell.diff
2015-09-17 18:58:37 UTC (rev 6581)
+++
glibc-package/branches/glibc-2.22/debian/patches/amd64/local-blacklist-on-TSX-Haswell.diff
2015-09-17 19:00:13 UTC (rev 6582)
@@ -84,5 +84,5 @@
#define bit_RTM (1 << 11)
+#define bit_HLE (1 << 4)
#define bit_AVX2 (1 << 5)
-
- /* XCR0 Feature flags. */
+ #define bit_AVX512F (1 << 16)
+ #define bit_AVX512DQ (1 << 17)
Deleted:
glibc-package/branches/glibc-2.22/debian/patches/any/cvs-ldconfig-aux-cache.diff
===================================================================
---
glibc-package/branches/glibc-2.22/debian/patches/any/cvs-ldconfig-aux-cache.diff
2015-09-17 18:58:37 UTC (rev 6581)
+++
glibc-package/branches/glibc-2.22/debian/patches/any/cvs-ldconfig-aux-cache.diff
2015-09-17 19:00:13 UTC (rev 6582)
@@ -1,20 +0,0 @@
-2015-03-11 Aurelien Jarno <[email protected]>
-
- [BZ #18093]
- * elf/cache.c (load_aux_cache): Regenerate the cache if it has
- the wrong size.
-
-diff --git a/elf/cache.c b/elf/cache.c
---- a/elf/cache.c
-+++ b/elf/cache.c
-@@ -698,7 +698,9 @@ load_aux_cache (const char *aux_cache_name)
- if (aux_cache == MAP_FAILED
- || aux_cache_size < sizeof (struct aux_cache_file)
- || memcmp (aux_cache->magic, AUX_CACHEMAGIC, sizeof AUX_CACHEMAGIC - 1)
-- || aux_cache->nlibs >= aux_cache_size)
-+ || aux_cache_size != (sizeof(struct aux_cache_file) +
-+ aux_cache->nlibs * sizeof(struct
aux_cache_file_entry) +
-+ aux_cache->len_strings))
- {
- close (fd);
- init_aux_cache ();
Deleted:
glibc-package/branches/glibc-2.22/debian/patches/any/cvs-localplt-new-readelf.diff
===================================================================
---
glibc-package/branches/glibc-2.22/debian/patches/any/cvs-localplt-new-readelf.diff
2015-09-17 18:58:37 UTC (rev 6581)
+++
glibc-package/branches/glibc-2.22/debian/patches/any/cvs-localplt-new-readelf.diff
2015-09-17 19:00:13 UTC (rev 6582)
@@ -1,31 +0,0 @@
-commit a0af371c25ac1f215cf0db64e54cbb9a1b51f78c
-Author: Alan Modra <[email protected]>
-Date: Fri Feb 20 15:23:28 2015 +1030
-
- Fix localplt test breakage with new readelf
-
- Since 2014-11-24 binutils git commit bb4d2ac2, readelf has appended
- the symbol version to symbols shown in reloc dumps.
-
- [BZ #16512]
- * scripts/localplt.awk: Strip off symbol version.
- * NEWS: Mention bug fix.
-
-diff --git a/scripts/localplt.awk b/scripts/localplt.awk
-index f55c41a..84c94d1 100644
---- a/scripts/localplt.awk
-+++ b/scripts/localplt.awk
-@@ -35,11 +35,11 @@ in_relocs && relocs_offset == jmprel_offset && NF >= 5 {
- # Relocations against GNU_IFUNC symbols are not shown as an hexadecimal
- # value, but rather as the resolver symbol followed by ().
- if ($4 ~ /\(\)/) {
-- print whatfile, $5
-+ print whatfile, gensub(/@.*/, "", "g", $5)
- } else {
- symval = strtonum("0x" $4);
- if (symval != 0)
-- print whatfile, $5
-+ print whatfile, gensub(/@.*/, "", "g", $5)
- }
- }
-
Deleted:
glibc-package/branches/glibc-2.22/debian/patches/any/cvs-logbl-accuracy.diff
===================================================================
---
glibc-package/branches/glibc-2.22/debian/patches/any/cvs-logbl-accuracy.diff
2015-09-17 18:58:37 UTC (rev 6581)
+++
glibc-package/branches/glibc-2.22/debian/patches/any/cvs-logbl-accuracy.diff
2015-09-17 19:00:13 UTC (rev 6582)
@@ -1,74 +0,0 @@
-commit 380bd0fd2418f8988217de950f8b8ff18af0cb2b
-Author: Joseph Myers <[email protected]>
-Date: Thu Feb 26 15:13:22 2015 +0000
-
- Fix ldbl-128ibm logbl near powers of 2 (bug 18030).
-
- The ldbl-128ibm implementation of logbl produces incorrect results
- when the high part of the argument is a power of 2 and the low part a
- nonzero number with the opposite sign (and so the returned exponent
- should be 1 less than that of the high part). For example, logbl
- (0x1.ffffffffffffffp1L) returns 2 but should return 1. (This is
- similar to (fixed) bug 16740 for frexpl, and (fixed) bug 18029 for
- ilogbl.) This patch adds checks for that case.
-
- Tested for powerpc.
-
- [BZ #18030]
- * sysdeps/ieee754/ldbl-128ibm/s_logbl.c (__logbl): Adjust exponent
- of power of 2 down when low part has opposite sign.
- * math/libm-test.inc (logb_test_data): Add more tests.
-
-diff --git a/math/libm-test.inc b/math/libm-test.inc
-index 6045764..7acd29b 100644
---- a/math/libm-test.inc
-+++ b/math/libm-test.inc
-@@ -7868,6 +7868,11 @@ static const struct test_f_f_data logb_test_data[] =
- TEST_f_f (logb, 0x1p-16400L, -16400, NO_INEXACT_EXCEPTION),
- TEST_f_f (logb, 0x.00000000001p-16382L, -16426, NO_INEXACT_EXCEPTION),
- #endif
-+
-+#if defined TEST_LDOUBLE && LDBL_MANT_DIG >= 57
-+ TEST_f_f (logb, 0x1.ffffffffffffffp1L, 1, NO_INEXACT_EXCEPTION),
-+ TEST_f_f (logb, -0x1.ffffffffffffffp1L, 1, NO_INEXACT_EXCEPTION),
-+#endif
- };
-
- static void
-diff --git a/sysdeps/ieee754/ldbl-128ibm/s_logbl.c
b/sysdeps/ieee754/ldbl-128ibm/s_logbl.c
-index dbd3478..22e5fc2 100644
---- a/sysdeps/ieee754/ldbl-128ibm/s_logbl.c
-+++ b/sysdeps/ieee754/ldbl-128ibm/s_logbl.c
-@@ -26,11 +26,12 @@
- long double
- __logbl (long double x)
- {
-- int64_t hx, rhx;
-- double xhi;
-+ int64_t hx, hxs, rhx;
-+ double xhi, xlo;
-
-- xhi = ldbl_high (x);
-+ ldbl_unpack (x, &xhi, &xlo);
- EXTRACT_WORDS64 (hx, xhi);
-+ hxs = hx;
- hx &= 0x7fffffffffffffffLL; /* high |x| */
- if (hx == 0)
- return -1.0 / fabs (x);
-@@ -42,6 +43,16 @@ __logbl (long double x)
- though it were normalized. */
- rhx -= __builtin_clzll (hx) - 12;
- }
-+ else if ((hx & 0x000fffffffffffffLL) == 0)
-+ {
-+ /* If the high part is a power of 2, and the low part is nonzero
-+ with the opposite sign, the low part affects the
-+ exponent. */
-+ int64_t lx;
-+ EXTRACT_WORDS64 (lx, xlo);
-+ if ((hxs ^ lx) < 0 && (lx & 0x7fffffffffffffffLL) != 0)
-+ rhx--;
-+ }
- return (long double) (rhx - 1023);
- }
- #ifndef __logbl
Deleted: glibc-package/branches/glibc-2.22/debian/patches/any/cvs-make-typo.diff
===================================================================
--- glibc-package/branches/glibc-2.22/debian/patches/any/cvs-make-typo.diff
2015-09-17 18:58:37 UTC (rev 6581)
+++ glibc-package/branches/glibc-2.22/debian/patches/any/cvs-make-typo.diff
2015-09-17 19:00:13 UTC (rev 6582)
@@ -1,19 +0,0 @@
-commit e8b6be0016f131c2ac72bf3213eabdb59800e63b
-Author: Andreas Schwab <[email protected]>
-Date: Mon Mar 2 15:47:56 2015 +0100
-
- Fix parallel build error
-
-diff --git a/elf/Makefile b/elf/Makefile
-index 20b1682..711beed 100644
---- a/elf/Makefile
-+++ b/elf/Makefile
-@@ -362,7 +362,7 @@ $(objpfx)interp.os: $(elf-objpfx)runtime-linker.h
-
- $(elf-objpfx)runtime-linker.h: $(elf-objpfx)runtime-linker.st; @:
- $(elf-objpfx)runtime-linker.st: $(common-objpfx)config.make
-- $(name-target-directory)
-+ $(make-target-directory)
- echo '#define RUNTIME_LINKER "$(rtlddir)/$(rtld-installed-name)"' \
- > ${@:st=T}
- $(move-if-change) ${@:st=T} ${@:st=h}
Deleted:
glibc-package/branches/glibc-2.22/debian/patches/any/cvs-vismain-pie.diff
===================================================================
--- glibc-package/branches/glibc-2.22/debian/patches/any/cvs-vismain-pie.diff
2015-09-17 18:58:37 UTC (rev 6581)
+++ glibc-package/branches/glibc-2.22/debian/patches/any/cvs-vismain-pie.diff
2015-09-17 19:00:13 UTC (rev 6582)
@@ -1,55 +0,0 @@
-commit ef4ad06fe5a615af9550d74b1b6d546b9dc0a64d
-Author: H.J. Lu <[email protected]>
-Date: Fri Feb 27 13:56:44 2015 -0800
-
- Compile vismain with -fPIE and link with -pie
-
- Protocted symbol in shared library can only be accessed from PIE
- or shared library. Linker in binutils 2.26 enforces it. We must
- compile vismain with -fPIE and link it with -pie.
-
- [BZ #17711]
- * elf/Makefile (tests): Add vismain only if PIE is enabled.
- (tests-pie): Add vismain.
- (CFLAGS-vismain.c): New.
- * elf/vismain.c: Add comments for PIE requirement.
-
-diff --git a/elf/Makefile b/elf/Makefile
-index f78642e..20b1682 100644
---- a/elf/Makefile
-+++ b/elf/Makefile
-@@ -130,7 +130,7 @@ endif
- tests += $(tests-static)
- ifeq (yes,$(build-shared))
- tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail
\
-- constload1 order vismain noload filter unload \
-+ constload1 order noload filter unload \
- reldep reldep2 reldep3 reldep4 nodelete nodelete2 \
- nodlopen nodlopen2 neededtest neededtest2 \
- neededtest3 neededtest4 unload2 lateglobal initfirst global \
-@@ -218,6 +218,9 @@ ifeq (yesyes,$(have-fpie)$(build-shared))
- modules-names += tst-piemod1
- tests += tst-pie1 tst-pie2
- tests-pie += tst-pie1 tst-pie2
-+tests += vismain
-+tests-pie += vismain
-+CFLAGS-vismain.c = $(PIE-ccflag)
- endif
- modules-execstack-yes = tst-execstack-mod
- extra-test-objs += $(addsuffix .os,$(strip $(modules-names)))
-diff --git a/elf/vismain.c b/elf/vismain.c
-index dfcaeeb..05b3748 100644
---- a/elf/vismain.c
-+++ b/elf/vismain.c
-@@ -15,6 +15,11 @@
- License along with the GNU C Library; if not, see
- <http://www.gnu.org/licenses/>. */
-
-+/* This file must be compiled as PIE to avoid copy relocation when
-+ accessing protected symbols defined in shared libaries since copy
-+ relocation doesn't work with protected symbols and linker in
-+ binutils 2.26 enforces this rule. */
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
Modified:
glibc-package/branches/glibc-2.22/debian/patches/any/local-libgcc-compat-ports.diff
===================================================================
---
glibc-package/branches/glibc-2.22/debian/patches/any/local-libgcc-compat-ports.diff
2015-09-17 18:58:37 UTC (rev 6581)
+++
glibc-package/branches/glibc-2.22/debian/patches/any/local-libgcc-compat-ports.diff
2015-09-17 19:00:13 UTC (rev 6582)
@@ -120,8 +120,8 @@
--- a/sysdeps/arm/Versions
+++ b/sysdeps/arm/Versions
@@ -17,4 +17,18 @@
- GLIBC_2.8 {
- __gnu_mcount_nc;
+ # This set has to exist in some Versions file so we can use 2.19 in
+ # SHLIB_COMPAT. Since it didn't exist anywhere else, we add it here.
}
+ GLIBC_2.0 {
+ # Functions from libgcc.
Modified: glibc-package/branches/glibc-2.22/debian/patches/any/local-libpic.diff
===================================================================
--- glibc-package/branches/glibc-2.22/debian/patches/any/local-libpic.diff
2015-09-17 18:58:37 UTC (rev 6581)
+++ glibc-package/branches/glibc-2.22/debian/patches/any/local-libpic.diff
2015-09-17 19:00:13 UTC (rev 6582)
@@ -15,9 +15,9 @@
$(inst_libdir)/$(patsubst %,$(libtype$o),\
$(libprefix)$(libc-name)))
+installed-libcs := $(installed-libcs) $(inst_libdir)/libc_pic.a
- install: $(installed-libcs)
- $(installed-libcs): $(inst_libdir)/lib$(libprefix)%: lib $(+force)
- $(make-target-directory)
+
+ .PHONY: check-install-supported
+ check-install-supported:
@@ -860,6 +883,22 @@
install-lib.so-versioned := $(filter $(versioned), $(install-lib.so))
install-lib.so-unversioned := $(filter-out $(versioned), $(install-lib.so))
Modified:
glibc-package/branches/glibc-2.22/debian/patches/any/local-no-pagesize.diff
===================================================================
--- glibc-package/branches/glibc-2.22/debian/patches/any/local-no-pagesize.diff
2015-09-17 18:58:37 UTC (rev 6581)
+++ glibc-package/branches/glibc-2.22/debian/patches/any/local-no-pagesize.diff
2015-09-17 19:00:13 UTC (rev 6582)
@@ -1,31 +1,10 @@
---
- sysdeps/unix/sysv/linux/ia64/sys/user.h | 3 ++-
- sysdeps/unix/sysv/linux/mips/sys/user.h | 4 ++--
sysdeps/unix/sysv/linux/check_native.c | 6 ------
sysdeps/unix/sysv/linux/check_pf.c | 6 ------
sysdeps/unix/sysv/linux/ifaddrs.c | 6 ------
sysdeps/unix/sysv/linux/x86/sys/user.h | 2 ++
6 files changed, 6 insertions(+), 21 deletions(-)
---- a/sysdeps/unix/sysv/linux/ia64/sys/user.h
-+++ b/sysdeps/unix/sysv/linux/ia64/sys/user.h
-@@ -20,6 +20,7 @@
-
- #include <features.h>
- #include <sys/types.h>
-+#include <unistd.h>
-
- /* This definition comes directly from the kernel headers. If
- anything changes in them this header has to be changed, too. */
-@@ -44,7 +45,7 @@
- char u_comm[32]; /* User command name. */
- };
-
--#define NBPG PAGE_SIZE
-+#define NBPG (sysconf(_SC_PAGESIZE))
- #define UPAGES 1
- #define HOST_TEXT_START_ADDR (u.start_code)
- #define HOST_DATA_START_ADDR (u.start_data)
--- a/sysdeps/unix/sysv/linux/x86/sys/user.h
+++ b/sysdeps/unix/sysv/linux/x86/sys/user.h
@@ -22,6 +22,8 @@
Deleted:
glibc-package/branches/glibc-2.22/debian/patches/any/local-xfail-stdlib-linkns.diff
===================================================================
---
glibc-package/branches/glibc-2.22/debian/patches/any/local-xfail-stdlib-linkns.diff
2015-09-17 18:58:37 UTC (rev 6581)
+++
glibc-package/branches/glibc-2.22/debian/patches/any/local-xfail-stdlib-linkns.diff
2015-09-17 19:00:13 UTC (rev 6582)
@@ -1,20 +0,0 @@
-Description: XFAIL more instances of stdlib linknamespace sadness
-Author: Adam Conrad <[email protected]>
-
---- glibc-2.21.orig/conform/Makefile
-+++ glibc-2.21/conform/Makefile
-@@ -350,6 +350,7 @@ test-xfail-XPG3/glob.h/linknamespace = y
- test-xfail-XPG3/regex.h/linknamespace = yes
- test-xfail-XPG3/search.h/linknamespace = yes
- test-xfail-XPG3/stdio.h/linknamespace = yes
-+test-xfail-XPG3/stdlib.h/linknamespace = yes
- test-xfail-XPG3/unistd.h/linknamespace = yes
- test-xfail-XPG3/wordexp.h/linknamespace = yes
- test-xfail-XPG4/fmtmsg.h/linknamespace = yes
-@@ -413,5 +414,6 @@ test-xfail-XOPEN2K8/pwd.h/linknamespace
- test-xfail-XOPEN2K8/regex.h/linknamespace = yes
- test-xfail-XOPEN2K8/search.h/linknamespace = yes
- test-xfail-XOPEN2K8/spawn.h/linknamespace = yes
-+test-xfail-XOPEN2K8/stdlib.h/linknamespace = yes
- test-xfail-XOPEN2K8/syslog.h/linknamespace = yes
- test-xfail-XOPEN2K8/unistd.h/linknamespace = yes
Modified:
glibc-package/branches/glibc-2.22/debian/patches/any/submitted-longdouble.diff
===================================================================
---
glibc-package/branches/glibc-2.22/debian/patches/any/submitted-longdouble.diff
2015-09-17 18:58:37 UTC (rev 6581)
+++
glibc-package/branches/glibc-2.22/debian/patches/any/submitted-longdouble.diff
2015-09-17 19:00:13 UTC (rev 6582)
@@ -4,7 +4,7 @@
--- a/math/Makefile
+++ b/math/Makefile
-@@ -92,12 +92,16 @@
+@@ -92,13 +92,17 @@
test-fenv-tls test-fenv-preserve test-fenv-return test-fenvinline \
$(tests-static)
tests-static = test-fpucw-static test-fpucw-ieee-static
@@ -19,9 +19,10 @@
+endif
+
ifneq (no,$(PERL))
+ libm-vec-tests = $(addprefix test-,$(libmvec-tests))
-libm-tests = test-float test-double $(test-longdouble-$(long-double-fcts)) \
+libm-tests = test-float test-double
$(test-longdouble-$(test-long-double-fcts)) \
- test-ifloat test-idouble
+ test-ifloat test-idouble $(libm-vec-tests)
libm-tests.o = $(addsuffix .o,$(libm-tests))
@@ -174,11 +178,15 @@
Modified:
glibc-package/branches/glibc-2.22/debian/patches/any/submitted-missing-etc-hosts.diff
===================================================================
---
glibc-package/branches/glibc-2.22/debian/patches/any/submitted-missing-etc-hosts.diff
2015-09-17 18:58:37 UTC (rev 6581)
+++
glibc-package/branches/glibc-2.22/debian/patches/any/submitted-missing-etc-hosts.diff
2015-09-17 19:00:13 UTC (rev 6582)
@@ -12,4 +12,4 @@
+ *herrnop = HOST_NOT_FOUND;
}
- __libc_lock_unlock (lock);
+ return status;
Modified:
glibc-package/branches/glibc-2.22/debian/patches/any/submitted-resolv-ipv6-nameservers.diff
===================================================================
---
glibc-package/branches/glibc-2.22/debian/patches/any/submitted-resolv-ipv6-nameservers.diff
2015-09-17 18:58:37 UTC (rev 6581)
+++
glibc-package/branches/glibc-2.22/debian/patches/any/submitted-resolv-ipv6-nameservers.diff
2015-09-17 19:00:13 UTC (rev 6582)
@@ -1,51 +1,11 @@
2014-06-13 Aurelien Jarno <[email protected]>
[BZ #17053]
- * resolv/res_init.c (__res_vinit): Fill in IPv4 name server
- information using the nserv index. Only count IPv4 name servers
- in statp->nscount.
- * resolv/res_init.c (__res_vinit): Check for both IPv4 and IPv6
- name servers before adding a localhost name server entry.
* resolv/res_send.c (__libc_res_nsend): Check for both IPv4 and
IPv6 name servers before ignoring the request.
(send_dg): Check for both IPv4 and IPv6 name servers to compute
time for the total operation.
-diff --git a/resolv/res_init.c b/resolv/res_init.c
-index ea133f8..42e16b6 100644
---- a/resolv/res_init.c
-+++ b/resolv/res_init.c
-@@ -308,9 +308,9 @@ __res_vinit(res_state statp, int preinit) {
- cp++;
- if ((*cp != '\0') && (*cp != '\n')
- && __inet_aton(cp, &a)) {
-- statp->nsaddr_list[nservall].sin_addr = a;
-- statp->nsaddr_list[nservall].sin_family = AF_INET;
-- statp->nsaddr_list[nservall].sin_port =
-+ statp->nsaddr_list[nserv].sin_addr = a;
-+ statp->nsaddr_list[nserv].sin_family = AF_INET;
-+ statp->nsaddr_list[nserv].sin_port =
- htons(NAMESERVER_PORT);
- nserv++;
- #ifdef _LIBC
-@@ -414,7 +414,7 @@ __res_vinit(res_state statp, int preinit) {
- continue;
- }
- }
-- statp->nscount = nservall;
-+ statp->nscount = nserv;
- #ifdef _LIBC
- if (nservall - nserv > 0) {
- statp->_u._ext.nscount6 = nservall - nserv;
-@@ -427,7 +427,7 @@ __res_vinit(res_state statp, int preinit) {
- #endif
- (void) fclose(fp);
- }
-- if (__builtin_expect(statp->nscount == 0, 0)) {
-+ if (__builtin_expect(nservall == 0, 0)) {
- statp->nsaddr.sin_addr = __inet_makeaddr(IN_LOOPBACKNET, 1);
- statp->nsaddr.sin_family = AF_INET;
- statp->nsaddr.sin_port = htons(NAMESERVER_PORT);
diff --git a/resolv/res_send.c b/resolv/res_send.c
index af42b8a..82242bd 100644
--- a/resolv/res_send.c
Deleted:
glibc-package/branches/glibc-2.22/debian/patches/arm/cvs-arm-sfi_breg.diff
===================================================================
--- glibc-package/branches/glibc-2.22/debian/patches/arm/cvs-arm-sfi_breg.diff
2015-09-17 18:58:37 UTC (rev 6581)
+++ glibc-package/branches/glibc-2.22/debian/patches/arm/cvs-arm-sfi_breg.diff
2015-09-17 19:00:13 UTC (rev 6582)
@@ -1,28 +0,0 @@
-commit f8d1bb4c25849b528b9771cb5834b0cd17450ae3
-Author: Roland McGrath <[email protected]>
-Date: Fri Feb 6 14:42:18 2015 -0800
-
- ARM: Add missing sfi_breg in LDR_GLOBAL macro.
-
-diff --git a/sysdeps/arm/sysdep.h b/sysdeps/arm/sysdep.h
-index eaa4b94..9bbd009 100644
---- a/sysdeps/arm/sysdep.h
-+++ b/sysdeps/arm/sysdep.h
-@@ -198,7 +198,7 @@
- # define LDR_GLOBAL(R, T, SYMBOL, CONSTANT) \
- movw T, #:lower16:SYMBOL; \
- movt T, #:upper16:SYMBOL; \
-- ldr R, [T, $CONSTANT]
-+ sfi_breg T, ldr R, [\B, $CONSTANT]
- # elif defined (ARCH_HAS_T2) && defined (PIC) && ARM_PCREL_MOVW_OK
- # define LDR_GLOBAL(R, T, SYMBOL, CONSTANT) \
- movw R, #:lower16:_GLOBAL_OFFSET_TABLE_ - 97f - PC_OFS; \
-@@ -212,7 +212,7 @@
- 97: add R, R, pc; \
- 98: LDST_PC_INDEXED (ldr, T, T, T); \
- LDST_INDEXED (ldr, R, T, R, T); \
-- ldr R, [R, $CONSTANT]
-+ sfi_breg R, ldr R, [\B, $CONSTANT]
- # else
- # define LDR_GLOBAL(R, T, SYMBOL, CONSTANT) \
- ldr T, 99f; \
Deleted:
glibc-package/branches/glibc-2.22/debian/patches/arm/cvs-memcpy-memmove-always-bx.diff
===================================================================
---
glibc-package/branches/glibc-2.22/debian/patches/arm/cvs-memcpy-memmove-always-bx.diff
2015-09-17 18:58:37 UTC (rev 6581)
+++
glibc-package/branches/glibc-2.22/debian/patches/arm/cvs-memcpy-memmove-always-bx.diff
2015-09-17 19:00:13 UTC (rev 6582)
@@ -1,80 +0,0 @@
-commit 298e5d56dca199aea2c18ef27dd33bd82c879ee4
-Author: Roland McGrath <[email protected]>
-Date: Thu Mar 19 12:45:24 2015 -0700
-
- ARM: Fix memcpy & memmove for [ARM_ALWAYS_BX]
-
-diff --git a/sysdeps/arm/memcpy.S b/sysdeps/arm/memcpy.S
-index 0602d99..3e41ea6 100644
---- a/sysdeps/arm/memcpy.S
-+++ b/sysdeps/arm/memcpy.S
-@@ -125,7 +125,12 @@ ENTRY(memcpy)
- push {r10}
- cfi_adjust_cfa_offset (4)
- cfi_rel_offset (r10, 0)
-- add r10, pc, ip, lsl #(ARM_BX_ALIGN_LOG2 - 2)
-+0: add r10, pc, ip, lsl #(ARM_BX_ALIGN_LOG2 - 2)
-+ /* If alignment is not perfect, then there will be some
-+ padding (nop) instructions between this BX and label 6.
-+ The computation above assumed that two instructions
-+ later is exactly the right spot. */
-+ add r10, #(6f - (0b + PC_OFS))
- bx r10
- #endif
- .p2align ARM_BX_ALIGN_LOG2
-@@ -156,11 +161,16 @@ ENTRY(memcpy)
- add pc, pc, ip, lsl #(ARM_BX_ALIGN_LOG2 - 2)
- nop
- #else
-- add r10, pc, ip, lsl #(ARM_BX_ALIGN_LOG2 - 2)
-+0: add r10, pc, ip, lsl #(ARM_BX_ALIGN_LOG2 - 2)
-+ /* If alignment is not perfect, then there will be some
-+ padding (nop) instructions between this BX and label 66.
-+ The computation above assumed that two instructions
-+ later is exactly the right spot. */
-+ add r10, #(66f - (0b + PC_OFS))
- bx r10
- #endif
- .p2align ARM_BX_ALIGN_LOG2
-- nop
-+66: nop
- .p2align ARM_BX_ALIGN_LOG2
- sfi_breg r0, \
- str r3, [\B], #4
-diff --git a/sysdeps/arm/memmove.S b/sysdeps/arm/memmove.S
-index f8a4eff..dde877e 100644
---- a/sysdeps/arm/memmove.S
-+++ b/sysdeps/arm/memmove.S
-@@ -141,7 +141,12 @@ ENTRY(memmove)
- push {r10}
- cfi_adjust_cfa_offset (4)
- cfi_rel_offset (r10, 0)
-- add r10, pc, ip, lsl #(ARM_BX_ALIGN_LOG2 - 2)
-+0: add r10, pc, ip, lsl #(ARM_BX_ALIGN_LOG2 - 2)
-+ /* If alignment is not perfect, then there will be some
-+ padding (nop) instructions between this BX and label 6.
-+ The computation above assumed that two instructions
-+ later is exactly the right spot. */
-+ add r10, #(6f - (0b + PC_OFS))
- bx r10
- #endif
- .p2align ARM_BX_ALIGN_LOG2
-@@ -172,11 +177,16 @@ ENTRY(memmove)
- add pc, pc, ip, lsl #(ARM_BX_ALIGN_LOG2 - 2)
- nop
- #else
-- add r10, pc, ip, lsl #(ARM_BX_ALIGN_LOG2 - 2)
-+0: add r10, pc, ip, lsl #(ARM_BX_ALIGN_LOG2 - 2)
-+ /* If alignment is not perfect, then there will be some
-+ padding (nop) instructions between this BX and label 66.
-+ The computation above assumed that two instructions
-+ later is exactly the right spot. */
-+ add r10, #(66f - (0b + PC_OFS))
- bx r10
- #endif
- .p2align ARM_BX_ALIGN_LOG2
-- nop
-+66: nop
- .p2align ARM_BX_ALIGN_LOG2
- sfi_breg r0, \
- str r3, [\B, #-4]!
Modified: glibc-package/branches/glibc-2.22/debian/patches/git-updates.diff
===================================================================
--- glibc-package/branches/glibc-2.22/debian/patches/git-updates.diff
2015-09-17 18:58:37 UTC (rev 6581)
+++ glibc-package/branches/glibc-2.22/debian/patches/git-updates.diff
2015-09-17 19:00:13 UTC (rev 6582)
@@ -1,233 +1,732 @@
-GIT update of git://sourceware.org/git/glibc.git/release/2.21/master from
glibc-2.21
+GIT update of git://sourceware.org/git/glibc.git/release/2.22/master from
glibc-2.22
diff --git a/ChangeLog b/ChangeLog
-index dc1ed1b..61e6671 100644
+index cb9124e..a25da67 100644
--- a/ChangeLog
+++ b/ChangeLog
-@@ -1,3 +1,40 @@
-+2015-07-27 Mike Frysinger <[email protected]>
+@@ -1,3 +1,93 @@
++2015-09-15 Roland McGrath <[email protected]>
+
-+ * sysdeps/ia64/bits/atomic.h (atomic_exchange_and_add): Define
-+ directly in terms of __sync_fetch_and_add and delete (int) cast.
++ * misc/sys/param.h [!MAXHOSTNAMELEN && HOST_NAME_MAX]
++ (MAXHOSTNAMELEN): Define it to HOST_NAME_MAX.
+
-+2015-02-22 Paul Pluzhnikov <[email protected]>
++2015-09-11 Roland McGrath <[email protected]>
+
-+ [BZ #17269]
-+ * libio/wstrops.c (_IO_wstr_overflow): Guard against integer overflow
-+ (enlarge_userbuf): Likewise.
++ * 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-02-26 Andreas Schwab <[email protected]>
++2015-09-04 Roland McGrath <[email protected]>
+
-+ [BZ #18032]
-+ * posix/fnmatch_loop.c (FCT): Remove extra increment when skipping
-+ over collating symbol inside a bracket expression. Minor cleanup.
-+ * posix/tst-fnmatch3.c (do_test): Add test case.
++ [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 <[email protected]>, diagnosed by
++ Bernhard Voelker <[email protected]>.
+
-+2015-07-21 Mike Frysinger <[email protected]>
++2015-08-31 Brett Neumeier <[email protected]>
+
-+ [BZ #18694]
-+ * sysdeps/unix/sysv/linux/sparc/bits/sigaction.h: Include
-+ bits/wordsize.h.
-+ (sigaction): Declare __glibc_reserved0 only when __WORDSIZE is 64.
++ [BZ #18870]
++ * sysdeps/sparc/sparc32/sem_open.c: Add missing #include
+
-+2015-04-21 Arjun Shankar <[email protected]>
++2015-08-28 Mike Frysinger <[email protected]>
+
-+ [BZ #18287]
-+ * resolv/nss_dns/dns-host.c (getanswer_r): Adjust buffer length
-+ based on padding. (CVE-2015-1781)
++ [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-02-10 Evangelos Foutras <[email protected]>
++2015-08-25 Roland McGrath <[email protected]>
+
-+ [BZ #17949]
-+ * sysdeps/i386/i686/multiarch/mempcpy_chk.S: Fix position of
-+ jump label.
++ * sysdeps/nacl/start.c (_start): Call __nacl_main instead of main
++ if the weak reference is not null.
+
- 2015-02-06 Carlos O'Donell <[email protected]>
++2015-08-19 Andrew Senkevich <[email protected]>
++
++ [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 <[email protected]>
++
++ [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 <[email protected]>
++
++ [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 <[email protected]>
++
++ [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 <[email protected]>
++
++ * 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 <[email protected]>
++
++ * sysdeps/hppa/dl-symaddr.c (_dl_symbol_address): Add rtld_hidden_def.
++
++2015-08-05 Zack Weinberg <[email protected]>
++
++ * misc/regexp.h: Update comments.
++
+ 2015-08-05 Carlos O'Donell <[email protected]>
* version.h (RELEASE): Set to "stable".
-@@ -7,6 +44,7 @@
- * sysdeps/unix/sysv/linux/hppa/pthread.h: Sync with pthread.h.
-
- 2015-02-05 Paul Pluzhnikov <[email protected]>
-+ Paul Eggert <[email protected]>
-
- [BZ #16618]
- * stdio-common/tst-sscanf.c (main): Test for buffer overflow.
diff --git a/NEWS b/NEWS
-index 617cdbb..e3588fc 100644
+index 4c31de7..d220c07 100644
--- a/NEWS
+++ b/NEWS
-@@ -5,6 +5,23 @@ See the end for copying conditions.
+@@ -5,6 +5,12 @@ See the end for copying conditions.
Please send GNU C library bug reports via <http://sourceware.org/bugzilla/>
using `glibc' in the "product" field.
-+Version 2.21.1
++Version 2.22.1
+
+* The following bugs are resolved with this release:
+
-+ 17269, 17949, 18032, 18287, 18694.
-+
-+* A buffer overflow in gethostbyname_r and related functions performing DNS
-+ requests has been fixed. If the NSS functions were called with a
-+ misaligned buffer, the buffer length change due to pointer alignment was
-+ not taken into account. This could result in application crashes or,
-+ potentially arbitrary code execution, using crafted, but syntactically
-+ valid DNS responses. (CVE-2015-1781)
-+
-+* The 32-bit sparc sigaction ABI was inadvertently broken in the 2.20 and 2.21
-+ releases. It has been fixed to match 2.19 and older, but binaries built
-+ against 2.20 and 2.21 might need to be recompiled. See BZ#18694.
++ 18778, 18781, 18787, 18796, 18870, 18887, 18921.
+
- Version 2.21
+ Version 2.22
* The following bugs are resolved with this release:
-@@ -21,10 +38,11 @@ Version 2.21
- 17801, 17803, 17806, 17834, 17844, 17848, 17868, 17869, 17870, 17885,
- 17892.
+@@ -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 <regex.h> instead.
--* CVE-2015-1472 Under certain conditions wscanf can allocate too little
-- memory for the to-be-scanned arguments and overflow the allocated
-- buffer. The implementation now correctly computes the required buffer
-- size when using malloc.
-+* CVE-2015-1472 CVE-2015-1473 Under certain conditions wscanf can allocate
-+ too little memory for the to-be-scanned arguments and overflow the
-+ allocated buffer. The implementation now correctly computes the required
-+ buffer size when using malloc, and switches to malloc from alloca as
-+ intended.
+- 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
- * A new semaphore algorithm has been implemented in generic C code for all
- machines. Previous custom assembly implementations of semaphore were
-diff --git a/libio/wstrops.c b/libio/wstrops.c
-index 43d847d..3993579 100644
---- a/libio/wstrops.c
-+++ b/libio/wstrops.c
-@@ -95,8 +95,11 @@ _IO_wstr_overflow (fp, c)
- wchar_t *old_buf = fp->_wide_data->_IO_buf_base;
- size_t old_wblen = _IO_wblen (fp);
- _IO_size_t new_size = 2 * old_wblen + 100;
-- if (new_size < old_wblen)
+ 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
+
-+ if (__glibc_unlikely (new_size < old_wblen)
-+ || __glibc_unlikely (new_size > SIZE_MAX / sizeof (wchar_t)))
- return EOF;
++LDFLAGS-tst-nodelete2 = -rdynamic
+
- new_buf
- = (wchar_t *) (*((_IO_strfile *) fp)->_s._allocate_buffer) (new_size
- *
sizeof (wchar_t));
-@@ -186,6 +189,9 @@ enlarge_userbuf (_IO_FILE *fp, _IO_off64_t offset, int
reading)
- return 1;
+ $(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];
- _IO_size_t newsize = offset + 100;
-+ if (__glibc_unlikely (newsize > SIZE_MAX / sizeof (wchar_t)))
-+ return 1;
++ /* 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;
+
- wchar_t *oldbuf = wd->_IO_buf_base;
- wchar_t *newbuf
- = (wchar_t *) (*((_IO_strfile *) fp)->_s._allocate_buffer) (newsize
-diff --git a/posix/fnmatch_loop.c b/posix/fnmatch_loop.c
-index c0cb2fc..72c5d8f 100644
---- a/posix/fnmatch_loop.c
-+++ b/posix/fnmatch_loop.c
-@@ -945,14 +945,13 @@ FCT (pattern, string, string_end, no_leading_period,
flags, ends, alloca_used)
- }
- else if (c == L('[') && *p == L('.'))
- {
-- ++p;
- while (1)
- {
- c = *++p;
-- if (c == '\0')
-+ if (c == L('\0'))
- return FNM_NOMATCH;
+ /* 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;
-- if (*p == L('.') && p[1] == L(']'))
-+ if (c == L('.') && p[1] == L(']'))
- break;
- }
- p += 2;
-diff --git a/posix/tst-fnmatch3.c b/posix/tst-fnmatch3.c
-index d27a557..75bc00a 100644
---- a/posix/tst-fnmatch3.c
-+++ b/posix/tst-fnmatch3.c
-@@ -21,9 +21,11 @@
+- /* 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 <stdio.h>
++#include <stdlib.h>
++#include <gnu/lib-names.h>
++
++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 (void)
+ do_test (int argc, char *argv[])
{
-- const char *pattern = "[[:alpha:]'[:alpha:]\0]";
+- 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/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 <regex.h> 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 <regex.h> 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
++ <http://www.gnu.org/licenses/>. */
++
++#include <mntent.h>
++#include <stdio.h>
++#include <string.h>
++
++/* 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
++ <http://www.gnu.org/licenses/>. */
++
++#include <mntent.h>
++#include <stdio.h>
++#include <string.h>
++
++/* 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;
+ }
-
-- return fnmatch (pattern, "a", 0) != FNM_NOMATCH;
-+ if (fnmatch ("[[:alpha:]'[:alpha:]\0]", "a", 0) != FNM_NOMATCH)
-+ return 1;
-+ if (fnmatch ("[a[.\0.]]", "a", 0) != FNM_NOMATCH)
-+ return 1;
-+ return 0;
+- /* 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.";
}
- #define TEST_FUNCTION do_test ()
-diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c
-index f715ab0..40069a7 100644
---- a/resolv/nss_dns/dns-host.c
-+++ b/resolv/nss_dns/dns-host.c
-@@ -615,7 +615,8 @@ getanswer_r (const querybuf *answer, int anslen, const
char *qname, int qtype,
- int have_to_map = 0;
- uintptr_t pad = -(uintptr_t) buffer % __alignof__ (struct host_data);
- buffer += pad;
-- if (__glibc_unlikely (buflen < sizeof (struct host_data) + pad))
-+ buflen = buflen > pad ? buflen - pad : 0;
-+ if (__glibc_unlikely (buflen < sizeof (struct host_data)))
- {
- /* The buffer is too small. */
- too_small:
-diff --git a/sysdeps/i386/i686/multiarch/mempcpy_chk.S
b/sysdeps/i386/i686/multiarch/mempcpy_chk.S
-index 207b648..b6fa202 100644
---- a/sysdeps/i386/i686/multiarch/mempcpy_chk.S
-+++ b/sysdeps/i386/i686/multiarch/mempcpy_chk.S
-@@ -36,8 +36,8 @@ ENTRY(__mempcpy_chk)
- cmpl $0, KIND_OFFSET+__cpu_features@GOTOFF(%ebx)
- jne 1f
- call __init_cpu_features
-- leal __mempcpy_chk_ia32@GOTOFF(%ebx), %eax
--1: testl $bit_SSE2, CPUID_OFFSET+index_SSE2+__cpu_features@GOTOFF(%ebx)
-+1: leal __mempcpy_chk_ia32@GOTOFF(%ebx), %eax
-+ testl $bit_SSE2, CPUID_OFFSET+index_SSE2+__cpu_features@GOTOFF(%ebx)
- jz 2f
- leal __mempcpy_chk_sse2_unaligned@GOTOFF(%ebx), %eax
- testl $bit_Fast_Unaligned_Load,
FEATURE_OFFSET+index_Fast_Unaligned_Load+__cpu_features@GOTOFF(%ebx)
-diff --git a/sysdeps/ia64/bits/atomic.h b/sysdeps/ia64/bits/atomic.h
-index 0e9dfc7..4c2b540 100644
---- a/sysdeps/ia64/bits/atomic.h
-+++ b/sysdeps/ia64/bits/atomic.h
-@@ -82,9 +82,7 @@ typedef uintmax_t uatomic_max_t;
- (__sync_synchronize (), __sync_lock_test_and_set (mem, value))
++if (system ("grep -q \"build-mathvec = yes\" $config") == 0) {
++ $build_mathvec = 1;
++} else {
++ $build_mathvec = 0;
++}
- #define atomic_exchange_and_add(mem, value) \
-- ({ __typeof (*mem) __result;
\
-- __result = __sync_fetch_and_add ((mem), (int) (value)); \
-- __result; })
-+ __sync_fetch_and_add ((mem), (value))
+ # Read names and versions of all shared libraries that are part of
+ # glibc
+@@ -111,6 +120,8 @@ while (<SOVERSIONS>) {
+ # - 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/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);
- #define atomic_decrement_if_positive(mem) \
- ({ __typeof (*mem) __oldval, __val; \
-diff --git a/sysdeps/unix/sysv/linux/sparc/bits/sigaction.h
b/sysdeps/unix/sysv/linux/sparc/bits/sigaction.h
-index 0750b52..3af5541 100644
---- a/sysdeps/unix/sysv/linux/sparc/bits/sigaction.h
-+++ b/sysdeps/unix/sysv/linux/sparc/bits/sigaction.h
-@@ -20,6 +20,8 @@
- # error "Never include <bits/sigaction.h> directly; use <signal.h> instead."
++/* 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 <sys/mman.h>
+ #include <sys/stat.h>
+ #include "semaphoreP.h"
++#include <futex-internal.h>
+ #include <shm-directory.h>
-+#include <bits/wordsize.h>
+
+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
+ <http://www.gnu.org/licenses/>. */
+
++#ifndef _LINUX_MICROBLAZE_SYSDEP_H
++#define _LINUX_MICROBLAZE_SYSDEP_H 1
+
- /* Structure describing the action to be taken when a signal arrives. */
- struct sigaction
- {
-@@ -43,7 +45,9 @@ struct sigaction
- __sigset_t sa_mask;
++#include <sysdeps/unix/sysdep.h>
+ #include <sysdeps/microblaze/sysdep.h>
+-#include <sys/syscall.h>
- /* Special flags. */
-+#if __WORDSIZE == 64
- int __glibc_reserved0;
+ /* Defines RTLD_PRIVATE_ERRNO. */
+ #include <dl-sysdep.h>
+@@ -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
- int sa_flags;
-
- /* Not used by Linux/Sparc yet. */
++
+ return SYSCALL_CANCEL (openat, fd, file, oflag, mode);
+ }
+ libc_hidden_def (__OPENAT)
Deleted:
glibc-package/branches/glibc-2.22/debian/patches/hppa/cvs-alloca-werror.diff
===================================================================
---
glibc-package/branches/glibc-2.22/debian/patches/hppa/cvs-alloca-werror.diff
2015-09-17 18:58:37 UTC (rev 6581)
+++
glibc-package/branches/glibc-2.22/debian/patches/hppa/cvs-alloca-werror.diff
2015-09-17 19:00:13 UTC (rev 6582)
@@ -1,26 +0,0 @@
-2015-02-24 Mike Frysinger <[email protected]>
-
- * include/alloca.h [_STACK_GROWS_DOWN] (extend_alloca): Add
- parenthesis around the buf assignment.
- [_STACK_GROWS_UP] (extend_alloca): Add a char* cast.
-
---- a/include/alloca.h
-+++ b/include/alloca.h
-@@ -28,7 +28,7 @@ libc_hidden_proto (__libc_alloca_cutoff)
- # define extend_alloca(buf, len, newlen) \
- (__typeof (buf)) ({ size_t __newlen = stackinfo_alloca_round (newlen);
\
- char *__newbuf = __alloca (__newlen); \
-- if (__newbuf + __newlen == (char *) buf) \
-+ if (__newbuf + __newlen == (char *) (buf)) \
- len += __newlen; \
- else \
- len = __newlen; \
-@@ -37,7 +37,7 @@ libc_hidden_proto (__libc_alloca_cutoff)
- # define extend_alloca(buf, len, newlen) \
- (__typeof (buf)) ({ size_t __newlen = stackinfo_alloca_round (newlen);
\
- char *__newbuf = __alloca (__newlen); \
-- char *__buf = (buf); \
-+ char *__buf = (char *) (buf); \
- if (__buf + len == __newbuf) \
- { \
- len += __newlen; \
Deleted: glibc-package/branches/glibc-2.22/debian/patches/hppa/cvs-fpu-r2.diff
===================================================================
--- glibc-package/branches/glibc-2.22/debian/patches/hppa/cvs-fpu-r2.diff
2015-09-17 18:58:37 UTC (rev 6581)
+++ glibc-package/branches/glibc-2.22/debian/patches/hppa/cvs-fpu-r2.diff
2015-09-17 19:00:13 UTC (rev 6582)
@@ -1,57 +0,0 @@
-2015-03-07 John David Anglin <[email protected]>
-
- * sysdeps/hppa/fpu/feholdexcpt.c (feholdexcept): Don't modify
- bufptr in asms.
- * sysdeps/hppa/fpu/fesetenv.c (fesetenv): Likewise.
-
-Index: glibc-2.21/sysdeps/hppa/fpu/feholdexcpt.c
-===================================================================
---- glibc-2.21.orig/sysdeps/hppa/fpu/feholdexcpt.c
-+++ glibc-2.21/sysdeps/hppa/fpu/feholdexcpt.c
-@@ -29,8 +29,8 @@ feholdexcept (fenv_t *envp)
- /* Store the environment. */
- bufptr = clear.buf;
- __asm__ (
-- "fstd,ma %%fr0,8(%1)\n"
-- : "=m" (clear), "+r" (bufptr) : : "%r0");
-+ "fstd %%fr0,0(%1)\n"
-+ : "=m" (clear) : "r" (bufptr) : "%r0");
- memcpy (envp, &clear.env, sizeof (fenv_t));
-
- /* Clear exception queues */
-@@ -40,11 +40,9 @@ feholdexcept (fenv_t *envp)
- /* Now clear all flags */
- clear.env.__status_word &= ~(FE_ALL_EXCEPT << 27);
-
-- /* Load the new environment. Note: fr0 must load last to enable T-bit
-- Thus we start bufptr at the end and work backwards */
-- bufptr = (unsigned long long *)((unsigned int)(clear.buf) + sizeof(unsigned
int)*4);
-+ /* Load the new environment. Note: fr0 must load last to enable T-bit. */
- __asm__ (
-- "fldd,mb -8(%0),%%fr0\n"
-+ "fldd 0(%0),%%fr0\n"
- : : "r" (bufptr), "m" (clear) : "%r0");
-
- return 0;
-Index: glibc-2.21/sysdeps/hppa/fpu/fesetenv.c
-===================================================================
---- glibc-2.21.orig/sysdeps/hppa/fpu/fesetenv.c
-+++ glibc-2.21/sysdeps/hppa/fpu/fesetenv.c
-@@ -33,7 +33,7 @@ fesetenv (const fenv_t *envp)
- we want to use from the environment specified by the parameter. */
- bufptr = temp.buf;
- __asm__ (
-- "fstd,ma %%fr0,8(%1)\n"
-+ "fstd %%fr0,0(%1)\n"
- : "=m" (temp) : "r" (bufptr) : "%r0");
-
- temp.env.__status_word &= ~(FE_ALL_EXCEPT
-@@ -54,7 +54,7 @@ fesetenv (const fenv_t *envp)
- we take advantage of that to load in reverse order so fr0
- is loaded last and T-Bit is enabled. */
- __asm__ (
-- "fldd,mb -8(%1),%%fr0\n"
-+ "fldd 0(%1),%%fr0\n"
- : : "m" (temp), "r" (bufptr) : "%r0" );
-
- /* Success. */
Deleted: glibc-package/branches/glibc-2.22/debian/patches/hppa/cvs-fpu2.diff
===================================================================
--- glibc-package/branches/glibc-2.22/debian/patches/hppa/cvs-fpu2.diff
2015-09-17 18:58:37 UTC (rev 6581)
+++ glibc-package/branches/glibc-2.22/debian/patches/hppa/cvs-fpu2.diff
2015-09-17 19:00:13 UTC (rev 6582)
@@ -1,109 +0,0 @@
-Index: glibc-2.21/sysdeps/hppa/fpu/feupdateenv.c
-===================================================================
---- glibc-2.21.orig/sysdeps/hppa/fpu/feupdateenv.c
-+++ glibc-2.21/sysdeps/hppa/fpu/feupdateenv.c
-@@ -29,9 +29,22 @@
- __asm__ ("fstd %%fr0,0(%1) \n\t"
- "fldd 0(%1),%%fr0 \n\t"
- : "=m" (s.l) : "r" (&s.l));
-- memcpy(&temp, envp, sizeof(fenv_t));
-- /* Currently raised exceptions not cleared */
-- temp.__status_word |= s.sw[0] & (FE_ALL_EXCEPT << 27);
-+
-+ /* Given environment with exception flags not cleared. */
-+ if ((envp != FE_DFL_ENV) && (envp != FE_NOMASK_ENV))
-+ {
-+ memcpy(&temp, envp, sizeof(fenv_t));
-+ temp.__status_word |= s.sw[0] & (FE_ALL_EXCEPT << 27);
-+ }
-+
-+ /* Default environment with exception flags not cleared. */
-+ if (envp == FE_DFL_ENV)
-+ temp.__status_word = s.sw[0] & (FE_ALL_EXCEPT << 27);
-+
-+ /* All traps enabled and current exception flags not cleared. */
-+ if (envp == FE_NOMASK_ENV)
-+ temp.__status_word = (s.sw[0] & (FE_ALL_EXCEPT << 27)) | FE_ALL_EXCEPT;
-+
- /* Install new environment. */
- __fesetenv (&temp);
- /* Success. */
-Index: glibc-2.21/sysdeps/hppa/fpu/fpu_control.h
-===================================================================
---- glibc-2.21.orig/sysdeps/hppa/fpu/fpu_control.h
-+++ glibc-2.21/sysdeps/hppa/fpu/fpu_control.h
-@@ -19,7 +19,7 @@
- #ifndef _FPU_CONTROL_H
- #define _FPU_CONTROL_H
-
--/* Masking of interrupts */
-+/* Masking of interrupts. */
- #define _FPU_MASK_PM 0x00000001 /* Inexact (I) */
- #define _FPU_MASK_UM 0x00000002 /* Underflow (U) */
- #define _FPU_MASK_OM 0x00000004 /* Overflow (O) */
-@@ -30,6 +30,8 @@
- #define _FPU_HPPA_MASK_RM 0x00000600 /* Rounding mode mask */
- /* Masking of interrupt enable bits. */
- #define _FPU_HPPA_MASK_INT 0x0000001f /* Interrupt mask */
-+/* Shift by 27 to install flag bits. */
-+#define _FPU_HPPA_SHIFT_FLAGS 27
-
- /* There are no reserved bits in the PA fpsr (though some are undefined). */
- #define _FPU_RESERVED 0x00000000
-@@ -45,7 +47,7 @@ typedef unsigned int fpu_control_t;
- #define _FPU_GETCW(cw) \
- ({
\
- union { __extension__ unsigned long long __fpreg; unsigned int
__halfreg[2]; } __fullfp; \
-- /* Get the current status word. */
\
-+ /* Get the current status word. */
\
- __asm__ ("fstd %%fr0,0(%1)\n\t"
\
- "fldd 0(%1),%%fr0\n\t"
\
- : "=m" (__fullfp.__fpreg) : "r" (&__fullfp.__fpreg) : "%r0");
\
-@@ -54,7 +56,10 @@ typedef unsigned int fpu_control_t;
-
- #define _FPU_SETCW(cw) \
- ({
\
-- union { __extension__ unsigned long long __fpreg; unsigned int
__halfreg[2]; } __fullfp; \
-+ union { __extension__ unsigned long long __fpreg; unsigned int
__halfreg[2]; } __fullfp; \
-+ /* Get the current status word and set the control word. */
\
-+ __asm__ ("fstd %%fr0,0(%1)\n\t"
\
-+ : "=m" (__fullfp.__fpreg) : "r" (&__fullfp.__fpreg) : "%r0");
\
- __fullfp.__halfreg[0] = cw;
\
- __asm__ ("fldd 0(%1),%%fr0\n\t"
\
- : : "m" (__fullfp.__fpreg), "r" (&__fullfp.__fpreg) : "%r0" );
\
-Index: glibc-2.21/sysdeps/hppa/fpu/fsetexcptflg.c
-===================================================================
---- glibc-2.21.orig/sysdeps/hppa/fpu/fsetexcptflg.c
-+++ glibc-2.21/sysdeps/hppa/fpu/fsetexcptflg.c
-@@ -18,19 +18,25 @@
- <http://www.gnu.org/licenses/>. */
-
- #include <fenv.h>
--#include <math.h>
-+#include <fpu_control.h>
-
- int
- fesetexceptflag (const fexcept_t *flagp, int excepts)
- {
-- union { unsigned long long l; unsigned int sw[2]; } s;
-+ fpu_control_t fpsr;
-+ fpu_control_t fpsr_new;
-
- /* Get the current status word. */
-- __asm__ ("fstd %%fr0,0(%1)" : "=m" (s.l) : "r" (&s.l) : "%r0");
-- /* Install new raised trap bits */
-- s.sw[0] |= (*flagp & excepts & FE_ALL_EXCEPT) << 27;
-+ _FPU_GETCW (fpsr);
-+ excepts &= FE_ALL_EXCEPT;
-+
-+ /* Install new raised flags. */
-+ fpsr_new = fpsr & ~(excepts << _FPU_HPPA_SHIFT_FLAGS);
-+ fpsr_new |= (*flagp & excepts) << _FPU_HPPA_SHIFT_FLAGS;
-+
- /* Store the new status word. */
-- __asm__ ("fldd 0(%0),%%fr0" : : "r" (&s.l), "m" (s.l) : "%r0");
-+ if (fpsr != fpsr_new)
-+ _FPU_SETCW (fpsr_new);
-
- /* Success. */
- return 0;
Deleted:
glibc-package/branches/glibc-2.22/debian/patches/hppa/local-fcntl-osync.diff
===================================================================
---
glibc-package/branches/glibc-2.22/debian/patches/hppa/local-fcntl-osync.diff
2015-09-17 18:58:37 UTC (rev 6581)
+++
glibc-package/branches/glibc-2.22/debian/patches/hppa/local-fcntl-osync.diff
2015-09-17 19:00:13 UTC (rev 6582)
@@ -1,13 +0,0 @@
-Index: eglibc-2.17/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h
-===================================================================
---- eglibc-2.17.orig/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h 2012-11-06
12:31:45.000000000 -0500
-+++ eglibc-2.17/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h 2013-11-02
17:50:08.839898488 -0400
-@@ -27,7 +27,7 @@
- #define O_NONBLOCK 00200004 /* HPUX has separate NDELAY & NONBLOCK */
- #define __O_DSYNC 01000000
- #define __O_RSYNC 02000000 /* HPUX only */
--#define __O_SYNC 01000000
-+#define __O_SYNC 00100000
- #define O_SYNC (__O_SYNC|__O_DSYNC)
-
- #define O_BLKSEEK 00000100 /* HPUX only */
Deleted:
glibc-package/branches/glibc-2.22/debian/patches/hppa/local-setcontext.diff
===================================================================
--- glibc-package/branches/glibc-2.22/debian/patches/hppa/local-setcontext.diff
2015-09-17 18:58:37 UTC (rev 6581)
+++ glibc-package/branches/glibc-2.22/debian/patches/hppa/local-setcontext.diff
2015-09-17 19:00:13 UTC (rev 6582)
@@ -1,15 +0,0 @@
-Index: glibc-2.21/sysdeps/unix/sysv/linux/hppa/setcontext.S
-===================================================================
---- glibc-2.21.orig/sysdeps/unix/sysv/linux/hppa/setcontext.S
-+++ glibc-2.21/sysdeps/unix/sysv/linux/hppa/setcontext.S
-@@ -139,8 +139,8 @@ ENTRY(__setcontext)
- nop
-
- /* No further context available. Exit now. */
-- bl _exit, %r2
-- ldi -1, %r26
-+ bl HIDDEN_JUMPTARGET(exit), %r2
-+ ldi 0, %r26
-
-
- .Lerror:
Modified:
glibc-package/branches/glibc-2.22/debian/patches/i386/submitted-i686-timing.diff
===================================================================
---
glibc-package/branches/glibc-2.22/debian/patches/i386/submitted-i686-timing.diff
2015-09-17 18:58:37 UTC (rev 6581)
+++
glibc-package/branches/glibc-2.22/debian/patches/i386/submitted-i686-timing.diff
2015-09-17 19:00:13 UTC (rev 6582)
@@ -129,7 +129,7 @@
+++ b/elf/Makefile
@@ -24,7 +24,7 @@ include ../Makeconfig
headers = elf.h bits/elfclass.h link.h bits/link.h
- routines = $(dl-routines) dl-support dl-iteratephdr \
+ routines = $(all-dl-routines) dl-support dl-iteratephdr \
dl-addr enbl-secure dl-profstub \
- dl-origin dl-libc dl-sym dl-tsd dl-sysdep
+ dl-origin dl-libc dl-sym dl-tsd dl-sysdep dl-altinit
Modified:
glibc-package/branches/glibc-2.22/debian/patches/localedata/local-all-no-archive.diff
===================================================================
---
glibc-package/branches/glibc-2.22/debian/patches/localedata/local-all-no-archive.diff
2015-09-17 18:58:37 UTC (rev 6581)
+++
glibc-package/branches/glibc-2.22/debian/patches/localedata/local-all-no-archive.diff
2015-09-17 19:00:13 UTC (rev 6582)
@@ -11,5 +11,5 @@
- $(LOCALEDEF) --alias-file=../intl/locale.alias \
+ $(LOCALEDEF) --alias-file=../intl/locale.alias --no-archive \
-i locales/$$input -c -f charmaps/$$charset \
- $(addprefix --prefix=,$(install_root)) $$locale; \
- echo ' done'; \
+ $(addprefix --prefix=,$(install_root)) $$locale \
+ && echo ' done'; \
Modified:
glibc-package/branches/glibc-2.22/debian/patches/localedata/submitted-locale-bo.diff
===================================================================
---
glibc-package/branches/glibc-2.22/debian/patches/localedata/submitted-locale-bo.diff
2015-09-17 18:58:37 UTC (rev 6581)
+++
glibc-package/branches/glibc-2.22/debian/patches/localedata/submitted-locale-bo.diff
2015-09-17 19:00:13 UTC (rev 6582)
@@ -9,7 +9,7 @@
LC_NAME
% FIXME
--name_fmt ""
+-name_fmt " "
+name_fmt "???"
% name_gen "FIXME"
% name_miss "FIXME"
@@ -20,7 +20,7 @@
LC_NAME
% FIXME
--name_fmt ""
+-name_fmt " "
+name_fmt "???"
% name_gen "FIXME"
% name_miss "FIXME"
Modified:
glibc-package/branches/glibc-2.22/debian/patches/mips/submitted-rld_map.diff
===================================================================
---
glibc-package/branches/glibc-2.22/debian/patches/mips/submitted-rld_map.diff
2015-09-17 18:58:37 UTC (rev 6581)
+++
glibc-package/branches/glibc-2.22/debian/patches/mips/submitted-rld_map.diff
2015-09-17 19:00:13 UTC (rev 6582)
@@ -10,11 +10,11 @@
--- a/sysdeps/mips/dl-machine.h
+++ b/sysdeps/mips/dl-machine.h
@@ -68,7 +68,8 @@
- /* If there is a DT_MIPS_RLD_MAP entry in the dynamic section, fill it in
- with the run-time address of the r_debug structure */
- #define ELF_MACHINE_DEBUG_SETUP(l,r) \
--do { if ((l)->l_info[DT_MIPS (RLD_MAP)]) \
-+do { if ((l)->l_info[DT_MIPS (RLD_MAP)] && \
+ ptr += (l)->l_info[DT_MIPS (RLD_MAP_REL)]->d_un.d_val; \
+ *(ElfW(Addr) *)ptr = (ElfW(Addr)) (r); \
+ } \
+- else if ((l)->l_info[DT_MIPS (RLD_MAP)]) \
++ else if ((l)->l_info[DT_MIPS (RLD_MAP)]) && \
+ (l)->l_info[DT_MIPS (RLD_MAP)]->d_un.d_ptr) \
*(ElfW(Addr) *)((l)->l_info[DT_MIPS (RLD_MAP)]->d_un.d_ptr) = \
(ElfW(Addr)) (r); \
Deleted:
glibc-package/branches/glibc-2.22/debian/patches/powerpc/cvs-power7-strncpy.diff
===================================================================
---
glibc-package/branches/glibc-2.22/debian/patches/powerpc/cvs-power7-strncpy.diff
2015-09-17 18:58:37 UTC (rev 6581)
+++
glibc-package/branches/glibc-2.22/debian/patches/powerpc/cvs-power7-strncpy.diff
2015-09-17 19:00:13 UTC (rev 6582)
@@ -1,416 +0,0 @@
-commit 98408b95b155464e760c22dce4842f29499db821
-Author: Rajalakshmi Srinivasaraghavan <[email protected]>
-Date: Wed Jan 28 08:43:29 2015 -0500
-
- powerpc: POWER7 strncpy optimization for unaligned string
-
- This patch optimizes strncpy for power7 for unaligned source or
- destination address. The source or destination address is aligned
- to doubleword and data is shifted based on the alignment and
- added with the previous loaded data to be written as a doubleword.
- For each load, cmpb instruction is used for faster null check.
-
- The new optimization shows 10 to 70% of performance improvement
- for longer string though it does not show big difference on string
- size less than 16 due to additional checks.Hence this new algorithm
- is restricted to string greater than 16.
-
-diff --git a/sysdeps/powerpc/powerpc64/power7/strncpy.S
b/sysdeps/powerpc/powerpc64/power7/strncpy.S
-index e60fc25..a6c9abf 100644
---- a/sysdeps/powerpc/powerpc64/power7/strncpy.S
-+++ b/sysdeps/powerpc/powerpc64/power7/strncpy.S
-@@ -72,9 +72,9 @@ EALIGN(FUNC_NAME, 4, 0)
-
- mr r9, r3 /* save r3 into r9 for use */
- mr r18, r3 /* save r3 for retCode of strncpy */
-- bne 0, L(byte_by_byte)
--
-+ bne 0, L(unaligned)
-
-+L(aligned):
- srdi r11, r5, 3 /* compute count for CTR ; count = n/8 */
- cmpldi cr7, r11, 3 /* if count > 4 ; perform unrolling 4 times */
- ble 7, L(update1)
-@@ -332,6 +332,382 @@ L(HopBy8):
- addi r5, r5, -8 /* decrement length 'n' by 8 */
- addi r0, r11, -1 /* decrement loop counter */
- b L(dWordUnrollOFF)
-+
-+L(unaligned):
-+ cmpdi r5, 16 /* Proceed byte by byte for less than 16 */
-+ ble L(byte_by_byte)
-+ rldicl r7, r3, 0, 61
-+ rldicl r6, r4, 0, 61
-+ cmpdi r6, 0 /* Check src alignment */
-+ beq L(srcaligndstunalign)
-+ /* src is unaligned */
-+ rlwinm r10, r4, 3,26,28 /* Calculate padding. */
-+ clrrdi r4, r4, 3 /* Align the addr to dw boundary */
-+ ld r8, 0(r4) /* Load doubleword from memory. */
-+ li r0, 0
-+ /* Discard bits not part of the string */
-+#ifdef __LITTLE_ENDIAN__
-+ srd r7, r8, r10
-+#else
-+ sld r7, r8, r10
-+#endif
-+ cmpb r0, r7, r0 /* Compare each byte against null */
-+ /* Discard bits not part of the string */
-+#ifdef __LITTLE_ENDIAN__
-+ sld r0, r0, r10
-+#else
-+ srd r0, r0, r10
-+#endif
-+ cmpdi r0, 0
-+ bne L(bytebybyte) /* if it has null, copy byte by byte */
-+ subfic r6, r6, 8
-+ rlwinm r12, r3, 3,26,28 /* Calculate padding in bits. */
-+ rldicl r9, r3, 0, 61 /* Calculate padding in bytes. */
-+ addi r3, r3, -1
-+
-+ cmpdi r12, 0 /* check dest alignment */
-+ beq L(srcunaligndstalign)
-+
-+ /* both src and dst unaligned */
-+#ifdef __LITTLE_ENDIAN__
-+ sld r8, r7, r10
-+ mr r11, r10
-+ addi r11, r11, -8 /* Adjust byte pointer on loaded dw */
-+#else
-+ srd r8, r7, r10
-+ subfic r11, r10, 64
-+#endif
-+ /* dst alignment is greater then src alignment? */
-+ cmpd cr7, r12, r10
-+ ble cr7, L(dst_align_small)
-+ /* src alignment is less than dst */
-+
-+ /* Calculate the dst alignment difference */
-+ subfic r7, r9, 8
-+ mtctr r7
-+
-+ /* Write until dst is aligned */
-+ cmpdi r0, r7, 4
-+ blt L(storebyte1) /* less than 4, store byte by byte */
-+ beq L(equal1) /* if its 4, store word */
-+ addi r0, r7, -4 /* greater than 4, so stb and stw */
-+ mtctr r0
-+L(storebyte1):
-+#ifdef __LITTLE_ENDIAN__
-+ addi r11, r11, 8 /* Adjust byte pointer on loaded dw */
-+#else
-+ addi r11, r11, -8
-+#endif
-+ srd r7, r8, r11
-+ stbu r7, 1(r3)
-+ addi r5, r5, -1
-+ bdnz L(storebyte1)
-+
-+ subfic r7, r9, 8 /* Check the remaining bytes */
-+ cmpdi r0, r7, 4
-+ blt L(proceed1)
-+
-+ .align 4
-+L(equal1):
-+#ifdef __LITTLE_ENDIAN__
-+ addi r11, r11, 8 /* Adjust byte pointer on loaded dw */
-+ srd r7, r8, r11
-+#else
-+ subfic r11, r11, 64
-+ sld r7, r8, r11
-+ srdi r7, r7, 32
-+#endif
-+ stw r7, 1(r3)
-+ addi r3, r3, 4
-+ addi r5, r5, -4
-+
-+L(proceed1):
-+ mr r7, r8
-+ /* calculate the Left over bytes to be written */
-+ subfic r11, r10, 64
-+ subfic r12, r12, 64
-+ subf r12, r12, r11 /* remaining bytes on second dw */
-+ subfic r10, r12, 64 /* remaining bytes on first dw */
-+ subfic r9, r9, 8
-+ subf r6, r9, r6 /* recalculate padding */
-+L(srcunaligndstalign):
-+ addi r3, r3, 1
-+ subfic r12, r10, 64 /* remaining bytes on second dw */
-+ addi r4, r4, 8
-+ li r0,0
-+ b L(storedouble)
-+
-+ .align 4
-+L(dst_align_small):
-+ mtctr r6
-+ /* Write until src is aligned */
-+L(storebyte2):
-+#ifdef __LITTLE_ENDIAN__
-+ addi r11, r11, 8 /* Adjust byte pointer on dw */
-+#else
-+ addi r11, r11, -8
-+#endif
-+ srd r7, r8, r11
-+ stbu r7, 1(r3)
-+ addi r5, r5, -1
-+ bdnz L(storebyte2)
-+
-+ addi r4, r4, 8 /* Increment src pointer */
-+ addi r3, r3, 1 /* Increment dst pointer */
-+ mr r9, r3
-+ li r8, 0
-+ cmpd cr7, r12, r10
-+ beq cr7, L(aligned)
-+ rldicl r6, r3, 0, 61 /* Recalculate padding */
-+ mr r7, r6
-+
-+ /* src is algined */
-+L(srcaligndstunalign):
-+ mr r9, r3
-+ mr r6, r7
-+ ld r8, 0(r4)
-+ subfic r10, r7, 8
-+ mr r7, r8
-+ li r0, 0 /* Check null */
-+ cmpb r0, r8, r0
-+ cmpdi r0, 0
-+ bne L(byte_by_byte) /* Do byte by byte if there is NULL */
-+ rlwinm r12, r3, 3,26,28 /* Calculate padding */
-+ addi r3, r3, -1
-+ /* write byte by byte until aligned */
-+#ifdef __LITTLE_ENDIAN__
-+ li r11, -8
-+#else
-+ li r11, 64
-+#endif
-+ mtctr r10
-+ cmpdi r0, r10, 4
-+ blt L(storebyte)
-+ beq L(equal)
-+ addi r0, r10, -4
-+ mtctr r0
-+L(storebyte):
-+#ifdef __LITTLE_ENDIAN__
-+ addi r11, r11, 8 /* Adjust byte pointer on dw */
-+#else
-+ addi r11, r11, -8
-+#endif
-+ srd r7, r8, r11
-+ stbu r7, 1(r3)
-+ addi r5, r5, -1
-+ bdnz L(storebyte)
-+
-+ cmpdi r0, r10, 4
-+ blt L(align)
-+
-+ .align 4
-+L(equal):
-+#ifdef __LITTLE_ENDIAN__
-+ addi r11, r11, 8
-+ srd r7, r8, r11
-+#else
-+ subfic r11, r11, 64
-+ sld r7, r8, r11
-+ srdi r7, r7, 32
-+#endif
-+ stw r7, 1(r3)
-+ addi r5, r5, -4
-+ addi r3, r3, 4
-+L(align):
-+ addi r3, r3, 1
-+ addi r4, r4, 8 /* Increment src pointer */
-+ subfic r10, r12, 64
-+ li r0, 0
-+ /* dst addr aligned to 8 */
-+L(storedouble):
-+ cmpdi r5, 8
-+ ble L(null1)
-+ ld r7, 0(r4) /* load next dw */
-+ cmpb r0, r7, r0
-+ cmpdi r0, 0 /* check for null on each new dw */
-+ bne L(null)
-+#ifdef __LITTLE_ENDIAN__
-+ srd r9, r8, r10 /* bytes from first dw */
-+ sld r11, r7, r12 /* bytes from second dw */
-+#else
-+ sld r9, r8, r10
-+ srd r11, r7, r12
-+#endif
-+ or r11, r9, r11 /* make as a single dw */
-+ std r11, 0(r3) /* store as std on aligned addr */
-+ mr r8, r7 /* still few bytes left to be written */
-+ addi r3, r3, 8 /* increment dst addr */
-+ addi r4, r4, 8 /* increment src addr */
-+ addi r5, r5, -8
-+ b L(storedouble) /* Loop until NULL */
-+
-+ .align 4
-+
-+/* We've hit the end of the string. Do the rest byte-by-byte. */
-+L(null):
-+ addi r3, r3, -1
-+ mr r10, r12
-+ mtctr r6
-+#ifdef __LITTLE_ENDIAN__
-+ subfic r10, r10, 64
-+ addi r10, r10, -8
-+#endif
-+ cmpdi r0, r5, 4
-+ blt L(loop)
-+ cmpdi r0, r6, 4
-+ blt L(loop)
-+
-+ /* we can still use stw if leftover >= 4 */
-+#ifdef __LITTLE_ENDIAN__
-+ addi r10, r10, 8
-+ srd r11, r8, r10
-+#else
-+ subfic r10, r10, 64
-+ sld r11, r8, r10
-+ srdi r11, r11, 32
-+#endif
-+ stw r11, 1(r3)
-+ addi r5, r5, -4
-+ addi r3, r3, 4
-+ cmpdi r0, r5, 0
-+ beq L(g1)
-+ cmpdi r0, r6, 4
-+ beq L(bytebybyte1)
-+ addi r10, r10, 32
-+#ifdef __LITTLE_ENDIAN__
-+ addi r10, r10, -8
-+#else
-+ subfic r10, r10, 64
-+#endif
-+ addi r0, r6, -4
-+ mtctr r0
-+ /* remaining byte by byte part of first dw */
-+L(loop):
-+#ifdef __LITTLE_ENDIAN__
-+ addi r10, r10, 8
-+#else
-+ addi r10, r10, -8
-+#endif
-+ srd r0, r8, r10
-+ stbu r0, 1(r3)
-+ addi r5, r5, -1
-+ cmpdi r0, r5, 0
-+ beq L(g1)
-+ bdnz L(loop)
-+L(bytebybyte1):
-+ addi r3, r3, 1
-+ /* remaining byte by byte part of second dw */
-+L(bytebybyte):
-+ addi r3, r3, -8
-+ addi r4, r4, -1
-+
-+#ifdef __LITTLE_ENDIAN__
-+ extrdi. r0, r7, 8, 56
-+ stbu r7, 8(r3)
-+ addi r5, r5, -1
-+ beq L(g2)
-+ cmpdi r5, 0
-+ beq L(g1)
-+ extrdi. r0, r7, 8, 48
-+ stbu r0, 1(r3)
-+ addi r5, r5, -1
-+ beq L(g2)
-+ cmpdi r5, 0
-+ beq L(g1)
-+ extrdi. r0, r7, 8, 40
-+ stbu r0, 1(r3)
-+ addi r5, r5, -1
-+ beq L(g2)
-+ cmpdi r5, 0
-+ beq L(g1)
-+ extrdi. r0, r7, 8, 32
-+ stbu r0, 1(r3)
-+ addi r5, r5, -1
-+ beq L(g2)
-+ cmpdi r5, 0
-+ beq L(g1)
-+ extrdi. r0, r7, 8, 24
-+ stbu r0, 1(r3)
-+ addi r5, r5, -1
-+ beq L(g2)
-+ cmpdi r5, 0
-+ beq L(g1)
-+ extrdi. r0, r7, 8, 16
-+ stbu r0, 1(r3)
-+ addi r5, r5, -1
-+ beq L(g2)
-+ cmpdi r5, 0
-+ beq L(g1)
-+ extrdi. r0, r7, 8, 8
-+ stbu r0, 1(r3)
-+ addi r5, r5, -1
-+ beq L(g2)
-+ cmpdi r5, 0
-+ beq L(g1)
-+ extrdi r0, r7, 8, 0
-+ stbu r0, 1(r3)
-+ addi r5, r5, -1
-+ b L(g2)
-+#else
-+ extrdi. r0, r7, 8, 0
-+ stbu r0, 8(r3)
-+ addi r5, r5, -1
-+ beq L(g2)
-+ cmpdi r5, 0
-+ beq L(g1)
-+ extrdi. r0, r7, 8, 8
-+ stbu r0, 1(r3)
-+ addi r5, r5, -1
-+ beq L(g2)
-+ cmpdi r5, 0
-+ beq L(g1)
-+ extrdi. r0, r7, 8, 16
-+ stbu r0, 1(r3)
-+ addi r5, r5, -1
-+ beq L(g2)
-+ cmpdi r5, 0
-+ beq L(g1)
-+ extrdi. r0, r7, 8, 24
-+ stbu r0, 1(r3)
-+ addi r5, r5, -1
-+ beq L(g2)
-+ cmpdi r5, 0
-+ beq L(g1)
-+ extrdi. r0, r7, 8, 32
-+ stbu r0, 1(r3)
-+ addi r5, r5, -1
-+ beq L(g2)
-+ cmpdi r5, 0
-+ beq L(g1)
-+ extrdi. r0, r7, 8, 40
-+ stbu r0, 1(r3)
-+ addi r5, r5, -1
-+ beq L(g2)
-+ cmpdi r5, 0
-+ beq L(g1)
-+ extrdi. r0, r7, 8, 48
-+ stbu r0, 1(r3)
-+ addi r5, r5, -1
-+ beq L(g2)
-+ cmpdi r5, 0
-+ beq L(g1)
-+ stbu r7, 1(r3)
-+ addi r5, r5, -1
-+ b L(g2)
-+#endif
-+L(g1):
-+#ifdef USE_AS_STPNCPY
-+ addi r3, r3, 1
-+#endif
-+L(g2):
-+ addi r3, r3, 1
-+ mr r19, r3
-+ mr r8, r5
-+ b L(zeroFill)
-+L(null1):
-+ mr r9, r3
-+ subf r4, r6, r4
-+ b L(byte_by_byte)
- END(FUNC_NAME)
- #ifndef USE_AS_STPNCPY
- libc_hidden_builtin_def (strncpy)
Deleted:
glibc-package/branches/glibc-2.22/debian/patches/powerpc/cvs-ppc-feraiseexcept.diff
===================================================================
---
glibc-package/branches/glibc-2.22/debian/patches/powerpc/cvs-ppc-feraiseexcept.diff
2015-09-17 18:58:37 UTC (rev 6581)
+++
glibc-package/branches/glibc-2.22/debian/patches/powerpc/cvs-ppc-feraiseexcept.diff
2015-09-17 19:00:13 UTC (rev 6582)
@@ -1,448 +0,0 @@
-commit 85b290451e4d3ab460a57f1c5966c5827ca807ca
-Author: Adhemerval Zanella <[email protected]>
-Date: Wed Jan 28 06:10:41 2015 -0500
-
- powerpc: Fix inline feraiseexcept, feclearexcept macros
-
- This patch fixes the inline feraiseexcept and feclearexcept macros for
- powerpc by casting the input argument to integer before operation on it.
-
- It fixes BZ#17776.
-
-diff --git a/math/Makefile b/math/Makefile
-index fec7627..3904e41 100644
---- a/math/Makefile
-+++ b/math/Makefile
-@@ -90,7 +90,8 @@ tests = test-matherr test-fenv atest-exp atest-sincos
atest-exp2 basic-test \
- test-misc test-fpucw test-fpucw-ieee tst-definitions test-tgmath \
- test-tgmath-ret bug-nextafter bug-nexttoward bug-tgmath1 \
- test-tgmath-int test-tgmath2 test-powl tst-CMPLX tst-CMPLX2 test-snan \
-- test-fenv-tls test-fenv-preserve test-fenv-return $(tests-static)
-+ test-fenv-tls test-fenv-preserve test-fenv-return test-fenvinline \
-+ $(tests-static)
- tests-static = test-fpucw-static test-fpucw-ieee-static
- # We do the `long double' tests only if this data type is available and
- # distinct from `double'.
-diff --git a/math/test-fenvinline.c b/math/test-fenvinline.c
-new file mode 100644
-index 0000000..87c9df4
---- /dev/null
-+++ b/math/test-fenvinline.c
-@@ -0,0 +1,351 @@
-+/* Test for fenv inline implementations.
-+ 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
-+ <http://www.gnu.org/licenses/>. */
-+
-+#ifndef _GNU_SOURCE
-+# define _GNU_SOURCE
-+#endif
-+
-+/* To make sure the fenv inline function are used. */
-+#undef __NO_MATH_INLINES
-+
-+#include <fenv.h>
-+#include <stdio.h>
-+#include <math-tests.h>
-+
-+/*
-+ Since not all architectures might define all exceptions, we define
-+ a private set and map accordingly.
-+*/
-+#define NO_EXC 0
-+#define INEXACT_EXC 0x1
-+#define DIVBYZERO_EXC 0x2
-+#define UNDERFLOW_EXC 0x04
-+#define OVERFLOW_EXC 0x08
-+#define INVALID_EXC 0x10
-+#define ALL_EXC \
-+ (INEXACT_EXC | DIVBYZERO_EXC | UNDERFLOW_EXC | OVERFLOW_EXC | \
-+ INVALID_EXC)
-+static int count_errors;
-+
-+#if FE_ALL_EXCEPT
-+static void
-+test_single_exception_fp_int (int exception,
-+ int exc_flag,
-+ int fe_flag,
-+ const char *flag_name)
-+{
-+ if (exception & exc_flag)
-+ {
-+ if (fetestexcept (fe_flag))
-+ printf (" Pass: Exception \"%s\" is set\n", flag_name);
-+ else
-+ {
-+ printf (" Fail: Exception \"%s\" is not set\n", flag_name);
-+ ++count_errors;
-+ }
-+ }
-+ else
-+ {
-+ if (fetestexcept (fe_flag))
-+ {
-+ printf (" Fail: Exception \"%s\" is set\n", flag_name);
-+ ++count_errors;
-+ }
-+ else
-+ printf (" Pass: Exception \"%s\" is not set\n", flag_name);
-+ }
-+}
-+/* Test whether a given exception was raised. */
-+static void
-+test_single_exception_fp_double (int exception,
-+ int exc_flag,
-+ double fe_flag,
-+ const char *flag_name)
-+{
-+ if (exception & exc_flag)
-+ {
-+ if (fetestexcept (fe_flag))
-+ printf (" Pass: Exception \"%s\" is set\n", flag_name);
-+ else
-+ {
-+ printf (" Fail: Exception \"%s\" is not set\n", flag_name);
-+ ++count_errors;
-+ }
-+ }
-+ else
-+ {
-+ if (fetestexcept (fe_flag))
-+ {
-+ printf (" Fail: Exception \"%s\" is set\n", flag_name);
-+ ++count_errors;
-+ }
-+ else
-+ printf (" Pass: Exception \"%s\" is not set\n", flag_name);
-+ }
-+}
-+#endif
-+
-+static void
-+test_exceptions (const char *test_name, int exception)
-+{
-+ printf ("Test: %s\n", test_name);
-+#ifdef FE_DIVBYZERO
-+ test_single_exception_fp_double (exception, DIVBYZERO_EXC, FE_DIVBYZERO,
-+ "DIVBYZERO");
-+#endif
-+#ifdef FE_INVALID
-+ test_single_exception_fp_double (exception, INVALID_EXC, FE_INVALID,
-+ "INVALID");
-+#endif
-+#ifdef FE_INEXACT
-+ test_single_exception_fp_double (exception, INEXACT_EXC, FE_INEXACT,
-+ "INEXACT");
-+#endif
-+#ifdef FE_UNDERFLOW
-+ test_single_exception_fp_double (exception, UNDERFLOW_EXC, FE_UNDERFLOW,
-+ "UNDERFLOW");
-+#endif
-+#ifdef FE_OVERFLOW
-+ test_single_exception_fp_double (exception, OVERFLOW_EXC, FE_OVERFLOW,
-+ "OVERFLOW");
-+#endif
-+}
-+
-+static void
-+test_exceptionflag (void)
-+{
-+ printf ("Test: fegetexceptionflag (FE_ALL_EXCEPT)\n");
-+#if FE_ALL_EXCEPT
-+ fexcept_t excepts;
-+
-+ feclearexcept (FE_ALL_EXCEPT);
-+
-+ feraiseexcept (FE_INVALID);
-+ fegetexceptflag (&excepts, FE_ALL_EXCEPT);
-+
-+ feclearexcept (FE_ALL_EXCEPT);
-+ feraiseexcept (FE_OVERFLOW | FE_INEXACT);
-+
-+ fesetexceptflag (&excepts, FE_ALL_EXCEPT);
-+
-+ test_single_exception_fp_int (INVALID_EXC, INVALID_EXC, FE_INVALID,
-+ "INVALID (int)");
-+ test_single_exception_fp_int (INVALID_EXC, OVERFLOW_EXC, FE_OVERFLOW,
-+ "OVERFLOW (int)");
-+ test_single_exception_fp_int (INVALID_EXC, INEXACT_EXC, FE_INEXACT,
-+ "INEXACT (int)");
-+
-+ /* Same test, but using double as argument */
-+ feclearexcept (FE_ALL_EXCEPT);
-+
-+ feraiseexcept (FE_INVALID);
-+ fegetexceptflag (&excepts, (double)FE_ALL_EXCEPT);
-+
-+ feclearexcept (FE_ALL_EXCEPT);
-+ feraiseexcept (FE_OVERFLOW | FE_INEXACT);
-+
-+ fesetexceptflag (&excepts, (double)FE_ALL_EXCEPT);
-+
-+ test_single_exception_fp_double (INVALID_EXC, INVALID_EXC, FE_INVALID,
-+ "INVALID (double)");
-+ test_single_exception_fp_double (INVALID_EXC, OVERFLOW_EXC, FE_OVERFLOW,
-+ "OVERFLOW (double)");
-+ test_single_exception_fp_double (INVALID_EXC, INEXACT_EXC, FE_INEXACT,
-+ "INEXACT (double)");
-+#endif
-+}
-+
-+static void
-+test_fesetround (void)
-+{
-+#if defined FE_TONEAREST && defined FE_TOWARDZERO
-+ int res1;
-+ int res2;
-+
-+ printf ("Tests for fesetround\n");
-+
-+ /* The fesetround should not itself cause the test to fail, however it
-+ should either succeed for both 'int' and 'double' argument, or fail
-+ for both. */
-+ res1 = fesetround ((int) FE_TOWARDZERO);
-+ res2 = fesetround ((double) FE_TOWARDZERO);
-+ if (res1 != res2)
-+ {
-+ printf ("fesetround (FE_TOWARDZERO) failed: %d, %d\n", res1, res2);
-+ ++count_errors;
-+ }
-+
-+ res1 = fesetround ((int) FE_TONEAREST);
-+ res2 = fesetround ((double) FE_TONEAREST);
-+ if (res1 != res2)
-+ {
-+ printf ("fesetround (FE_TONEAREST) failed: %d, %d\n", res1, res2);
-+ ++count_errors;
-+ }
-+#endif
-+}
-+
-+/* Tests for feenableexcept/fedisableexcept. */
-+static void
-+feenable_test (const char *flag_name, fexcept_t fe_exc)
-+{
-+#if FE_ALL_EXCEPT
-+ int fe_exci = fe_exc;
-+ double fe_excd = fe_exc;
-+ int excepts;
-+
-+ /* First disable all exceptions. */
-+ if (fedisableexcept (FE_ALL_EXCEPT) == -1)
-+ {
-+ printf ("Test: fedisableexcept (FE_ALL_EXCEPT) failed\n");
-+ ++count_errors;
-+ /* If this fails, the other tests don't make sense. */
-+ return;
-+ }
-+
-+ /* Test for inline macros using integer argument. */
-+ excepts = feenableexcept (fe_exci);
-+ if (!EXCEPTION_ENABLE_SUPPORTED (fe_exci) && excepts == -1)
-+ {
-+ printf ("Test: not testing feenableexcept, it isn't implemented.\n");
-+ return;
-+ }
-+ if (excepts == -1)
-+ {
-+ printf ("Test: feenableexcept (%s) failed\n", flag_name);
-+ ++count_errors;
-+ return;
-+ }
-+ if (excepts != 0)
-+ {
-+ printf ("Test: feenableexcept (%s) failed, return should be 0, is %x\n",
-+ flag_name, excepts);
-+ ++count_errors;
-+ }
-+
-+ /* And now disable the exception again. */
-+ excepts = fedisableexcept (fe_exc);
-+ if (excepts == -1)
-+ {
-+ printf ("Test: fedisableexcept (%s) failed\n", flag_name);
-+ ++count_errors;
-+ return;
-+ }
-+ if (excepts != fe_exc)
-+ {
-+ printf ("Test: fedisableexcept (%s) failed, return should be 0x%x, is
0x%x\n",
-+ flag_name, fe_exc, excepts);
-+ ++count_errors;
-+ }
-+
-+ /* Test for inline macros using double argument. */
-+ excepts = feenableexcept (fe_excd);
-+ if (!EXCEPTION_ENABLE_SUPPORTED (fe_excd) && excepts == -1)
-+ {
-+ printf ("Test: not testing feenableexcept, it isn't implemented.\n");
-+ return;
-+ }
-+ if (excepts == -1)
-+ {
-+ printf ("Test: feenableexcept (%s) failed\n", flag_name);
-+ ++count_errors;
-+ return;
-+ }
-+ if (excepts != 0)
-+ {
-+ printf ("Test: feenableexcept (%s) failed, return should be 0, is %x\n",
-+ flag_name, excepts);
-+ ++count_errors;
-+ }
-+
-+ /* And now disable the exception again. */
-+ excepts = fedisableexcept (fe_exc);
-+ if (excepts == -1)
-+ {
-+ printf ("Test: fedisableexcept (%s) failed\n", flag_name);
-+ ++count_errors;
-+ return;
-+ }
-+ if (excepts != fe_exc)
-+ {
-+ printf ("Test: fedisableexcept (%s) failed, return should be 0x%x, is
0x%x\n",
-+ flag_name, fe_exc, excepts);
-+ ++count_errors;
-+ }
-+#endif
-+}
-+
-+static void
-+test_feenabledisable (void)
-+{
-+ printf ("Tests for feenableexcepts/fedisableexcept\n");
-+
-+ /* We might have some exceptions still set. */
-+ feclearexcept (FE_ALL_EXCEPT);
-+
-+#ifdef FE_DIVBYZERO
-+ feenable_test ("FE_DIVBYZERO", FE_DIVBYZERO);
-+#endif
-+#ifdef FE_INVALID
-+ feenable_test ("FE_INVALID", FE_INVALID);
-+#endif
-+#ifdef FE_INEXACT
-+ feenable_test ("FE_INEXACT", FE_INEXACT);
-+#endif
-+#ifdef FE_UNDERFLOW
-+ feenable_test ("FE_UNDERFLOW", FE_UNDERFLOW);
-+#endif
-+#ifdef FE_OVERFLOW
-+ feenable_test ("FE_OVERFLOW", FE_OVERFLOW);
-+#endif
-+ fesetenv (FE_DFL_ENV);
-+}
-+
-+static int
-+do_test (void)
-+{
-+ /* clear all exceptions and test if all are cleared */
-+ feclearexcept (FE_ALL_EXCEPT);
-+ test_exceptions ("feclearexcept (FE_ALL_EXCEPT) clears all exceptions",
-+ NO_EXC);
-+
-+ /* raise all exceptions and test if all are raised */
-+ feraiseexcept (FE_ALL_EXCEPT);
-+ test_exceptions ("feraiseexcept (FE_ALL_EXCEPT) raises all exceptions",
-+ ALL_EXC);
-+
-+ /* Same test, but using double as argument */
-+ feclearexcept ((double)FE_ALL_EXCEPT);
-+ test_exceptions ("feclearexcept ((double)FE_ALL_EXCEPT) clears all
exceptions",
-+ NO_EXC);
-+
-+ feraiseexcept ((double)FE_ALL_EXCEPT);
-+ test_exceptions ("feraiseexcept ((double)FE_ALL_EXCEPT) raises all
exceptions",
-+ ALL_EXC);
-+
-+ test_exceptionflag ();
-+
-+ test_fesetround ();
-+
-+ test_feenabledisable ();
-+
-+ return count_errors;
-+}
-+
-+#define TEST_FUNCTION do_test ()
-+#include "../test-skeleton.c"
-diff --git a/sysdeps/powerpc/bits/fenvinline.h
b/sysdeps/powerpc/bits/fenvinline.h
-index 35c2114..894789e 100644
---- a/sysdeps/powerpc/bits/fenvinline.h
-+++ b/sysdeps/powerpc/bits/fenvinline.h
-@@ -34,29 +34,41 @@
-
- /* Inline definition for feraiseexcept. */
- # define feraiseexcept(__excepts) \
-- ((__builtin_constant_p (__excepts) \
-- && ((__excepts) & ((__excepts)-1)) == 0 \
-- && (__excepts) != FE_INVALID) \
-- ? ((__excepts) != 0
\
-- ? (__extension__ ({ __asm__ __volatile__
\
-- ("mtfsb1 %s0" \
-- : : "i#*X"(__builtin_ffs (__excepts))); \
-- 0; })) \
-- : 0) \
-- : (feraiseexcept) (__excepts))
-+ (__extension__ ({ \
-+ int __e = __excepts; \
-+ int __ret;
\
-+ if (__builtin_constant_p (__e) \
-+ && (__e & (__e - 1)) == 0 \
-+ && __e != FE_INVALID) \
-+ {
\
-+ if (__e != 0) \
-+ __asm__ __volatile__ ("mtfsb1 %s0" \
-+ : : "i#*X" (__builtin_ffs (__e))); \
-+ __ret = 0; \
-+ }
\
-+ else \
-+ __ret = feraiseexcept (__e); \
-+ __ret; \
-+ }))
-
- /* Inline definition for feclearexcept. */
- # define feclearexcept(__excepts) \
-- ((__builtin_constant_p (__excepts) \
-- && ((__excepts) & ((__excepts)-1)) == 0 \
-- && (__excepts) != FE_INVALID) \
-- ? ((__excepts) != 0
\
-- ? (__extension__ ({ __asm__ __volatile__
\
-- ("mtfsb0 %s0" \
-- : : "i#*X"(__builtin_ffs (__excepts))); \
-- 0; })) \
-- : 0) \
-- : (feclearexcept) (__excepts))
-+ (__extension__ ({ \
-+ int __e = __excepts; \
-+ int __ret;
\
-+ if (__builtin_constant_p (__e) \
-+ && (__e & (__e - 1)) == 0 \
-+ && __e != FE_INVALID) \
-+ {
\
-+ if (__e != 0) \
-+ __asm__ __volatile__ ("mtfsb0 %s0" \
-+ : : "i#*X" (__builtin_ffs (__e))); \
-+ __ret = 0; \
-+ }
\
-+ else \
-+ __ret = feclearexcept (__e); \
-+ __ret; \
-+ }))
-
- # endif /* !__NO_MATH_INLINES. */
-
Deleted:
glibc-package/branches/glibc-2.22/debian/patches/powerpc/cvs-ppc-pow.diff
===================================================================
--- glibc-package/branches/glibc-2.22/debian/patches/powerpc/cvs-ppc-pow.diff
2015-09-17 18:58:37 UTC (rev 6581)
+++ glibc-package/branches/glibc-2.22/debian/patches/powerpc/cvs-ppc-pow.diff
2015-09-17 19:00:13 UTC (rev 6582)
@@ -1,19 +0,0 @@
-commit d421868bb85d1459b1d2df520bb26f3e11aa195a
-Author: Adhemerval Zanella <[email protected]>
-Date: Tue Mar 10 09:38:54 2015 -0400
-
- powerpc: Fix incorrect results for pow when using FMA
-
- This patch adds no FMA generation for e_pow to avoid precision issues
- for powerpc. This fixes BZ#18104.
-
-diff --git a/sysdeps/ieee754/dbl-64/Makefile b/sysdeps/ieee754/dbl-64/Makefile
-index 35f545f..5557c75 100644
---- a/sysdeps/ieee754/dbl-64/Makefile
-+++ b/sysdeps/ieee754/dbl-64/Makefile
-@@ -2,4 +2,5 @@ ifeq ($(subdir),math)
- # branred depends on precise IEEE double rounding
- CFLAGS-branred.c = $(config-cflags-nofma)
- CFLAGS-e_sqrt.c = $(config-cflags-nofma)
-+CFLAGS-e_pow.c = $(config-cflags-nofma)
- endif
Deleted:
glibc-package/branches/glibc-2.22/debian/patches/powerpc/cvs-ppc-sqrt.diff
===================================================================
--- glibc-package/branches/glibc-2.22/debian/patches/powerpc/cvs-ppc-sqrt.diff
2015-09-17 18:58:37 UTC (rev 6581)
+++ glibc-package/branches/glibc-2.22/debian/patches/powerpc/cvs-ppc-sqrt.diff
2015-09-17 19:00:13 UTC (rev 6582)
@@ -1,95 +0,0 @@
-commit e8bd5286c68bc35be3b41e94c15c4387dcb3bec9
-Author: Joseph Myers <[email protected]>
-Date: Thu Feb 12 23:05:37 2015 +0000
-
- Fix powerpc software sqrt (bug 17964).
-
- As Adhemerval noted in
- <https://sourceware.org/ml/libc-alpha/2015-01/msg00451.html>, the
- powerpc sqrt implementation for when _ARCH_PPCSQ is not defined is
- inaccurate in some cases.
-
- The problem is that this code relies on fused multiply-add, and relies
- on the compiler contracting a * b + c to get a fused operation. But
- sysdeps/ieee754/dbl-64/Makefile disables contraction for e_sqrt.c,
- because the implementation in that directory relies on *not* having
- contracted operations.
-
- While it would be possible to arrange makefiles so that an earlier
- sysdeps directory can disable the setting in
- sysdeps/ieee754/dbl-64/Makefile, it seems a lot cleaner to make the
- dependence on fused operations explicit in the .c file. GCC 4.6
- introduced support for __builtin_fma on powerpc and other
- architectures with such instructions, so we can rely on that; this
- patch duly makes the code use __builtin_fma for all such fused
- operations.
-
- Tested for powerpc32 (hard float).
-
- 2015-02-12 Joseph Myers <[email protected]>
-
- [BZ #17964]
- * sysdeps/powerpc/fpu/e_sqrt.c (__slow_ieee754_sqrt): Use
- __builtin_fma instead of relying on contraction of a * b + c.
-
-diff --git a/sysdeps/powerpc/fpu/e_sqrt.c b/sysdeps/powerpc/fpu/e_sqrt.c
-index 0934faa..9b55ef8 100644
---- a/sysdeps/powerpc/fpu/e_sqrt.c
-+++ b/sysdeps/powerpc/fpu/e_sqrt.c
-@@ -99,38 +99,41 @@ __slow_ieee754_sqrt (double x)
- /* Here we have three Newton-Raphson iterations each of a
- division and a square root and the remainder of the
- argument reduction, all interleaved. */
-- sd = -(sg * sg - sx);
-+ sd = -__builtin_fma (sg, sg, -sx);
- fsgi = (xi0 + 0x40000000) >> 1 & 0x7ff00000;
- sy2 = sy + sy;
-- sg = sy * sd + sg; /* 16-bit approximation to sqrt(sx). */
-+ sg = __builtin_fma (sy, sd, sg); /* 16-bit approximation to
-+ sqrt(sx). */
-
- /* schedule the INSERT_WORDS (fsg, fsgi, 0) to get separation
- between the store and the load. */
- INSERT_WORDS (fsg, fsgi, 0);
- iw_u.parts.msw = fsgi;
- iw_u.parts.lsw = (0);
-- e = -(sy * sg - almost_half);
-- sd = -(sg * sg - sx);
-+ e = -__builtin_fma (sy, sg, -almost_half);
-+ sd = -__builtin_fma (sg, sg, -sx);
- if ((xi0 & 0x7ff00000) == 0)
- goto denorm;
-- sy = sy + e * sy2;
-- sg = sg + sy * sd; /* 32-bit approximation to sqrt(sx). */
-+ sy = __builtin_fma (e, sy2, sy);
-+ sg = __builtin_fma (sy, sd, sg); /* 32-bit approximation to
-+ sqrt(sx). */
- sy2 = sy + sy;
- /* complete the INSERT_WORDS (fsg, fsgi, 0) operation. */
- fsg = iw_u.value;
-- e = -(sy * sg - almost_half);
-- sd = -(sg * sg - sx);
-- sy = sy + e * sy2;
-+ e = -__builtin_fma (sy, sg, -almost_half);
-+ sd = -__builtin_fma (sg, sg, -sx);
-+ sy = __builtin_fma (e, sy2, sy);
- shx = sx * fsg;
-- sg = sg + sy * sd; /* 64-bit approximation to sqrt(sx),
-- but perhaps rounded incorrectly. */
-+ sg = __builtin_fma (sy, sd, sg); /* 64-bit approximation to
-+ sqrt(sx), but perhaps
-+ rounded incorrectly. */
- sy2 = sy + sy;
- g = sg * fsg;
-- e = -(sy * sg - almost_half);
-- d = -(g * sg - shx);
-- sy = sy + e * sy2;
-+ e = -__builtin_fma (sy, sg, -almost_half);
-+ d = -__builtin_fma (g, sg, -shx);
-+ sy = __builtin_fma (e, sy2, sy);
- fesetenv_register (fe);
-- return g + sy * d;
-+ return __builtin_fma (sy, d, g);
- denorm:
- /* For denormalised numbers, we normalise, calculate the
- square root, and return an adjusted result. */
Deleted:
glibc-package/branches/glibc-2.22/debian/patches/powerpc/cvs-ppc-sqrtf.diff
===================================================================
--- glibc-package/branches/glibc-2.22/debian/patches/powerpc/cvs-ppc-sqrtf.diff
2015-09-17 18:58:37 UTC (rev 6581)
+++ glibc-package/branches/glibc-2.22/debian/patches/powerpc/cvs-ppc-sqrtf.diff
2015-09-17 19:00:13 UTC (rev 6582)
@@ -1,67 +0,0 @@
-commit 95c26233a1c7dd73a852a4f3bffd2d2eeba5e2fd
-Author: Joseph Myers <[email protected]>
-Date: Fri Feb 13 16:20:36 2015 +0000
-
- Fix powerpc software sqrtf (bug 17967).
-
- Similarly to sqrt in
- <https://sourceware.org/ml/libc-alpha/2015-02/msg00353.html>, the
- powerpc sqrtf implementation for when _ARCH_PPCSQ is not defined also
- relies on a * b + c being contracted into a fused multiply-add.
- Although this contraction is not explicitly disabled for e_sqrtf.c, it
- still seems appropriate to make the file explicit about its
- requirements by using __builtin_fmaf; this patch does so.
- Furthermore, it turns out that doing so fixes the observed inaccuracy
- and missing exceptions (that is, that without explicit __builtin_fmaf
- usage, it was not being compiled as intended).
-
- Tested for powerpc32 (hard float).
-
- [BZ #17967]
- * sysdeps/powerpc/fpu/e_sqrtf.c (__slow_ieee754_sqrtf): Use
- __builtin_fmaf instead of relying on contraction of a * b + c.
-
-diff --git a/sysdeps/powerpc/fpu/e_sqrtf.c b/sysdeps/powerpc/fpu/e_sqrtf.c
-index 034b6f5..a684cf9 100644
---- a/sysdeps/powerpc/fpu/e_sqrtf.c
-+++ b/sysdeps/powerpc/fpu/e_sqrtf.c
-@@ -87,26 +87,28 @@ __slow_ieee754_sqrtf (float x)
- /* Here we have three Newton-Raphson iterations each of a
- division and a square root and the remainder of the
- argument reduction, all interleaved. */
-- sd = -(sg * sg - sx);
-+ sd = -__builtin_fmaf (sg, sg, -sx);
- fsgi = (xi + 0x40000000) >> 1 & 0x7f800000;
- sy2 = sy + sy;
-- sg = sy * sd + sg; /* 16-bit approximation to sqrt(sx). */
-- e = -(sy * sg - almost_half);
-+ sg = __builtin_fmaf (sy, sd, sg); /* 16-bit approximation to
-+ sqrt(sx). */
-+ e = -__builtin_fmaf (sy, sg, -almost_half);
- SET_FLOAT_WORD (fsg, fsgi);
-- sd = -(sg * sg - sx);
-- sy = sy + e * sy2;
-+ sd = -__builtin_fmaf (sg, sg, -sx);
-+ sy = __builtin_fmaf (e, sy2, sy);
- if ((xi & 0x7f800000) == 0)
- goto denorm;
- shx = sx * fsg;
-- sg = sg + sy * sd; /* 32-bit approximation to sqrt(sx),
-- but perhaps rounded incorrectly. */
-+ sg = __builtin_fmaf (sy, sd, sg); /* 32-bit approximation to
-+ sqrt(sx), but perhaps
-+ rounded incorrectly. */
- sy2 = sy + sy;
- g = sg * fsg;
-- e = -(sy * sg - almost_half);
-- d = -(g * sg - shx);
-- sy = sy + e * sy2;
-+ e = -__builtin_fmaf (sy, sg, -almost_half);
-+ d = -__builtin_fmaf (g, sg, -shx);
-+ sy = __builtin_fmaf (e, sy2, sy);
- fesetenv_register (fe);
-- return g + sy * d;
-+ return __builtin_fmaf (sy, d, g);
- denorm:
- /* For denormalised numbers, we normalise, calculate the
- square root, and return an adjusted result. */
Deleted:
glibc-package/branches/glibc-2.22/debian/patches/powerpc/cvs-ppc-tabort-le.diff
===================================================================
---
glibc-package/branches/glibc-2.22/debian/patches/powerpc/cvs-ppc-tabort-le.diff
2015-09-17 18:58:37 UTC (rev 6581)
+++
glibc-package/branches/glibc-2.22/debian/patches/powerpc/cvs-ppc-tabort-le.diff
2015-09-17 19:00:13 UTC (rev 6582)
@@ -1,22 +0,0 @@
-commit 6f7415033813c73fde81da60d209297901f35575
-Author: Adhemerval Zanella <[email protected]>
-Date: Thu Feb 12 05:34:16 2015 -0600
-
- powerpc: Fix TABORT encoding for little endian
-
- This patch fix the TABORT encoding for toolchains with no support for
- HTM builtins.
-
-diff --git a/sysdeps/unix/sysv/linux/powerpc/htm.h
b/sysdeps/unix/sysv/linux/powerpc/htm.h
-index edac601..57d5cd6 100644
---- a/sysdeps/unix/sysv/linux/powerpc/htm.h
-+++ b/sysdeps/unix/sysv/linux/powerpc/htm.h
-@@ -60,7 +60,7 @@
- #define TBEGIN ".long 0x7c00051d"
- #define TEND ".long 0x7c00055d"
- #if __BYTE_ORDER == __LITTLE_ENDIAN
--# define TABORT ".byte 0x1d,0x07,%1,0x1d"
-+# define TABORT ".byte 0x1d,0x07,%1,0x7c"
- #else
- # define TABORT ".byte 0x7c,%1,0x07,0x1d"
- #endif
Modified: glibc-package/branches/glibc-2.22/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.22/debian/patches/series 2015-09-17
18:58:37 UTC (rev 6581)
+++ glibc-package/branches/glibc-2.22/debian/patches/series 2015-09-17
19:00:13 UTC (rev 6582)
@@ -52,109 +52,102 @@
arm/local-soname-hack.diff
arm/local-vfp-sysdeps.diff
arm/unsubmitted-ldso-multilib.diff
-arm/cvs-arm-sfi_breg.diff
-arm/cvs-memcpy-memmove-always-bx.diff
arm/local-arm-futex.diff
hppa/local-inlining.diff
hppa/local-stack-grows-up.diff
hppa/local-elf-make-cflags.diff
-hppa/local-fcntl-osync.diff
hppa/local-shmlba.diff
hppa/local-pthread_spin_unlock.diff
-hppa/cvs-fpu-r2.diff
-hppa/cvs-fpu2.diff
hppa/local-fptr-table-size.diff
-hppa/local-setcontext.diff
hppa/cvs-start.diff
-hppa/cvs-alloca-werror.diff
hurd-i386/local-enable-ldconfig.diff
-hurd-i386/tg-context_functions.diff
-hurd-i386/tg-tls.diff
-hurd-i386/tg-tls-threadvar.diff
-hurd-i386/tg-tlsdesc.sym.diff
-hurd-i386/tg-sysvshm.diff
-hurd-i386/tg-ioctl-base-types.diff
-hurd-i386/tg-extern_inline.diff
-hurd-i386/tg-_dl_random.diff
-hurd-i386/tg-thread-cancel.diff
-hurd-i386/tg-bigmem.diff
-hurd-i386/local-disable-ioctls.diff
-hurd-i386/tg-locarchive.diff
-hurd-i386/tg-no-hp-timing.diff
-hurd-i386/tg-sendmsg-SCM_RIGHTS.diff
-hurd-i386/tg-grantpt.diff
+#hurd-i386/tg-context_functions.diff
+#hurd-i386/tg-tls.diff
+#hurd-i386/tg-tls-threadvar.diff
+#hurd-i386/tg-tlsdesc.sym.diff
+#hurd-i386/tg-sysvshm.diff
+#hurd-i386/tg-ioctl-base-types.diff
+#hurd-i386/tg-extern_inline.diff
+#hurd-i386/tg-_dl_random.diff
+#hurd-i386/tg-thread-cancel.diff
+#hurd-i386/tg-bigmem.diff
+#hurd-i386/local-disable-ioctls.diff
+#hurd-i386/tg-locarchive.diff
+#hurd-i386/tg-no-hp-timing.diff
+#hurd-i386/tg-sendmsg-SCM_RIGHTS.diff
+#hurd-i386/tg-grantpt.diff
hurd-i386/submitted-add-needed.diff
-hurd-i386/local-ED.diff
-hurd-i386/tg-posix_thread.diff
-hurd-i386/tg-gai_misc.diff
-hurd-i386/local-madvise_warn.diff
-hurd-i386/tg-hurdsig-fixes.diff
-hurd-i386/tg-hurdsig-global-dispositions.diff
-hurd-i386/local-hurdsig-global-dispositions-version.diff
-hurd-i386/tg-hurdsig-SA_SIGINFO.diff
-hurd-i386/tg-hurdsig-fixes-2.diff
-hurd-i386/tg-hooks.diff
-hurd-i386/cvs-libpthread.diff
-hurd-i386/libpthread_spin-lock.diff
-hurd-i386/tg-aio_misc.diff
-hurd-i386/libpthread_build.diff
-hurd-i386/libpthread_sigmask.diff
-hurd-i386/libpthread_clean.diff
-hurd-i386/cvs-libpthread_clean2.diff
-hurd-i386/cvs-libpthread_build.diff
+#hurd-i386/local-ED.diff
+#hurd-i386/tg-posix_thread.diff
+#hurd-i386/tg-gai_misc.diff
+#hurd-i386/local-madvise_warn.diff
+#hurd-i386/tg-hurdsig-fixes.diff
+#hurd-i386/tg-hurdsig-global-dispositions.diff
+#hurd-i386/local-hurdsig-global-dispositions-version.diff
+#hurd-i386/tg-hurdsig-SA_SIGINFO.diff
+#hurd-i386/tg-hurdsig-fixes-2.diff
+#hurd-i386/tg-hooks.diff
+#hurd-i386/cvs-libpthread.diff
+#hurd-i386/libpthread_spin-lock.diff
+#hurd-i386/tg-aio_misc.diff
+#hurd-i386/libpthread_build.diff
+#hurd-i386/libpthread_sigmask.diff
+#hurd-i386/libpthread_clean.diff
+#hurd-i386/cvs-libpthread_clean2.diff
+#hurd-i386/cvs-libpthread_build.diff
hurd-i386/tg-libpthread_depends.diff
-hurd-i386/libpthread_version.diff
-hurd-i386/tg-chflags.diff
-hurd-i386/submitted-exec_filename.diff
-hurd-i386/unsubmitted-gnumach.defs.diff
-hurd-i386/submitted-fork_port_leak.diff
-hurd-i386/tg-hurdsig-boot-fix.diff
-hurd-i386/tg-single-select-timeout.diff
-hurd-i386/tg-setitimer.diff
-hurd-i386/tg-select-EINTR.diff
-hurd-i386/tg-pie-sbrk.diff
-hurd-i386/tg-ifaddrs_v6.diff
-hurd-i386/tg-remap_getcwd.diff
-hurd-i386/tg-af_local_strlen.diff
-hurd-i386/tg-nice.diff
-hurd-i386/tg-exec-static.diff
-hurd-i386/tg-EIEIO-fr.diff
-hurd-i386/tg-io_select_timeout.diff
-hurd-i386/tg-poll_errors_fixes.diff
-hurd-i386/unsubmitted-clock_t_centiseconds.diff
-hurd-i386/submitted-path_mounted.diff
-hurd-i386/unsubmitted-NO_HIDDEN.diff
-hurd-i386/tg-socket_flags.diff
-hurd-i386/tg-socketpair_flags.diff
-hurd-i386/tg-pipe2.diff
-hurd-i386/tg-libc_getspecific.diff
-hurd-i386/tg-futimens.diff
-hurd-i386/tg-nfds-poll.diff
-hurd-i386/tg-sigstate_locking.diff
-hurd-i386/tg-sigstate_thread_reference.diff
-hurd-i386/tg-tls_thread_leak.diff
-hurd-i386/tg-mmap_file_prot_none_fix.diff
-hurd-i386/submitted-bind_umask2.diff
-hurd-i386/local-libpthread-stacksize.diff
-hurd-i386/tg-WRLCK-upgrade.diff
-hurd-i386/tg-reboot-startup.diff
-hurd-i386/cvs-libpthread-libc-lockP.diff
-hurd-i386/libpthread-versions.diff
-hurd-i386/cvs-revert-gnu-gnu-cleanup.diff
-hurd-i386/unsubmitted-libc_alloca_cutoff.diff
-hurd-i386/libpthread_pthread_types.diff
-hurd-i386/cvs-unwind-resume.diff
-hurd-i386/unsubmitted-libpthread-semaphore.h.diff
-hurd-i386/cvs-libc-modules.h.diff
-hurd-i386/cvs-warnings.diff
-hurd-i386/cvs-check-local-headers.diff
-hurd-i386/cvs-mlock.diff
-hurd-i386/tg-mmap32th_bit.diff
-hurd-i386/tg-sysheaders.diff
-hurd-i386/cvs-bootstrap.diff
-hurd-i386/local-bootstrap.diff
+#hurd-i386/libpthread_version.diff
+#hurd-i386/tg-chflags.diff
+#hurd-i386/submitted-exec_filename.diff
+#hurd-i386/unsubmitted-gnumach.defs.diff
+#hurd-i386/submitted-fork_port_leak.diff
+#hurd-i386/tg-hurdsig-boot-fix.diff
+#hurd-i386/tg-single-select-timeout.diff
+#hurd-i386/tg-setitimer.diff
+#hurd-i386/tg-select-EINTR.diff
+#hurd-i386/tg-pie-sbrk.diff
+#hurd-i386/tg-ifaddrs_v6.diff
+#hurd-i386/tg-remap_getcwd.diff
+#hurd-i386/tg-af_local_strlen.diff
+#hurd-i386/tg-nice.diff
+#hurd-i386/tg-exec-static.diff
+#hurd-i386/tg-EIEIO-fr.diff
+#hurd-i386/tg-io_select_timeout.diff
+#hurd-i386/tg-poll_errors_fixes.diff
+#hurd-i386/unsubmitted-clock_t_centiseconds.diff
+#hurd-i386/submitted-path_mounted.diff
+#hurd-i386/unsubmitted-NO_HIDDEN.diff
+#hurd-i386/tg-socket_flags.diff
+#hurd-i386/tg-socketpair_flags.diff
+#hurd-i386/tg-pipe2.diff
+#hurd-i386/tg-libc_getspecific.diff
+#hurd-i386/tg-futimens.diff
+#hurd-i386/tg-nfds-poll.diff
+#hurd-i386/tg-sigstate_locking.diff
+#hurd-i386/tg-sigstate_thread_reference.diff
+#hurd-i386/tg-tls_thread_leak.diff
+#hurd-i386/tg-mmap_file_prot_none_fix.diff
+#hurd-i386/submitted-bind_umask2.diff
+#hurd-i386/local-libpthread-stacksize.diff
+#hurd-i386/tg-WRLCK-upgrade.diff
+#hurd-i386/tg-reboot-startup.diff
+#hurd-i386/cvs-libpthread-libc-lockP.diff
+#hurd-i386/libpthread-versions.diff
+#hurd-i386/cvs-revert-gnu-gnu-cleanup.diff
+#hurd-i386/unsubmitted-libc_alloca_cutoff.diff
+#hurd-i386/libpthread_pthread_types.diff
+#hurd-i386/cvs-unwind-resume.diff
+#hurd-i386/unsubmitted-libpthread-semaphore.h.diff
+#hurd-i386/cvs-libc-modules.h.diff
+#hurd-i386/cvs-warnings.diff
+#hurd-i386/cvs-check-local-headers.diff
+#hurd-i386/cvs-mlock.diff
+#hurd-i386/tg-mmap32th_bit.diff
+#hurd-i386/tg-sysheaders.diff
+#hurd-i386/cvs-bootstrap.diff
+#hurd-i386/local-bootstrap.diff
i386/local-biarch.diff
i386/local-cmov.diff
@@ -184,12 +177,6 @@
mips/submitted-rld_map.diff
powerpc/local-powerpc8xx-dcbz.diff
-powerpc/cvs-ppc-sqrt.diff
-powerpc/cvs-ppc-sqrtf.diff
-powerpc/cvs-ppc-pow.diff
-powerpc/cvs-ppc-feraiseexcept.diff
-powerpc/cvs-power7-strncpy.diff
-powerpc/cvs-ppc-tabort-le.diff
s390/submitted-nexttowardf.diff
@@ -198,7 +185,6 @@
sparc/local-sparcv9-target.diff
sparc/submitted-timing.diff
-all/local-alias-UTF-8.diff
all/local-alias-et_EE.diff
all/local-remove-manual.diff
all/local-ru_RU.diff
@@ -256,11 +242,5 @@
any/submitted-argp-attribute.diff
any/submitted-resolv-ipv6-nameservers.diff
any/local-static-dlopen-search-path.diff
-any/cvs-ldconfig-aux-cache.diff
-any/cvs-vismain-pie.diff
any/local-tester-gcc-4.9.diff
-any/local-xfail-stdlib-linkns.diff
-any/cvs-localplt-new-readelf.diff
-any/cvs-make-typo.diff
-any/cvs-logbl-accuracy.diff
any/local-math-logb.diff
Modified: glibc-package/branches/glibc-2.22/debian/symbols.wildcards
===================================================================
--- glibc-package/branches/glibc-2.22/debian/symbols.wildcards 2015-09-17
18:58:37 UTC (rev 6581)
+++ glibc-package/branches/glibc-2.22/debian/symbols.wildcards 2015-09-17
19:00:13 UTC (rev 6582)
@@ -1,4 +1,4 @@
-| #PACKAGE# (>> 2.21), #PACKAGE# (<< 2.22)
+| #PACKAGE# (>> 2.22), #PACKAGE# (<< 2.23)
(symver|optional)GLIBC_PRIVATE 0 1
(symver|optional)GLIBC_2.0 2.0
(symver|optional)GLIBC_2.1 2.1
@@ -36,4 +36,5 @@
(symver|optional)GLIBC_2.19 2.19
(symver|optional)GLIBC_2.20 2.20
(symver|optional)GLIBC_2.21 2.21
+ (symver|optional)GLIBC_2.22 2.22
(symver|optional)GCC_3.0 2.3.6
