Hello community, here is the log from the commit of package glibc for openSUSE:Factory checked in at 2012-05-26 12:59:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glibc (Old) and /work/SRC/openSUSE:Factory/.glibc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "glibc", Maintainer is "j...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/glibc/glibc.changes 2012-05-21 07:55:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.glibc.new/glibc.changes 2012-05-26 12:59:14.000000000 +0200 @@ -1,0 +2,18 @@ +Wed May 23 20:00:55 UTC 2012 - a...@suse.de + +- Update to current git of glibc 2.15 branch: + * obsoletes glibc-2.16-avx.patch, + glibc-2.16-fix-check-localplt.patch + * Fixes for math functions. + +------------------------------------------------------------------- +Wed May 23 11:51:02 UTC 2012 - a...@suse.de + +- Fix first_weekday for tr_TR locale (tr_TR.patch) + +------------------------------------------------------------------- +Wed May 16 08:37:57 UTC 2012 - sch...@linux-m68k.org + +- Fix confstr use of local buffer outside its extent + +------------------------------------------------------------------- Old: ---- glibc-2.15-2ba92745c36e.tar.bz2 glibc-2.16-avx.patch glibc-2.16-fix-check-localplt.patch New: ---- confstr.patch glibc-2.15-60ff996420f9.tar.bz2 glibc-2.15-avx2.patch tr_TR.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glibc.spec ++++++ --- /var/tmp/diff_new_pack.ReAVdT/_old 2012-05-26 12:59:18.000000000 +0200 +++ /var/tmp/diff_new_pack.ReAVdT/_new 2012-05-26 12:59:18.000000000 +0200 @@ -115,7 +115,8 @@ %endif Version: 2.15 Release: 0 -%define git_id 2ba92745c36e +%define glibc_major_version 2.15 +%define git_id 60ff996420f9 %define glibc_ports_ver 2.15 %define ports_git_id 8a70b2dcabbf Url: http://www.gnu.org/software/libc/libc.html @@ -263,16 +264,12 @@ Patch1002: glibc-ppc-getcontext.patch # PATCH-FIX-UPSTREAM Fix ifunc relocations (bnc#740109) - a...@suse.de Patch1003: glibc-ifunc-2.16.patch -# PATCH-FIX-UPSTREAM Fix tests for AVX features - a...@suse.de -Patch1004: glibc-2.16-avx.patch # PATCH-FIX-UPSTREAM vfprintf: validate nargs and maybe allocate from heap bnc#747768 - a...@suse.de Patch1005: vfprintf-nargs.patch # PATCH-FIX-UPSTREAM Add Arm dependency on libmemusage - bwiedem...@suse.de Patch1006: glibc-add-arm-dependency-libmemusage.patch # PATCH-FIX-UPSTREAM Fix check abi - a...@suse.de Patch1007: glibc-2.16-fix-check-abi.patch -# PATCH-FIX-UPSTREAM Fix check-localelfplt - a...@suse.de -Patch1008: glibc-2.16-fix-check-localplt.patch # PATCH-FIX-UPSTREAM - Allow compilation with -altivec a...@suse.de Patch1009: glibc-uio-cell.diff # PATCH-FIX-UPSTREAM - do not use initfini anymore @@ -281,6 +278,10 @@ Patch1011: armhf-ld-so.patch # PATCH-FIX-UPSTREAM Add --foreground for nscd (from Fedora) - a...@suse.de Patch1012: glibc-nscd-foreground.patch +# PATCH-FIX-UPSTREAM Fix confstr use of local buffer outside its extent +Patch1013: confstr.patch +# PATCH-FIX-UPSTREAM Use HAS_AVX - a...@suse.de +Patch1014: glibc-2.15-avx2.patch ### # Patches awaiting upstream approval @@ -303,6 +304,8 @@ Patch2009: glibc-fini-unwind.diff # PATCH-FIX-OPENSUSE malloc(0);free gets optimized out Patch2010: glibc-2.16-mcheck.patch +# PATCH-FIX-OPENSUSE Correct first_weekday for tr_TR (glibc bug#13223) - a...@suse.de +Patch2011: tr_TR.patch %description The GNU C Library provides the most important standard libraries used @@ -540,11 +543,9 @@ %patch1001 -p1 %patch1002 -p1 %patch1003 -p1 -%patch1004 -p1 %patch1005 -p1 %patch1006 -p1 %patch1007 -p1 -%patch1008 -p1 %patch1009 -p1 %ifarch ppc ppc64 # to support further architectures, some more changes are needed @@ -555,6 +556,8 @@ %patch20 -p1 %endif %patch1012 -p1 +%patch1013 -p1 +%patch1014 -p1 %patch2001 -p1 %patch2003 -p1 @@ -567,6 +570,7 @@ # %patch2008 -p1 %patch2009 -p1 %patch2010 -p1 +%patch2011 -p1 # # Inconsistency detected by ld.so: dl-close.c: 719: _dl_close: Assertion `map->l_init_called' failed! @@ -946,7 +950,7 @@ %ifarch s390x # s390x is different ... mkdir %{buildroot}/lib - ln -sf ../%{_lib}/ld-%{version}.so %{buildroot}/lib/ld64.so.1 + ln -sf ../%{_lib}/ld-%{glibc_major_version}.so %{buildroot}/lib/ld64.so.1 %endif # Miscelanna: @@ -1035,7 +1039,7 @@ %ifarch armv7l armv7hl # Provide compatibility link -ln -s ld-%{version}.so %{buildroot}/lib/ld-linux.so.3 +ln -s ld-%{glibc_major_version}.so %{buildroot}/lib/ld-linux.so.3 %endif ####################################################################### @@ -1109,7 +1113,7 @@ %doc %{_mandir}/man1/getent.1.gz %doc %{_mandir}/man1/localedef.1.gz %doc %{_mandir}/man5/* -/%{_lib}/ld-%{version}.so +/%{_lib}/ld-%{glibc_major_version}.so # Each architecture has a different name for the dynamic linker: %ifarch %arm @@ -1141,56 +1145,56 @@ /%{_lib}/ld-linux.so.2 %endif -/%{_lib}/libBrokenLocale-%{version}.so +/%{_lib}/libBrokenLocale-%{glibc_major_version}.so /%{_lib}/libBrokenLocale.so.1 /%{_lib}/libSegFault.so -/%{_lib}/libanl-%{version}.so +/%{_lib}/libanl-%{glibc_major_version}.so /%{_lib}/libanl.so.1 -/%{_lib}/libc-%{version}.so +/%{_lib}/libc-%{glibc_major_version}.so /%{_lib}/libc.so.6* -/%{_lib}/libcidn-%{version}.so +/%{_lib}/libcidn-%{glibc_major_version}.so /%{_lib}/libcidn.so.1 -/%{_lib}/libcrypt-%{version}.so +/%{_lib}/libcrypt-%{glibc_major_version}.so /%{_lib}/libcrypt.so.1 -/%{_lib}/libdl-%{version}.so +/%{_lib}/libdl-%{glibc_major_version}.so /%{_lib}/libdl.so.2* -/%{_lib}/libm-%{version}.so +/%{_lib}/libm-%{glibc_major_version}.so /%{_lib}/libm.so.6* -/%{_lib}/libnsl-%{version}.so +/%{_lib}/libnsl-%{glibc_major_version}.so /%{_lib}/libnsl.so.1 -/%{_lib}/libnss_compat-%{version}.so +/%{_lib}/libnss_compat-%{glibc_major_version}.so /%{_lib}/libnss_compat.so.2 -/%{_lib}/libnss_db-%{version}.so +/%{_lib}/libnss_db-%{glibc_major_version}.so /%{_lib}/libnss_db.so.2 -/%{_lib}/libnss_dns-%{version}.so +/%{_lib}/libnss_dns-%{glibc_major_version}.so /%{_lib}/libnss_dns.so.2 -/%{_lib}/libnss_files-%{version}.so +/%{_lib}/libnss_files-%{glibc_major_version}.so /%{_lib}/libnss_files.so.2 -/%{_lib}/libnss_hesiod-%{version}.so +/%{_lib}/libnss_hesiod-%{glibc_major_version}.so /%{_lib}/libnss_hesiod.so.2 -/%{_lib}/libnss_nis-%{version}.so +/%{_lib}/libnss_nis-%{glibc_major_version}.so /%{_lib}/libnss_nis.so.2 -/%{_lib}/libnss_nisplus-%{version}.so +/%{_lib}/libnss_nisplus-%{glibc_major_version}.so /%{_lib}/libnss_nisplus.so.2 -/%{_lib}/libpthread-%{version}.so +/%{_lib}/libpthread-%{glibc_major_version}.so /%{_lib}/libpthread.so.0 -/%{_lib}/libresolv-%{version}.so +/%{_lib}/libresolv-%{glibc_major_version}.so /%{_lib}/libresolv.so.2 -/%{_lib}/librt-%{version}.so +/%{_lib}/librt-%{glibc_major_version}.so /%{_lib}/librt.so.1 /%{_lib}/libthread_db-1.0.so /%{_lib}/libthread_db.so.1 -/%{_lib}/libutil-%{version}.so +/%{_lib}/libutil-%{glibc_major_version}.so /%{_lib}/libutil.so.1 %define optimized_libs() \ %dir %attr(0755,root,root) /%{_lib}/%1\ - /%{_lib}/%1/libc-%{version}.so\ + /%{_lib}/%1/libc-%{glibc_major_version}.so\ /%{_lib}/%1/libc.so.6*\ - /%{_lib}/%1/libm-%{version}.so\ + /%{_lib}/%1/libm-%{glibc_major_version}.so\ /%{_lib}/%1/libm.so.6*\ - /%{_lib}/%1/libpthread-%{version}.so\ + /%{_lib}/%1/libpthread-%{glibc_major_version}.so\ /%{_lib}/%1/libpthread.so.0\ - /%{_lib}/%1/librt-%{version}.so\ + /%{_lib}/%1/librt-%{glibc_major_version}.so\ /%{_lib}/%1/librt.so.1\ /%{_lib}/%1/libthread_db-1.0.so\ /%{_lib}/%1/libthread_db.so.1 @@ -1239,7 +1243,7 @@ %defattr (755,root,root,755) %dir /%{_lib}/obsolete/ %dir /%{_lib}/obsolete/noversion - /%{_lib}/obsolete/noversion/libNoVersion-%{version}.so + /%{_lib}/obsolete/noversion/libNoVersion-%{glibc_major_version}.so /%{_lib}/obsolete/noversion/libNoVersion.so.1 %endif ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.ReAVdT/_old 2012-05-26 12:59:18.000000000 +0200 +++ /var/tmp/diff_new_pack.ReAVdT/_new 2012-05-26 12:59:18.000000000 +0200 @@ -6,6 +6,7 @@ targettype ia32 +/etc/ld.so.conf targettype ia32 "/lib/ld-linux.so.2 -> <prefix>/lib/ld-linux.so.2" prereq -glibc-x86 + +/usr/lib/getconf/[^g] glibc-locale arch i586 block! +/usr/lib(64)?/gconv/gconv-modules ++++++ confstr.patch ++++++ diff --git a/posix/confstr.c b/posix/confstr.c index 3c9566d..cad6561 100644 --- a/posix/confstr.c +++ b/posix/confstr.c @@ -1,5 +1,4 @@ -/* Copyright (C) 1991,1996,1997,2000-2004,2009,2010 Free - Software Foundation, Inc. +/* Copyright (C) 1991-2012 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 @@ -35,6 +34,10 @@ confstr (name, buf, len) const char *string = ""; size_t string_len = 1; + /* Note that this buffer must be large enough for the longest strings + used below. */ + char restenvs[4 * sizeof "POSIX_V7_LPBIG_OFFBIG"]; + switch (name) { case _CS_PATH: @@ -53,59 +56,55 @@ confstr (name, buf, len) wint_t types are no greater than the width of type long. Currently this means all environment which the system allows. */ - { - char restenvs[4 * sizeof "POSIX_V7_LPBIG_OFFBIG"]; - - string_len = 0; + string_len = 0; #ifndef _POSIX_V7_ILP32_OFF32 - if (__sysconf (_SC_V7_ILP32_OFF32) > 0) + if (__sysconf (_SC_V7_ILP32_OFF32) > 0) #endif #if !defined _POSIX_V7_ILP32_OFF32 || _POSIX_V7_ILP32_OFF32 > 0 - { - memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFF32", - sizeof "POSIX_V7_ILP32_OFF32" - 1); - string_len += sizeof "POSIX_V7_ILP32_OFF32" - 1; - } + { + memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFF32", + sizeof "POSIX_V7_ILP32_OFF32" - 1); + string_len += sizeof "POSIX_V7_ILP32_OFF32" - 1; + } #endif #ifndef _POSIX_V7_ILP32_OFFBIG - if (__sysconf (_SC_V7_ILP32_OFFBIG) > 0) + if (__sysconf (_SC_V7_ILP32_OFFBIG) > 0) #endif #if !defined _POSIX_V7_ILP32_OFFBIG || _POSIX_V7_ILP32_OFFBIG > 0 - { - if (string_len) - restenvs[string_len++] = '\n'; - memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFFBIG", - sizeof "POSIX_V7_ILP32_OFFBIG" - 1); - string_len += sizeof "POSIX_V7_ILP32_OFFBIG" - 1; - } + { + if (string_len) + restenvs[string_len++] = '\n'; + memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFFBIG", + sizeof "POSIX_V7_ILP32_OFFBIG" - 1); + string_len += sizeof "POSIX_V7_ILP32_OFFBIG" - 1; + } #endif #ifndef _POSIX_V7_LP64_OFF64 - if (__sysconf (_SC_V7_LP64_OFF64) > 0) + if (__sysconf (_SC_V7_LP64_OFF64) > 0) #endif #if !defined _POSIX_V7_LP64_OFF64 || _POSIX_V7_LP64_OFF64 > 0 - { - if (string_len) - restenvs[string_len++] = '\n'; - memcpy (restenvs + string_len, "POSIX_V7_LP64_OFF64", - sizeof "POSIX_V7_LP64_OFF64" - 1); - string_len += sizeof "POSIX_V7_LP64_OFF64" - 1; - } + { + if (string_len) + restenvs[string_len++] = '\n'; + memcpy (restenvs + string_len, "POSIX_V7_LP64_OFF64", + sizeof "POSIX_V7_LP64_OFF64" - 1); + string_len += sizeof "POSIX_V7_LP64_OFF64" - 1; + } #endif #ifndef _POSIX_V7_LPBIG_OFFBIG - if (__sysconf (_SC_V7_LPBIG_OFFBIG) > 0) + if (__sysconf (_SC_V7_LPBIG_OFFBIG) > 0) #endif #if !defined _POSIX_V7_LPBIG_OFFBIG || _POSIX_V7_LPBIG_OFFBIG > 0 - { - if (string_len) - restenvs[string_len++] = '\n'; - memcpy (restenvs + string_len, "POSIX_V7_LPBIG_OFFBIG", - sizeof "POSIX_V7_LPBIG_OFFBIG" - 1); - string_len += sizeof "POSIX_V7_LPBIG_OFFBIG" - 1; - } -#endif - restenvs[string_len++] = '\0'; - string = restenvs; - } + { + if (string_len) + restenvs[string_len++] = '\n'; + memcpy (restenvs + string_len, "POSIX_V7_LPBIG_OFFBIG", + sizeof "POSIX_V7_LPBIG_OFFBIG" - 1); + string_len += sizeof "POSIX_V7_LPBIG_OFFBIG" - 1; + } +#endif + restenvs[string_len++] = '\0'; + string = restenvs; break; case _CS_V6_WIDTH_RESTRICTED_ENVS: @@ -116,59 +115,55 @@ confstr (name, buf, len) wint_t types are no greater than the width of type long. Currently this means all environment which the system allows. */ - { - char restenvs[4 * sizeof "POSIX_V6_LPBIG_OFFBIG"]; - - string_len = 0; + string_len = 0; #ifndef _POSIX_V6_ILP32_OFF32 - if (__sysconf (_SC_V6_ILP32_OFF32) > 0) + if (__sysconf (_SC_V6_ILP32_OFF32) > 0) #endif #if !defined _POSIX_V6_ILP32_OFF32 || _POSIX_V6_ILP32_OFF32 > 0 - { - memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFF32", - sizeof "POSIX_V6_ILP32_OFF32" - 1); - string_len += sizeof "POSIX_V6_ILP32_OFF32" - 1; - } + { + memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFF32", + sizeof "POSIX_V6_ILP32_OFF32" - 1); + string_len += sizeof "POSIX_V6_ILP32_OFF32" - 1; + } #endif #ifndef _POSIX_V6_ILP32_OFFBIG - if (__sysconf (_SC_V6_ILP32_OFFBIG) > 0) + if (__sysconf (_SC_V6_ILP32_OFFBIG) > 0) #endif #if !defined _POSIX_V6_ILP32_OFFBIG || _POSIX_V6_ILP32_OFFBIG > 0 - { - if (string_len) - restenvs[string_len++] = '\n'; - memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFFBIG", - sizeof "POSIX_V6_ILP32_OFFBIG" - 1); - string_len += sizeof "POSIX_V6_ILP32_OFFBIG" - 1; - } + { + if (string_len) + restenvs[string_len++] = '\n'; + memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFFBIG", + sizeof "POSIX_V6_ILP32_OFFBIG" - 1); + string_len += sizeof "POSIX_V6_ILP32_OFFBIG" - 1; + } #endif #ifndef _POSIX_V6_LP64_OFF64 - if (__sysconf (_SC_V6_LP64_OFF64) > 0) + if (__sysconf (_SC_V6_LP64_OFF64) > 0) #endif #if !defined _POSIX_V6_LP64_OFF64 || _POSIX_V6_LP64_OFF64 > 0 - { - if (string_len) - restenvs[string_len++] = '\n'; - memcpy (restenvs + string_len, "POSIX_V6_LP64_OFF64", - sizeof "POSIX_V6_LP64_OFF64" - 1); - string_len += sizeof "POSIX_V6_LP64_OFF64" - 1; - } + { + if (string_len) + restenvs[string_len++] = '\n'; + memcpy (restenvs + string_len, "POSIX_V6_LP64_OFF64", + sizeof "POSIX_V6_LP64_OFF64" - 1); + string_len += sizeof "POSIX_V6_LP64_OFF64" - 1; + } #endif #ifndef _POSIX_V6_LPBIG_OFFBIG - if (__sysconf (_SC_V6_LPBIG_OFFBIG) > 0) + if (__sysconf (_SC_V6_LPBIG_OFFBIG) > 0) #endif #if !defined _POSIX_V6_LPBIG_OFFBIG || _POSIX_V6_LPBIG_OFFBIG > 0 - { - if (string_len) - restenvs[string_len++] = '\n'; - memcpy (restenvs + string_len, "POSIX_V6_LPBIG_OFFBIG", - sizeof "POSIX_V6_LPBIG_OFFBIG" - 1); - string_len += sizeof "POSIX_V6_LPBIG_OFFBIG" - 1; - } -#endif - restenvs[string_len++] = '\0'; - string = restenvs; - } + { + if (string_len) + restenvs[string_len++] = '\n'; + memcpy (restenvs + string_len, "POSIX_V6_LPBIG_OFFBIG", + sizeof "POSIX_V6_LPBIG_OFFBIG" - 1); + string_len += sizeof "POSIX_V6_LPBIG_OFFBIG" - 1; + } +#endif + restenvs[string_len++] = '\0'; + string = restenvs; break; case _CS_V5_WIDTH_RESTRICTED_ENVS: @@ -179,59 +174,55 @@ confstr (name, buf, len) wint_t types are no greater than the width of type long. Currently this means all environment which the system allows. */ - { - char restenvs[4 * sizeof "XBS5_LPBIG_OFFBIG"]; - - string_len = 0; + string_len = 0; #ifndef _XBS5_ILP32_OFF32 - if (__sysconf (_SC_XBS5_ILP32_OFF32) > 0) + if (__sysconf (_SC_XBS5_ILP32_OFF32) > 0) #endif #if !defined _XBS5_ILP32_OFF32 || _XBS5_ILP32_OFF32 > 0 - { - memcpy (restenvs + string_len, "XBS5_ILP32_OFF32", - sizeof "XBS5_ILP32_OFF32" - 1); - string_len += sizeof "XBS5_ILP32_OFF32" - 1; - } + { + memcpy (restenvs + string_len, "XBS5_ILP32_OFF32", + sizeof "XBS5_ILP32_OFF32" - 1); + string_len += sizeof "XBS5_ILP32_OFF32" - 1; + } #endif #ifndef _XBS5_ILP32_OFFBIG - if (__sysconf (_SC_XBS5_ILP32_OFFBIG) > 0) + if (__sysconf (_SC_XBS5_ILP32_OFFBIG) > 0) #endif #if !defined _XBS5_ILP32_OFFBIG || _XBS5_ILP32_OFFBIG > 0 - { - if (string_len) - restenvs[string_len++] = '\n'; - memcpy (restenvs + string_len, "XBS5_ILP32_OFFBIG", - sizeof "XBS5_ILP32_OFFBIG" - 1); - string_len += sizeof "XBS5_ILP32_OFFBIG" - 1; - } + { + if (string_len) + restenvs[string_len++] = '\n'; + memcpy (restenvs + string_len, "XBS5_ILP32_OFFBIG", + sizeof "XBS5_ILP32_OFFBIG" - 1); + string_len += sizeof "XBS5_ILP32_OFFBIG" - 1; + } #endif #ifndef _XBS5_LP64_OFF64 - if (__sysconf (_SC_XBS5_LP64_OFF64) > 0) + if (__sysconf (_SC_XBS5_LP64_OFF64) > 0) #endif #if !defined _XBS5_LP64_OFF64 || _XBS5_LP64_OFF64 > 0 - { - if (string_len) - restenvs[string_len++] = '\n'; - memcpy (restenvs + string_len, "XBS5_LP64_OFF64", - sizeof "XBS5_LP64_OFF64" - 1); - string_len += sizeof "XBS5_LP64_OFF64" - 1; - } + { + if (string_len) + restenvs[string_len++] = '\n'; + memcpy (restenvs + string_len, "XBS5_LP64_OFF64", + sizeof "XBS5_LP64_OFF64" - 1); + string_len += sizeof "XBS5_LP64_OFF64" - 1; + } #endif #ifndef _XBS5_LPBIG_OFFBIG - if (__sysconf (_SC_XBS5_LPBIG_OFFBIG) > 0) + if (__sysconf (_SC_XBS5_LPBIG_OFFBIG) > 0) #endif #if !defined _XBS5_LPBIG_OFFBIG || _XBS5_LPBIG_OFFBIG > 0 - { - if (string_len) - restenvs[string_len++] = '\n'; - memcpy (restenvs + string_len, "XBS5_LPBIG_OFFBIG", - sizeof "XBS5_LPBIG_OFFBIG" - 1); - string_len += sizeof "XBS5_LPBIG_OFFBIG" - 1; - } -#endif - restenvs[string_len++] = '\0'; - string = restenvs; - } + { + if (string_len) + restenvs[string_len++] = '\n'; + memcpy (restenvs + string_len, "XBS5_LPBIG_OFFBIG", + sizeof "XBS5_LPBIG_OFFBIG" - 1); + string_len += sizeof "XBS5_LPBIG_OFFBIG" - 1; + } +#endif + restenvs[string_len++] = '\0'; + string = restenvs; break; case _CS_XBS5_ILP32_OFF32_CFLAGS: ++++++ glibc-2.15-2ba92745c36e.tar.bz2 -> glibc-2.15-60ff996420f9.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/glibc/glibc-2.15-2ba92745c36e.tar.bz2 /work/SRC/openSUSE:Factory/.glibc.new/glibc-2.15-60ff996420f9.tar.bz2 differ: char 11, line 1 ++++++ glibc-2.16-avx.patch -> glibc-2.15-avx2.patch ++++++ --- /work/SRC/openSUSE:Factory/glibc/glibc-2.16-avx.patch 2012-05-09 07:25:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.glibc.new/glibc-2.15-avx2.patch 2012-05-26 12:59:14.000000000 +0200 @@ -1,75 +1,33 @@ -qcommit afc5ed09cbce5d6fd48b3a8c5ec427b31f996880 +commit 56f6f6a2403cfa7267cad722597113be35ecf70d Author: Ulrich Drepper <drep...@gmail.com> -Date: Thu Jan 26 07:45:14 2012 -0500 +Date: Sat Jan 28 14:48:46 2012 -0500 - Reset bit_AVX in __cpu_features is OS support is missing + Use -msse2avx option for x86-64 libm functions -2012-01-26 Ulrich Drepper <drep...@gmail.com> - - [BZ #13583] - * sysdeps/x86_64/multiarch/init-arch.h: Define bit_OSXSAVE. - * sysdeps/x86_64/multiarch/init-arch.c (__init_cpu_features): If - bit_AVX is set also check OSXAVE/XCR0 and reset bit_AVX if necessary. - -Also contains selected changes from commits 08cf777f9e7f6d826658a99c7d77a359f73a45bf -and 56f6f6a2403cfa7267cad722597113be35ecf70d. - -diff --git a/sysdeps/x86_64/multiarch/init-arch.c b/sysdeps/x86_64/multiarch/init-arch.c -index 65b0ee9..4fabbee 100644 ---- a/sysdeps/x86_64/multiarch/init-arch.c -+++ b/sysdeps/x86_64/multiarch/init-arch.c -@@ -1,6 +1,6 @@ - /* Initialize CPU feature data. - This file is part of the GNU C Library. -- Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc. -+ Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. - Contributed by Ulrich Drepper <drep...@redhat.com>. - - The GNU C Library is free software; you can redistribute it and/or -@@ -144,6 +144,18 @@ __init_cpu_features (void) - else - kind = arch_kind_other; - -+ if (__cpu_features.cpuid[COMMON_CPUID_INDEX_1].ecx & bit_AVX) -+ { -+ /* Reset the AVX bit in case OSXSAVE is disabled. */ -+ if ((__cpu_features.cpuid[COMMON_CPUID_INDEX_1].ecx & bit_OSXSAVE) == 0 -+ || ({ unsigned int xcrlow; -+ unsigned int xcrhigh; -+ asm ("xgetbv" -+ : "=a" (xcrlow), "=d" (xcrhigh) : "c" (0)); -+ (xcrlow & 6) != 6; })) -+ __cpu_features.cpuid[COMMON_CPUID_INDEX_1].ecx &= ~bit_AVX; -+ } -+ - __cpu_features.family = family; - __cpu_features.model = model; - atomic_write_barrier (); -diff --git a/sysdeps/x86_64/multiarch/init-arch.h b/sysdeps/x86_64/multiarch/init-arch.h -index 2a1df39..408e5ae 100644 ---- a/sysdeps/x86_64/multiarch/init-arch.h -+++ b/sysdeps/x86_64/multiarch/init-arch.h -@@ -1,5 +1,5 @@ - /* This file is part of the GNU C Library. -- Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc. -+ Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public -@@ -27,6 +27,7 @@ - #define bit_SSSE3 (1 << 9) - #define bit_SSE4_1 (1 << 19) - #define bit_SSE4_2 (1 << 20) -+#define bit_OSXSAVE (1 << 27) - #define bit_AVX (1 << 28) - #define bit_POPCOUNT (1 << 23) - #define bit_FMA (1 << 12) - -Index: glibc-2.15/config.h.in -=================================================================== ---- glibc-2.15.orig/config.h.in -+++ glibc-2.15/config.h.in -@@ -102,7 +102,7 @@ + 2012-01-28 Ulrich Drepper <drep...@gmail.com> + + * config.h.in: Define HAVE_SSE2AVX_SUPPORT. + * math/math_private.h: Remove libc_fegetround* and + libc_fesetround*. + * sysdeps/i386/configure.in: Check for -msse2avx. + * sysdeps/x86_64/fpu/math_private.h: Use VEX-encoded instructions + also if SSE2AVX is defined. + Remove libc_fegetround* and libc_fesetround*. + * sysdeps/x86_64/fpu/multiarch/Makefile: Compile *-avx functions + if config-cflags-sse2avx is yes. Also add -DSSE2AVX to defines. + * sysdeps/x86_64/fpu/multiarch/e_atan2.c: Use HAS_AVX again instead + of HAS_YMM_USABLE. + * sysdeps/x86_64/fpu/multiarch/e_exp.c: Likewise. + * sysdeps/x86_64/fpu/multiarch/e_log.c: Likewise. + * sysdeps/x86_64/fpu/multiarch/s_atan.c: Likewise. + * sysdeps/x86_64/fpu/multiarch/s_sin.c: Likewise. + * sysdeps/x86_64/fpu/multiarch/s_tan.c: Likewise. + +diff --git a/config.h.in b/config.h.in +index 50d53d4..1489476 100644 +--- a/config.h.in ++++ b/config.h.in +@@ -90,7 +90,7 @@ certain registers (CR0, MQ, CTR, LR) in asm statements. */ #undef BROKEN_PPC_ASM_CR0 @@ -78,7 +36,7 @@ symbol. sysdeps/sparc/sparc32/elf/configure. */ #undef BROKEN_SPARC_WDISP22 -@@ -118,17 +118,20 @@ +@@ -106,17 +106,20 @@ /* Define if gcc supports AVX. */ #undef HAVE_AVX_SUPPORT @@ -101,10 +59,10 @@ include/libc-symbols.h that avoid PLT slots in the shared objects. */ #undef NO_HIDDEN -Index: glibc-2.15/sysdeps/i386/configure -=================================================================== ---- glibc-2.15.orig/sysdeps/i386/configure -+++ glibc-2.15/sysdeps/i386/configure +diff --git a/sysdeps/i386/configure b/sysdeps/i386/configure +index ae494e2..bc7900e 100644 +--- a/sysdeps/i386/configure ++++ b/sysdeps/i386/configure @@ -756,6 +756,29 @@ if test $libc_cv_cc_avx = yes; then fi @@ -135,10 +93,10 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FMA4 support" >&5 $as_echo_n "checking for FMA4 support... " >&6; } if ${libc_cv_cc_fma4+:} false; then : -Index: glibc-2.15/sysdeps/i386/configure.in -=================================================================== ---- glibc-2.15.orig/sysdeps/i386/configure.in -+++ glibc-2.15/sysdeps/i386/configure.in +diff --git a/sysdeps/i386/configure.in b/sysdeps/i386/configure.in +index 5a9840e..59a4cd6 100644 +--- a/sysdeps/i386/configure.in ++++ b/sysdeps/i386/configure.in @@ -67,6 +67,17 @@ if test $libc_cv_cc_avx = yes; then AC_DEFINE(HAVE_AVX_SUPPORT) fi @@ -157,10 +115,10 @@ dnl Check if -mfma4 works. AC_CACHE_CHECK(for FMA4 support, libc_cv_cc_fma4, [dnl if AC_TRY_COMMAND([${CC-cc} -mfma4 -xc /dev/null -S -o /dev/null]); then -Index: glibc-2.15/sysdeps/x86_64/fpu/multiarch/Makefile -=================================================================== ---- glibc-2.15.orig/sysdeps/x86_64/fpu/multiarch/Makefile -+++ glibc-2.15/sysdeps/x86_64/fpu/multiarch/Makefile +diff --git a/sysdeps/x86_64/fpu/multiarch/Makefile b/sysdeps/x86_64/fpu/multiarch/Makefile +index be68903..4b5c173 100644 +--- a/sysdeps/x86_64/fpu/multiarch/Makefile ++++ b/sysdeps/x86_64/fpu/multiarch/Makefile @@ -34,21 +34,21 @@ CFLAGS-s_sin-fma4.c = -mfma4 CFLAGS-s_tan-fma4.c = -mfma4 endif @@ -190,14 +148,180 @@ +CFLAGS-mplog-avx.c = -msse2avx -DSSE2AVX +CFLAGS-s_atan-avx.c = -msse2avx -DSSE2AVX +CFLAGS-s_sin-avx.c = -msse2avx -DSSE2AVX -+CFLAGS-slowexp-avx.c = -msse2avx -DSSE2AVX ++CFLAGS-slowexp-avx.c = -sse2mavx -DSSE2AVX +CFLAGS-s_tan-avx.c = -msse2avx -DSSE2AVX endif endif -Index: glibc-2.15/config.make.in -=================================================================== ---- glibc-2.15.orig/config.make.in -+++ glibc-2.15/config.make.in +diff --git a/sysdeps/x86_64/fpu/multiarch/e_atan2.c b/sysdeps/x86_64/fpu/multiarch/e_atan2.c +index 3a615fc..6867c6e 100644 +--- a/sysdeps/x86_64/fpu/multiarch/e_atan2.c ++++ b/sysdeps/x86_64/fpu/multiarch/e_atan2.c +@@ -14,7 +14,7 @@ extern double __ieee754_atan2_fma4 (double, double); + + libm_ifunc (__ieee754_atan2, + HAS_FMA4 ? __ieee754_atan2_fma4 +- : (HAS_YMM_USABLE ? __ieee754_atan2_avx : __ieee754_atan2_sse2)); ++ : (HAS_AVX ? __ieee754_atan2_avx : __ieee754_atan2_sse2)); + strong_alias (__ieee754_atan2, __atan2_finite) + + # define __ieee754_atan2 __ieee754_atan2_sse2 +diff --git a/sysdeps/x86_64/fpu/multiarch/e_exp.c b/sysdeps/x86_64/fpu/multiarch/e_exp.c +index 7b2320a..3c65028 100644 +--- a/sysdeps/x86_64/fpu/multiarch/e_exp.c ++++ b/sysdeps/x86_64/fpu/multiarch/e_exp.c +@@ -14,7 +14,7 @@ extern double __ieee754_exp_fma4 (double); + + libm_ifunc (__ieee754_exp, + HAS_FMA4 ? __ieee754_exp_fma4 +- : (HAS_YMM_USABLE ? __ieee754_exp_avx : __ieee754_exp_sse2)); ++ : (HAS_AVX ? __ieee754_exp_avx : __ieee754_exp_sse2)); + strong_alias (__ieee754_exp, __exp_finite) + + # define __ieee754_exp __ieee754_exp_sse2 +diff --git a/sysdeps/x86_64/fpu/multiarch/e_log.c b/sysdeps/x86_64/fpu/multiarch/e_log.c +index ab277d6..05f3668 100644 +--- a/sysdeps/x86_64/fpu/multiarch/e_log.c ++++ b/sysdeps/x86_64/fpu/multiarch/e_log.c +@@ -14,8 +14,7 @@ extern double __ieee754_log_fma4 (double); + + libm_ifunc (__ieee754_log, + HAS_FMA4 ? __ieee754_log_fma4 +- : (HAS_YMM_USABLE ? __ieee754_log_avx +- : __ieee754_log_sse2)); ++ : (HAS_AVX ? __ieee754_log_avx : __ieee754_log_sse2)); + strong_alias (__ieee754_log, __log_finite) + + # define __ieee754_log __ieee754_log_sse2 +diff --git a/sysdeps/x86_64/fpu/multiarch/s_atan.c b/sysdeps/x86_64/fpu/multiarch/s_atan.c +index 78c7e09..ae16d7c 100644 +--- a/sysdeps/x86_64/fpu/multiarch/s_atan.c ++++ b/sysdeps/x86_64/fpu/multiarch/s_atan.c +@@ -13,7 +13,7 @@ extern double __atan_fma4 (double); + # endif + + libm_ifunc (atan, (HAS_FMA4 ? __atan_fma4 : +- HAS_YMM_USABLE ? __atan_avx : __atan_sse2)); ++ HAS_AVX ? __atan_avx : __atan_sse2)); + + # define atan __atan_sse2 + #endif +diff --git a/sysdeps/x86_64/fpu/multiarch/s_sin.c b/sysdeps/x86_64/fpu/multiarch/s_sin.c +index 417acd0..a0c2521 100644 +--- a/sysdeps/x86_64/fpu/multiarch/s_sin.c ++++ b/sysdeps/x86_64/fpu/multiarch/s_sin.c +@@ -18,11 +18,11 @@ extern double __sin_fma4 (double); + # endif + + libm_ifunc (__cos, (HAS_FMA4 ? __cos_fma4 : +- HAS_YMM_USABLE ? __cos_avx : __cos_sse2)); ++ HAS_AVX ? __cos_avx : __cos_sse2)); + weak_alias (__cos, cos) + + libm_ifunc (__sin, (HAS_FMA4 ? __sin_fma4 : +- HAS_YMM_USABLE ? __sin_avx : __sin_sse2)); ++ HAS_AVX ? __sin_avx : __sin_sse2)); + weak_alias (__sin, sin) + + # define __cos __cos_sse2 +diff --git a/sysdeps/x86_64/fpu/multiarch/s_tan.c b/sysdeps/x86_64/fpu/multiarch/s_tan.c +index 3047155..904308f 100644 +--- a/sysdeps/x86_64/fpu/multiarch/s_tan.c ++++ b/sysdeps/x86_64/fpu/multiarch/s_tan.c +@@ -13,7 +13,7 @@ extern double __tan_fma4 (double); + # endif + + libm_ifunc (tan, (HAS_FMA4 ? __tan_fma4 : +- HAS_YMM_USABLE ? __tan_avx : __tan_sse2)); ++ HAS_AVX ? __tan_avx : __tan_sse2)); + + # define tan __tan_sse2 + #endif +commit 7998fa7899a29803ad4512002636332dfee48451 +Author: Andreas Schwab <sch...@linux-m68k.org> +Date: Fri Mar 16 16:07:57 2012 +0100 + + Disable use of FMA instructions in branred + +2012-03-21 Andreas Schwab <sch...@linux-m68k.org> + + * sysdeps/x86_64/fpu/multiarch/Makefile (libm-sysdep_routines): + Remove brandred-fma4. + (CFLAGS-brandred-fma4.c): Remove. + * sysdeps/x86_64/fpu/multiarch/brandred-fma4.c: Remove. + * sysdeps/x86_64/fpu/multiarch/s_sin-fma4.c (__branred): Don't + define. + * sysdeps/x86_64/fpu/multiarch/s_tan-fma4.c (__branred): Don't + define. + + + * stdio-common/_itoa.c: Check _ITOA_NEEDED instead of + +diff --git a/sysdeps/x86_64/fpu/multiarch/Makefile b/sysdeps/x86_64/fpu/multiarch/Makefile +index 2a38ffc..12b0526 100644 +--- a/sysdeps/x86_64/fpu/multiarch/Makefile ++++ b/sysdeps/x86_64/fpu/multiarch/Makefile +@@ -7,10 +7,9 @@ libm-sysdep_routines += e_exp-fma4 e_log-fma4 e_pow-fma4 s_atan-fma4 \ + e_asin-fma4 e_atan2-fma4 s_sin-fma4 s_tan-fma4 \ + mplog-fma4 mpa-fma4 slowexp-fma4 slowpow-fma4 \ + sincos32-fma4 doasin-fma4 dosincos-fma4 \ +- brandred-fma4 halfulp-fma4 mpexp-fma4 \ ++ halfulp-fma4 mpexp-fma4 \ + mpatan2-fma4 mpatan-fma4 mpsqrt-fma4 mptan-fma4 + +-CFLAGS-brandred-fma4.c = -mfma4 + CFLAGS-doasin-fma4.c = -mfma4 + CFLAGS-dosincos-fma4.c = -mfma4 + CFLAGS-e_asin-fma4.c = -mfma4 +diff --git a/sysdeps/x86_64/fpu/multiarch/brandred-fma4.c b/sysdeps/x86_64/fpu/multiarch/brandred-fma4.c +deleted file mode 100644 +index f4f68ac..0000000 +--- a/sysdeps/x86_64/fpu/multiarch/brandred-fma4.c ++++ /dev/null +@@ -1,4 +0,0 @@ +-#define __branred __branred_fma4 +-#define SECTION __attribute__ ((section (".text.fma4"))) +- +-#include <sysdeps/ieee754/dbl-64/branred.c> +diff --git a/sysdeps/x86_64/fpu/multiarch/s_sin-fma4.c b/sysdeps/x86_64/fpu/multiarch/s_sin-fma4.c +index 2501af9..4c35739 100644 +--- a/sysdeps/x86_64/fpu/multiarch/s_sin-fma4.c ++++ b/sysdeps/x86_64/fpu/multiarch/s_sin-fma4.c +@@ -1,6 +1,5 @@ + #define __cos __cos_fma4 + #define __sin __sin_fma4 +-#define __branred __branred_fma4 + #define __docos __docos_fma4 + #define __dubsin __dubsin_fma4 + #define __mpcos __mpcos_fma4 +diff --git a/sysdeps/x86_64/fpu/multiarch/s_tan-fma4.c b/sysdeps/x86_64/fpu/multiarch/s_tan-fma4.c +index d7dab3c..a805440 100644 +--- a/sysdeps/x86_64/fpu/multiarch/s_tan-fma4.c ++++ b/sysdeps/x86_64/fpu/multiarch/s_tan-fma4.c +@@ -1,5 +1,4 @@ + #define tan __tan_fma4 +-#define __branred __branred_fma4 + #define __dbl_mp __dbl_mp_fma4 + #define __mpranred __mpranred_fma4 + #define __mptan __mptan_fma4 +commit 3b1004624e54cc2fefd034ff80d5dea4b6db764f +Author: Joseph Myers <jos...@codesourcery.com> +Date: Mon Jan 30 19:55:15 2012 +0000 + + Fix makefile/configure problems with sse2avx changes. + +2012-01-30 Joseph Myers <jos...@codesourcery.com> + + * configure.in (libc_cv_cc_sse2avx): AC_SUBST. + * configure: Regenerate. + * config.make.in (config-cflags-sse2avx): Define. + * sysdeps/x86_64/fpu/multiarch/Makefile (CFLAGS-slowexp-avx.c): + Fix typo. + + * scripts/config.guess: Update from upstream config git repository. +diff --git a/config.make.in b/config.make.in +index d937952..75061f6 100644 +--- a/config.make.in ++++ b/config.make.in @@ -36,6 +36,7 @@ asflags-cpu = @libc_cv_cc_submachine@ config-cflags-sse4 = @libc_cv_cc_sse4@ @@ -206,11 +330,11 @@ config-cflags-novzeroupper = @libc_cv_cc_novzeroupper@ config-asflags-i686 = @libc_cv_as_i686@ -Index: glibc-2.15/configure -=================================================================== ---- glibc-2.15.orig/configure -+++ glibc-2.15/configure -@@ -625,6 +625,7 @@ use_ldconfig +diff --git a/configure b/configure +index 71e8de1..508e1bb 100755 +--- a/configure ++++ b/configure +@@ -620,6 +620,7 @@ use_ldconfig libc_cv_as_i686 libc_cv_cc_fma4 libc_cv_cc_novzeroupper @@ -218,11 +342,11 @@ libc_cv_cc_avx libc_cv_cc_sse4 libc_cv_cpp_asm_debuginfo -Index: glibc-2.15/configure.in -=================================================================== ---- glibc-2.15.orig/configure.in -+++ glibc-2.15/configure.in -@@ -2338,6 +2338,7 @@ dnl sysdeps/CPU/configure.in checks set +diff --git a/configure.in b/configure.in +index 5fd6d85..0499d3c 100644 +--- a/configure.in ++++ b/configure.in +@@ -2154,6 +2154,7 @@ dnl sysdeps/CPU/configure.in checks set this via arch-specific asm tests AC_SUBST(libc_cv_cpp_asm_debuginfo) AC_SUBST(libc_cv_cc_sse4) AC_SUBST(libc_cv_cc_avx) @@ -230,19 +354,16 @@ AC_SUBST(libc_cv_cc_novzeroupper) AC_SUBST(libc_cv_cc_fma4) AC_SUBST(libc_cv_as_i686) - - ---- eglibc-2.15-fma4-orig/sysdeps/x86_64/multiarch/init-arch.c 2012-05-07 10:02:38.869334673 -0700 -+++ eglibc-2.15-fma4-orig/sysdeps/x86_64/multiarch/init-arch.c 2012-05-07 10:01:16.217334959 -0700 -@@ -156,6 +156,11 @@ - __cpu_features.cpuid[COMMON_CPUID_INDEX_1].ecx &= ~bit_AVX; - } - -+ /* FMA4 depends on AVX support */ -+ if (__cpu_features.cpuid[COMMON_CPUID_INDEX_80000001].ecx & bit_FMA4 -+ && (__cpu_features.cpuid[COMMON_CPUID_INDEX_1].ecx & bit_AVX) == 0) -+ __cpu_features.cpuid[COMMON_CPUID_INDEX_80000001].ecx &= ~bit_FMA4; -+ - __cpu_features.family = family; - __cpu_features.model = model; - atomic_write_barrier (); +diff --git a/sysdeps/x86_64/fpu/multiarch/Makefile b/sysdeps/x86_64/fpu/multiarch/Makefile +index 4b5c173..2a38ffc 100644 +--- a/sysdeps/x86_64/fpu/multiarch/Makefile ++++ b/sysdeps/x86_64/fpu/multiarch/Makefile +@@ -48,7 +48,7 @@ CFLAGS-mpexp-avx.c = -msse2avx -DSSE2AVX + CFLAGS-mplog-avx.c = -msse2avx -DSSE2AVX + CFLAGS-s_atan-avx.c = -msse2avx -DSSE2AVX + CFLAGS-s_sin-avx.c = -msse2avx -DSSE2AVX +-CFLAGS-slowexp-avx.c = -sse2mavx -DSSE2AVX ++CFLAGS-slowexp-avx.c = -msse2avx -DSSE2AVX + CFLAGS-s_tan-avx.c = -msse2avx -DSSE2AVX + endif + endif ++++++ glibc-version.diff ++++++ --- /var/tmp/diff_new_pack.ReAVdT/_old 2012-05-26 12:59:18.000000000 +0200 +++ /var/tmp/diff_new_pack.ReAVdT/_new 2012-05-26 12:59:18.000000000 +0200 @@ -8,7 +8,7 @@ static const char banner[] = -"GNU C Library "RELEASE" release version "VERSION", by Roland McGrath et al.\n\ +"GNU C Library "RELEASE" release version "VERSION" ("CVSDATE"), by Roland McGrath et al.\n\ - Copyright (C) 2011 Free Software Foundation, Inc.\n\ + Copyright (C) 2012 Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions.\n\ There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n\ PARTICULAR PURPOSE.\n\ ++++++ tr_TR.patch ++++++ Index: glibc-2.15/localedata/locales/tr_TR =================================================================== --- glibc-2.15.orig/localedata/locales/tr_TR +++ glibc-2.15/localedata/locales/tr_TR @@ -3540,6 +3540,8 @@ t_fmt_ampm "<U0025><U0049><U003A><U0025> date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/ <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/ <U0025><U005A><U0020><U0025><U0059>" +first_weekday 2 +first_workday 2 END LC_TIME LC_PAPER -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
