Hello community, here is the log from the commit of package glibc for openSUSE:Factory checked in at Tue May 31 12:41:05 CEST 2011.
-------- --- glibc/glibc.changes 2011-05-23 10:53:40.000000000 +0200 +++ /mounts/work_src_done/STABLE/glibc/glibc.changes 2011-05-27 17:32:39.000000000 +0200 @@ -1,0 +2,43 @@ +Fri May 27 11:55:35 UTC 2011 - [email protected] + +- Remove patches that are not needed anymore: + * glibc-selinux.diff + * glibc-check-native-missing-include.diff + * glibc-2.3.3-execstack.diff +- Disable the following patches, they look obsolete by now but leave them + in to easy enable them again: + * glibc-2.3-SuSE.diff + * glibc-2.3-regcomp.diff + * glibc-2.8-clone.diff + * glibc-2.3.2-revert_tcsetattr.diff +- Do not package glibc-obsolete with empty directory on archs that + don't need it. + +------------------------------------------------------------------- +Thu May 26 07:53:51 UTC 2011 - [email protected] + +- Add glibc-static-memcpy.diff to fix static compiles. + +------------------------------------------------------------------- +Wed May 25 15:28:37 UTC 2011 - [email protected] + +- Run on kernel 2.6.32 or older only - and optimize thus. +- Enable malloc implementation that is be less memory efficient + but higher performing in multi-threaded programs. +- Use --enable-bind-now to avoid lazy binding in ld.so + and libc.so + +------------------------------------------------------------------- +Wed May 25 14:38:58 UTC 2011 - [email protected] + +- Add glibc-bso-12454.diff to not create assert running dynamic linker + in some cases. +- Disable backwards memcpy for x86-64. + +------------------------------------------------------------------- +Wed May 25 07:59:27 UTC 2011 - [email protected] + +- Add glibc-dl-signal-error.diff to not crash the dynamic linker + if dependencies are missing. + +------------------------------------------------------------------- @@ -5,0 +49,7 @@ + +------------------------------------------------------------------- +Fri May 20 14:45:44 UTC 2011 - [email protected] + +- Fix obsoletes and provides. +- Update to glibc 2.13 +- Drop ld-prelink-unique.diff, it is part of 2.13. calling whatdependson for head-i586 Old: ---- ctype_b.c glibc-2.11.3-b72646ad0c41.tar.bz2 glibc-2.3.3-execstack.diff glibc-check-native-missing-include.diff glibc-ports-2.10.1-2b2b217196.tar.bz2 glibc-selinux.diff ld-prelink-unique.diff minmem New: ---- glibc-2.13-996cf2ef0727.tar.bz2 glibc-bso-12454.diff glibc-disable-backward-memcpy.diff glibc-ports-2.13.tar.bz2 glibc-static-memcpy.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glibc.spec ++++++ --- /var/tmp/diff_new_pack.hr1lhf/_old 2011-05-31 12:38:43.000000000 +0200 +++ /var/tmp/diff_new_pack.hr1lhf/_new 2011-05-31 12:38:43.000000000 +0200 @@ -52,8 +52,11 @@ License: GPLv2+ Summary: Standard Shared Libraries (from the GNU C Library) Group: System/Libraries -Obsoletes: ngpt <= 2.2.2 ngpt-devel <= 2.2.2 -Provides: ntpt = 2.2.2 ngpt-devel = 2.2.2 +%define enablekernel 2.6.32 +Conflicts: kernel < %{enablekernel} +%define exp_malloc 1 +Obsoletes: ngpt < 2.2.2 ngpt-devel < 2.2.2 +Provides: ngpt = 2.2.2 ngpt-devel = 2.2.2 # bug437293 %ifarch ppc64 Obsoletes: glibc-64bit @@ -63,20 +66,19 @@ %endif Provides: rtld(GNU_HASH) AutoReqProv: on -Version: 2.11.3 -Release: 15 +Version: 2.13 +Release: 1 Url: http://www.gnu.org/software/libc/libc.html PreReq: filesystem BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: glibc-%{version}-b72646ad0c41.tar.bz2 -Source2: glibc-ports-2.10.1-2b2b217196.tar.bz2 +Source: glibc-%{version}-996cf2ef0727.tar.bz2 +Source2: http://ftp.gnu.org/gnu/glibc/glibc-ports-2.13.tar.bz2 Source3: noversion.tar.bz2 Source4: manpages.tar.bz2 Source5: usr.sbin.nscd Source8: nsswitch.conf Source9: nscd.init Source10: bindresvport.blacklist -Source11: ctype_b.c Source12: glibc_post_upgrade.c Source15: glibc.rpmlintrc Source16: baselibs.conf @@ -104,7 +106,6 @@ Patch16: glibc-2.4.90-no_NO.diff Patch17: glibc-2.3.90-ld.so-madvise.diff Patch18: glibc-2.3.3-amd64-s_ceil.diff -Patch19: glibc-2.3.3-execstack.diff Patch20: glibc-2.4-china.diff Patch21: glibc-2.3.4-gb18030-big5hkscs.diff.bz2 Patch22: glibc-2.4.90-nscd.diff @@ -119,8 +120,6 @@ Patch31: ppc-atomic.diff Patch32: glibc-2.8-clone.diff Patch33: glibc-compiled-binaries.diff -Patch34: glibc-selinux.diff -Patch35: glibc-check-native-missing-include.diff Patch36: glibc-no-unwind-tables.diff Patch37: glibc-2.10-nscd-nostack.diff Patch38: glibc-cpusetsize.diff @@ -128,7 +127,6 @@ Patch40: libm-x86-64-exceptions.diff Patch41: glibc-uio-cell.diff Patch42: glibc-statfs64-ia64.diff -Patch43: ld-prelink-unique.diff Patch44: glibc-ppc64-vdso-time.diff Patch45: glibc-gai-private4.diff Patch46: glibc-resolv-mdnshint.diff @@ -139,6 +137,9 @@ Patch51: glibc-vfprintf-positional.diff Patch52: glibc-elf-localscope.diff Patch53: glibc-zarch-longlong.diff +Patch54: glibc-disable-backward-memcpy.diff +Patch55: glibc-bso-12454.diff +Patch56: glibc-static-memcpy.diff Patch500: ARM_glibc-2.10.1-local-eabi-wchar.diff Patch501: ARM_glibc-2.10.1-local-hwcap-updates.diff Patch502: ARM_glibc-2.10.1-local-lowlevellock.diff @@ -251,7 +252,7 @@ Summary: Include Files and Libraries Mandatory for Development Group: Development/Libraries/C and C++ Obsoletes: epoll = 1.0 -Provides: epoll <= 1.0 +Provides: epoll < 1.0 # bug437293 %ifarch ppc64 Obsoletes: glibc-devel-64bit @@ -269,6 +270,8 @@ +%ifarch %ix86 + %package obsolete License: BSD3c(or similar) ; GPLv2+ ; LGPLv2.1+ Summary: Obsolete Shared Libraries from the GNU C Library @@ -286,7 +289,7 @@ is no gurantee that they work for you, you should try to get newer versions of your software. - +%endif %prep %ifarch %arm armv5tel armv7l @@ -298,7 +301,8 @@ # any other leave out ports %setup -n glibc-%{version} -q -a 3 -a 4 %endif -%patch0 +# Seems not needed anymore +#%patch0 # libNoVersion part is only active on ix86 %patch1 %patch2 -p1 @@ -307,8 +311,10 @@ %patch5 %patch7 %patch8 -%patch9 -%patch10 +# Seems not needed anymore +#%patch9 +# Seems not needed anymore +#%patch10 %patch11 %patch12 %patch13 -E @@ -319,7 +325,6 @@ %patch16 %patch17 %patch18 -%patch19 %patch20 %patch21 # avoid changing nscd_stat.c mtime to avoid code generation @@ -337,10 +342,9 @@ %patch29 %patch30 %patch31 -%patch32 +# Seems not needed anymore +#%patch32 %patch33 -%patch34 -%patch35 %patch36 %patch37 %patch38 @@ -348,17 +352,21 @@ %patch40 %patch41 -p1 %patch42 -%patch43 -p1 %patch44 -p1 %patch45 %patch46 -p1 %patch47 -p1 +%if !%{exp_malloc} %patch48 -p1 +%endif %patch49 %patch50 %patch51 -p1 %patch52 %patch53 -p1 +%patch54 -p1 +%patch55 -p1 +%patch56 -p1 %ifarch %arm armv5tel armv7l %patch500 %patch501 @@ -485,7 +493,12 @@ %ifarch ppc ppc64 %{ix86} x86_64 --enable-multi-arch \ %endif - --with-tls --with-__thread --enable-kernel=2.6.4 +%if %{exp_malloc} + --enable-experimental-malloc \ +%endif + --with-tls --with-__thread --enable-kernel=%{enablekernel} \ + --enable-bind-now +# Should we enable --enable-nss-crypt to build use freebl3 hash functions? make $PARALLEL cd .. } @@ -657,7 +670,9 @@ # Prepare obsolete/, used only on some architectures: export RPM_BUILD_ROOT +%ifarch %ix86 mkdir -p $RPM_BUILD_ROOT/%{_lib}/obsolete +%endif # NPTL <bits/stdio-lock.h> is not usable outside of glibc, so include # the generic one (RH#162634) @@ -706,12 +721,12 @@ # cat > $RPM_BUILD_ROOT/etc/ld.so.conf <<EOF %ifarch s390x sparc64 x86_64 ppc64 ppc -/usr/X11R6/lib64/Xaw3d -/usr/X11R6/lib64 +#/usr/X11R6/lib64/Xaw3d +#/usr/X11R6/lib64 /usr/lib64/Xaw3d %endif -/usr/X11R6/lib/Xaw3d -/usr/X11R6/lib +#/usr/X11R6/lib/Xaw3d +#/usr/X11R6/lib /usr/lib/Xaw3d %ifarch %x86 /usr/i586-suse-linux/lib @@ -935,10 +950,11 @@ %{_sbindir}/rpcinfo /usr/sbin/iconvconfig +%ifarch %ix86 + %files obsolete %defattr (755,root,root,755) %dir /%{_lib}/obsolete/ -%ifarch %ix86 %dir /%{_lib}/obsolete/noversion /%{_lib}/obsolete/noversion/libNoVersion-%{version}.so /%{_lib}/obsolete/noversion/libNoVersion.so.1 @@ -954,7 +970,7 @@ %files devel %defattr(-,root,root) -%doc COPYING COPYING.LIB FAQ INSTALL NEWS NOTES README BUGS CONFORMANCE $RPM_SOURCE_DIR/ctype_b.c +%doc COPYING COPYING.LIB FAQ INSTALL NEWS NOTES README BUGS CONFORMANCE %doc %{_mandir}/man1/catchsegv.1.gz %doc %{_mandir}/man1/rpcgen.1.gz %doc %{_mandir}/man1/sprof.1.gz ++++++ check-build.sh ++++++ --- /var/tmp/diff_new_pack.hr1lhf/_old 2011-05-31 12:38:43.000000000 +0200 +++ /var/tmp/diff_new_pack.hr1lhf/_new 2011-05-31 12:38:43.000000000 +0200 @@ -15,8 +15,8 @@ # get kernel version OFS="$IFS" ; IFS=".-" ; version=(`uname -r`) ; IFS="$OIFS" -if test ${version[0]} -lt 2 -o ${version[1]} -lt 6 -o ${version[2]} -lt 11 ; then - echo "FATAL: kernel too old, need kernel >= 2.6.11 for this package" 1>&2 +if test ${version[0]} -lt 2 -o ${version[1]} -lt 6 -o ${version[2]} -lt 32 ; then + echo "FATAL: kernel too old, need kernel >= 2.6.32 for this package" 1>&2 exit 1 fi ++++++ glibc-2.11.3-b72646ad0c41.tar.bz2 -> glibc-2.13-996cf2ef0727.tar.bz2 ++++++ glibc/glibc-2.11.3-b72646ad0c41.tar.bz2 /mounts/work_src_done/STABLE/glibc/glibc-2.13-996cf2ef0727.tar.bz2 differ: char 11, line 1 ++++++ glibc-2.6-configure.diff ++++++ --- /var/tmp/diff_new_pack.hr1lhf/_old 2011-05-31 12:38:43.000000000 +0200 +++ /var/tmp/diff_new_pack.hr1lhf/_new 2011-05-31 12:38:43.000000000 +0200 @@ -1,17 +1,15 @@ -Index: configure.in -=================================================================== ---- configure.in.orig -+++ configure.in -@@ -1395,7 +1395,7 @@ EOF +--- configure.in.orig 2011-05-20 15:36:44.880141789 +0200 ++++ configure.in 2011-05-20 15:39:31.237690293 +0200 +@@ -1406,7 +1406,7 @@ fi fi fi - rm -f conftest.[cs] -+ rm -f conftest* ++ rm -f conftest.* ]) if test $libc_cv_visibility_attribute != yes; then AC_MSG_ERROR(compiler support for visibility attribute is required) -@@ -1411,7 +1411,7 @@ EOF +@@ -1422,7 +1422,7 @@ int bar (int x) { return x; } EOF libc_cv_broken_visibility_attribute=yes @@ -20,25 +18,23 @@ changequote(,)dnl if grep '\.hidden[ _]foo' conftest.s >/dev/null; then changequote([,])dnl -Index: configure -=================================================================== ---- configure.orig -+++ configure -@@ -6272,7 +6272,7 @@ EOF - fi - fi - fi -- rm -f conftest.cs -+ rm -f conftest* - - fi - { $as_echo "$as_me:$LINENO: result: $libc_cv_visibility_attribute" >&5 -@@ -6296,7 +6296,7 @@ else +--- configure.orig 2011-05-20 15:39:38.413972560 +0200 ++++ configure 2011-05-20 15:40:52.292884126 +0200 +@@ -6112,7 +6112,7 @@ int bar (int x) { return x; } EOF libc_cv_broken_visibility_attribute=yes - if { ac_try='${CC-cc} -Werror -S conftest.c -o conftest.s1>&5' -+ if { ac_try='${CC-cc} -Werror -S conftest.c -o conftest.s >&5' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ if { ac_try='${CC-cc} -Werror -S conftest.c -o conftest.s>&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 (eval $ac_try) 2>&5 ac_status=$? +@@ -6753,7 +6753,7 @@ + else + libc_cv_have_section_quotes=unknown + fi +- rm -f conftest.cs ++ rm -f conftest.* + + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_have_section_quotes" >&5 ++++++ glibc-bso-12454.diff ++++++ 2011-03-02 Andreas Schwab <[email protected]> [BZ #12454] * elf/dl-deps.c (_dl_map_object_deps): Don't try to sort dependencies when there are none. --- a/elf/dl-deps.c.orig 2011-05-25 16:42:39.000000000 +0200 +++ a/elf/dl-deps.c 2011-05-25 16:44:07.000000000 +0200 @@ -619,7 +619,8 @@ /* We can skip looking for the binary itself which is at the front of the search list. */ - assert (nlist > 1); + if (nlist > 1) + { i = 1; bool seen[nlist]; memset (seen, false, nlist * sizeof (seen[0])); @@ -669,7 +670,7 @@ next:; } - + } /* Terminate the list of dependencies. */ l_initfini[nlist] = NULL; atomic_write_barrier (); ++++++ glibc-compiled-binaries.diff ++++++ --- /var/tmp/diff_new_pack.hr1lhf/_old 2011-05-31 12:38:43.000000000 +0200 +++ /var/tmp/diff_new_pack.hr1lhf/_new 2011-05-31 12:38:43.000000000 +0200 @@ -19,11 +19,23 @@ force-install = @force_install@ # Build tools. +Index: configure.in +=================================================================== +--- configure.in.orig 2011-05-20 15:39:31.237690293 +0200 ++++ configure.in 2011-05-20 15:43:55.595111363 +0200 +@@ -16,6 +16,7 @@ + AC_CHECK_PROGS(BUILD_CC, gcc cc) + fi + AC_SUBST(cross_compiling) ++AC_SUBST(compiled_binaries_can_run_on_buildhost) + AC_PROG_CPP + # We need the C++ compiler only for testing. + AC_PROG_CXX Index: configure =================================================================== ---- configure.orig -+++ configure -@@ -589,6 +589,7 @@ ac_clean_files= +--- configure.orig 2011-05-20 15:46:40.675628746 +0200 ++++ configure 2011-05-20 15:40:52.292884126 +0200 +@@ -545,6 +545,7 @@ ac_config_libobj_dir=. LIBOBJS= cross_compiling=no @@ -31,7 +43,7 @@ subdirs= MFLAGS= MAKEFLAGS= -@@ -742,6 +743,7 @@ CXXFLAGS +@@ -697,6 +696,7 @@ CXX CPP cross_compiling @@ -39,8 +51,8 @@ BUILD_CC OBJEXT ac_ct_CC -@@ -1294,6 +1296,13 @@ do - { (exit 1); exit 1; }; } +@@ -1244,6 +1242,13 @@ + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done +# Check whether --enable-runbinaries was given. @@ -53,36 +65,24 @@ # There might be people who depend on the old broken behavior: `$host' # used to hold the argument of --host etc. # FIXME: To remove some day. -@@ -1309,6 +1318,7 @@ if test "x$host_alias" != x; then - If a cross compiler is detected then cross compile mode will be used." >&2 +@@ -1266,6 +1257,7 @@ + If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes + compiled_binaries_can_run_on_buildhost=no fi fi -@@ -1501,6 +1511,9 @@ Optional Features: +@@ -1454,6 +1444,9 @@ + --enable-experimental-malloc enable experimental malloc features --enable-nss-crypt enable libcrypt to use nss - + --enable-runbinaries the compiled binaries should run on the buildhost because + it happens to have a compatible cpu + + Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) -Index: configure.in -=================================================================== ---- configure.in.orig -+++ configure.in -@@ -16,6 +16,7 @@ if test $host != $build; then - AC_CHECK_PROGS(BUILD_CC, gcc cc) - fi - AC_SUBST(cross_compiling) -+AC_SUBST(compiled_binaries_can_run_on_buildhost) - AC_PROG_CPP - # We need the C++ compiler only for testing. - AC_PROG_CXX Index: posix/Makefile =================================================================== --- posix/Makefile.orig ++++++ glibc-disable-backward-memcpy.diff ++++++ Index: glibc-2.13/sysdeps/x86_64/multiarch/Makefile =================================================================== --- glibc-2.13.orig/sysdeps/x86_64/multiarch/Makefile +++ glibc-2.13/sysdeps/x86_64/multiarch/Makefile @@ -6,7 +6,7 @@ endif ifeq ($(subdir),string) sysdep_routines += stpncpy-c strncpy-c strcmp-ssse3 strncmp-ssse3 \ strend-sse4 memcmp-sse4 memcpy-ssse3 mempcpy-ssse3 \ - memmove-ssse3 memcpy-ssse3-back mempcpy-ssse3-back \ + memmove-ssse3 mempcpy-ssse3-back \ memmove-ssse3-back strcasestr-nonascii strcasecmp_l-ssse3 \ strncase_l-ssse3 strlen-sse4 strlen-no-bsf \ memset-x86-64 Index: glibc-2.13/sysdeps/x86_64/multiarch/memcpy.S =================================================================== --- glibc-2.13.orig/sysdeps/x86_64/multiarch/memcpy.S +++ glibc-2.13/sysdeps/x86_64/multiarch/memcpy.S @@ -35,9 +35,11 @@ ENTRY(memcpy) testl $bit_SSSE3, __cpu_features+CPUID_OFFSET+index_SSSE3(%rip) jz 2f leaq __memcpy_ssse3(%rip), %rax + /* disable backward memcpy for glibc 2.13 testl $bit_Fast_Copy_Backward, __cpu_features+FEATURE_OFFSET+index_Fast_Copy_Backward(%rip) jz 2f leaq __memcpy_ssse3_back(%rip), %rax + */ 2: ret END(memcpy) Index: glibc-2.13/sysdeps/x86_64/multiarch/memcpy_chk.S =================================================================== --- glibc-2.13.orig/sysdeps/x86_64/multiarch/memcpy_chk.S +++ glibc-2.13/sysdeps/x86_64/multiarch/memcpy_chk.S @@ -36,9 +36,11 @@ ENTRY(__memcpy_chk) testl $bit_SSSE3, __cpu_features+CPUID_OFFSET+index_SSSE3(%rip) jz 2f leaq __memcpy_chk_ssse3(%rip), %rax + /* disable backwards memcpy until glibc 2.14 testl $bit_Fast_Copy_Backward, __cpu_features+FEATURE_OFFSET+index_Fast_Copy_Backward(%rip) jz 2f leaq __memcpy_chk_ssse3_back(%rip), %rax + */ 2: ret END(__memcpy_chk) # else ++++++ glibc-malloc-arena-max.diff ++++++ --- /var/tmp/diff_new_pack.hr1lhf/_old 2011-05-31 12:38:43.000000000 +0200 +++ /var/tmp/diff_new_pack.hr1lhf/_new 2011-05-31 12:38:43.000000000 +0200 @@ -37,11 +37,11 @@ PER_THREAD. * malloc/malloc.c: Remove redundant M_* defines. -diff --git a/malloc/arena.c b/malloc/arena.c -index 4d0deef..ea80724 100644 ---- a/malloc/arena.c -+++ b/malloc/arena.c -@@ -78,8 +78,8 @@ extern int sanity_check_heap_info_alignment[(sizeof (heap_info) +Index: glibc-2.13/malloc/arena.c +=================================================================== +--- glibc-2.13.orig/malloc/arena.c ++++ glibc-2.13/malloc/arena.c +@@ -78,8 +78,8 @@ extern int sanity_check_heap_info_alignm static tsd_key_t arena_key; static mutex_t list_lock; @@ -83,15 +83,16 @@ (void)mutex_unlock(&list_lock); #endif -@@ -982,13 +980,9 @@ get_free_list (void) +@@ -982,13 +980,10 @@ get_free_list (void) return result; } - -static mstate -reused_arena (void) ++static int get_narenas_limit (void) __attribute__((pure)); +static int -+get_narenas_limit (void) __attribute__((pure)) ++get_narenas_limit (void) { - if (narenas <= mp_.arena_test) - return NULL; @@ -99,7 +100,7 @@ static int narenas_limit; if (narenas_limit == 0) { -@@ -1006,10 +1000,16 @@ reused_arena (void) +@@ -1006,10 +1001,16 @@ reused_arena (void) narenas_limit = NARENAS_FROM_NCORES (2); } } @@ -118,7 +119,7 @@ mstate result; static mstate next_to_use; if (next_to_use == NULL) -@@ -1035,7 +1035,6 @@ reused_arena (void) +@@ -1035,7 +1036,6 @@ reused_arena (void) return result; } @@ -126,7 +127,7 @@ static mstate internal_function -@@ -1048,10 +1047,15 @@ arena_get2(a_tsd, size) mstate a_tsd; size_t size; +@@ -1048,10 +1048,15 @@ arena_get2(a_tsd, size) mstate a_tsd; si mstate a; #ifdef PER_THREAD @@ -146,7 +147,7 @@ #else if(!a_tsd) a = a_tsd = &main_arena; -@@ -1093,8 +1097,14 @@ arena_get2(a_tsd, size) mstate a_tsd; size_t size; +@@ -1093,8 +1098,14 @@ arena_get2(a_tsd, size) mstate a_tsd; si goto repeat; } @@ -163,10 +164,10 @@ (void)mutex_unlock(&list_lock); #endif -diff --git a/malloc/hooks.c b/malloc/hooks.c -index 28845ee..e938492 100644 ---- a/malloc/hooks.c -+++ b/malloc/hooks.c +Index: glibc-2.13/malloc/hooks.c +=================================================================== +--- glibc-2.13.orig/malloc/hooks.c ++++ glibc-2.13/malloc/hooks.c @@ -579,9 +579,9 @@ public_gET_STATe(void) ms->max_fast = get_max_fast(); #ifdef PER_THREAD @@ -189,11 +190,11 @@ } check_malloc_state(&main_arena); -diff --git a/malloc/malloc.c b/malloc/malloc.c -index b1d43c6..8dbadfa 100644 ---- a/malloc/malloc.c -+++ b/malloc/malloc.c -@@ -2406,9 +2406,10 @@ struct malloc_par { +Index: glibc-2.13/malloc/malloc.c +=================================================================== +--- glibc-2.13.orig/malloc/malloc.c ++++ glibc-2.13/malloc/malloc.c +@@ -2405,9 +2405,10 @@ struct malloc_par { INTERNAL_SIZE_T top_pad; INTERNAL_SIZE_T mmap_threshold; #ifdef PER_THREAD @@ -205,7 +206,7 @@ /* Memory map support */ int n_mmaps; -@@ -2446,13 +2447,6 @@ static struct malloc_state main_arena; +@@ -2445,13 +2446,6 @@ static struct malloc_state main_arena; static struct malloc_par mp_; @@ -219,7 +220,7 @@ /* Maximum size of memory handled in fastbins. */ static INTERNAL_SIZE_T global_max_fast; -@@ -6095,12 +6089,12 @@ int mALLOPt(param_number, value) int param_number; int value; +@@ -6111,12 +6105,12 @@ int mALLOPt(param_number, value) int par if (value > 0) mp_.arena_test = value; break; ++++++ glibc-ports-2.10.1-2b2b217196.tar.bz2 -> glibc-ports-2.13.tar.bz2 ++++++ ++++ 16746 lines of diff (skipped) ++++++ glibc-static-memcpy.diff ++++++ 2011-02-06 Mike Frysinger <[email protected]> [BZ #12653] * sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S: Only protect MEMCPY_CHK with USE_AS_BCOPY ifdef check. * sysdeps/i386/i686/multiarch/memcpy-ssse3.S: Likewise. * sysdeps/x86_64/multiarch/memcpy-ssse3.S: Likewise. * sysdeps/x86_64/multiarch/memcpy-ssse3-back.S: Likewise. Index: glibc-2.13/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S =================================================================== --- glibc-2.13.orig/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S +++ glibc-2.13/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S @@ -110,7 +110,7 @@ __i686.get_pc_thunk.bx: #endif .section .text.ssse3,"ax",@progbits -#if defined SHARED && !defined NOT_IN_libc && !defined USE_AS_BCOPY +#if !defined USE_AS_BCOPY ENTRY (MEMCPY_CHK) movl 12(%esp), %eax cmpl %eax, 16(%esp) Index: glibc-2.13/sysdeps/i386/i686/multiarch/memcpy-ssse3.S =================================================================== --- glibc-2.13.orig/sysdeps/i386/i686/multiarch/memcpy-ssse3.S +++ glibc-2.13/sysdeps/i386/i686/multiarch/memcpy-ssse3.S @@ -110,7 +110,7 @@ __i686.get_pc_thunk.bx: #endif .section .text.ssse3,"ax",@progbits -#if defined SHARED && !defined NOT_IN_libc && !defined USE_AS_BCOPY +#if !defined USE_AS_BCOPY ENTRY (MEMCPY_CHK) movl 12(%esp), %eax cmpl %eax, 16(%esp) Index: glibc-2.13/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S =================================================================== --- glibc-2.13.orig/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S +++ glibc-2.13/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S @@ -49,7 +49,7 @@ ud2 .section .text.ssse3,"ax",@progbits -#if defined SHARED && !defined NOT_IN_libc +#if !defined USE_AS_BCOPY ENTRY (MEMCPY_CHK) cmpq %rdx, %rcx jb HIDDEN_JUMPTARGET (__chk_fail) Index: glibc-2.13/sysdeps/x86_64/multiarch/memcpy-ssse3.S =================================================================== --- glibc-2.13.orig/sysdeps/x86_64/multiarch/memcpy-ssse3.S +++ glibc-2.13/sysdeps/x86_64/multiarch/memcpy-ssse3.S @@ -49,7 +49,7 @@ ud2 .section .text.ssse3,"ax",@progbits -#if defined SHARED && !defined NOT_IN_libc +#if !defined USE_AS_BCOPY ENTRY (MEMCPY_CHK) cmpq %rdx, %rcx jb HIDDEN_JUMPTARGET (__chk_fail) ++++++ glibc-version.diff ++++++ --- /var/tmp/diff_new_pack.hr1lhf/_old 2011-05-31 12:38:44.000000000 +0200 +++ /var/tmp/diff_new_pack.hr1lhf/_new 2011-05-31 12:38:44.000000000 +0200 @@ -2,19 +2,22 @@ =================================================================== --- csu/version.c.orig +++ csu/version.c -@@ -24,16 +24,20 @@ static const char __libc_release[] = REL +@@ -25,19 +25,23 @@ static const char __libc_release[] = REL static const char __libc_version[] = VERSION; 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) 2009 Free Software Foundation, Inc.\n\ + Copyright (C) 2011 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\ +Configured for "CONFHOST".\n\ Compiled by GNU CC version "__VERSION__".\n" #include "version-info.h" + #ifdef LIBC_ABIS_STRING + LIBC_ABIS_STRING + #endif #ifdef GLIBC_OLDEST_ABI "The oldest ABI supported: " GLIBC_OLDEST_ABI ".\n" #endif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
