Hello community, here is the log from the commit of package glibc for openSUSE:12.1:Update:Test checked in at 2011-12-05 15:33:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/glibc (Old) and /work/SRC/openSUSE:12.1:Update:Test/.glibc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "glibc", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/glibc/glibc.changes 2011-12-05 15:33:49.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.glibc.new/glibc.changes 2011-12-05 15:33:49.000000000 +0100 @@ -1,0 +2,53 @@ +Tue Nov 29 11:13:47 UTC 2011 - [email protected] + +- Do not install INSTALL file. + +------------------------------------------------------------------- +Tue Nov 29 03:09:56 UTC 2011 - [email protected] + +- fix printf with many args and printf arg specifiers (bnc#733140) + +------------------------------------------------------------------- +Thu Nov 24 14:02:55 UTC 2011 - [email protected] + +- Updated glibc-ports-2.14.1.tar.bz2 from ftp.gnu.org. + +------------------------------------------------------------------- +Thu Nov 24 09:25:14 UTC 2011 - [email protected] + +- Create glibc-devel-static baselibs (bnc#732349). + +------------------------------------------------------------------- +Thu Nov 17 10:27:31 UTC 2011 - [email protected] + +- Remove duplicated locales from glibc-2.3.locales.diff.bz2 + +------------------------------------------------------------------- +Mon Nov 14 12:02:06 CET 2011 - [email protected] + +- check-build.sh: accept kernel 3.x + +------------------------------------------------------------------- +Tue Nov 8 22:55:40 CET 2011 - [email protected] + +- make glibc-static provide versioned + +------------------------------------------------------------------- +Tue Nov 8 18:20:39 CET 2011 - [email protected] + +- fix building with ports again: + * ifuncs tracing backport requires adjustments + +- avoid using asynchronous-unwind-tables only during configure, + but still built the library with unwind tables enabled +- replace arm build hack with a proper solution + +------------------------------------------------------------------ +Mon Nov 7 21:06:32 CET 2011 - [email protected] + +- update glibc-ports to 2.14.1: + * Align the constant pool in start.S to 4 bytes. + * sysdeps/unix/sysv/linux/arm/eabi/internal_sendmmsg.S: New. +- Fix unwinding crash when using clone() + +------------------------------------------------------------------- @@ -69 +121,0 @@ -- add armv8l architecture @@ -70,0 +123 @@ +- armv8l architecture does not exist Old: ---- glibc-ports-2.14.tar.bz2 New: ---- glibc-2.14-32args-printf.patch glibc-arm-clone-unwind-fix.diff glibc-ports-2.14.1.tar.bz2 glibc-ports-2.15-ifunc-trace.patch nscd-avoid-gcc-warning.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glibc.spec ++++++ --- /var/tmp/diff_new_pack.Ae1xxj/_old 2011-12-05 15:34:01.000000000 +0100 +++ /var/tmp/diff_new_pack.Ae1xxj/_new 2011-12-05 15:34:01.000000000 +0100 @@ -80,10 +80,12 @@ Version: 2.14.1 Release: 12 %define git_id 4f2b767fef50 +%define glibc_ports_ver %version Url: http://www.gnu.org/software/libc/libc.html BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: glibc-%{version}-%{git_id}.tar.bz2 -Source2: http://ftp.gnu.org/gnu/glibc/glibc-ports-2.14.tar.bz2 +%define glibc_ports_dir glibc-ports-%{glibc_ports_ver} +Source2: http://ftp.gnu.org/gnu/glibc/glibc-ports-%{glibc_ports_ver}.tar.bz2 Source3: noversion.tar.bz2 Source4: manpages.tar.bz2 Source8: nsswitch.conf @@ -209,12 +211,20 @@ Patch74: glibc-2.14-fix-ctors.patch # PATCH-FIX-UPSTREAM Fix trace and ifuncs [email protected] Patch75: glibc-2.15-ifunc-trace.patch +# PATCH-FIX-UPSTREAM Fix trace and ifuncs (talk to [email protected]) +Patch76: glibc-ports-2.15-ifunc-trace.patch # PATCH-FEATURE-OPENSUSE -- add sha support to crypt_blowfish [email protected] Patch80: crypt_blowfish-1.2-sha.diff # PATCH-FEATURE-OPENSUSE -- use separate symbol version for Owl extensions - [email protected] Patch81: crypt_blowfish-1.2-versioning.diff # PATCH-FIX-OPENSUSE Avoid build failure on noexecstack marker on ARM [email protected] Patch82: crypt_blowfish-1.2-hack_around_arm.diff +# PATCH-FIX-UPSTREAM fix unwinding when using clone() +Patch83: glibc-arm-clone-unwind-fix.diff +# PATCH-FIX-OPENSUSE avoid false positive warning that triggers brp postcheck fail +Patch84: nscd-avoid-gcc-warning.diff +# PATCH-FIX-OPENSUSE fix printf with > 32 args and printf specifiers bnc#733140, bso#13446 +Patch85: glibc-2.14-32args-printf.patch %description The GNU C Library provides the most important standard libraries used @@ -327,12 +337,11 @@ library. %package devel-static - Summary: C library static libraries for -static linking Group: Development/Libraries/C and C++ Requires: %{name}-devel = %{version} # Provide Fedora name for package to make packaging easier -Provides: %{name}-static +Provides: %{name}-static = %version %description devel-static The glibc-devel-static package contains the C library static libraries @@ -376,7 +385,10 @@ %ifarch %arm # add glibc-ports for arm %setup -n glibc-%{version} -q -a 2 -a 3 -a 4 -mv glibc-ports-* ports +pushd %glibc_ports_dir +%patch76 -p1 +%patch83 -p1 +popd %else # any other leave out ports %setup -n glibc-%{version} -q -a 3 -a 4 @@ -386,9 +398,7 @@ pushd crypt_blowfish-%{crypt_bf_version} %patch80 -p1 %patch81 -p1 -%ifarch %arm %patch82 -%endif popd mv crypt/{crypt.h,gnu-crypt.h} mv crypt_blowfish-%crypt_bf_version/*.[chS] crypt/ @@ -454,6 +464,8 @@ %patch73 -p1 %patch74 -p1 %patch75 -p1 +%patch84 +%patch85 # # Inconsistency detected by ld.so: dl-close.c: 719: _dl_close: Assertion `map->l_init_called' failed! @@ -546,14 +558,11 @@ %ifarch %ix86 add_ons=$add_ons,noversion %endif -%ifarch %arm - add_ons=$add_ons,ports +%ifarch %arm mipsel + add_ons=$add_ons,%glibc_ports_dir # fails to build otherwise - need to recheck and fix %define enable_stackguard_randomization 0 %endif -%ifarch mipsel - add_ons=$add_ons,ports -%endif configure_and_build_glibc() { local dirname="$1"; shift @@ -561,7 +570,15 @@ local addons="$1"; shift mkdir "cc-$dirname" cd "cc-$dirname" - CFLAGS="$cflags" CC="$BuildCC" CXX="$BuildCCplus" ../configure \ +%ifarch %arm + # remove asynchronous-unwind-tables during configure as it causes + # some checks to fail spuriously on %arm + conf_cflags="${cflags/-fasynchronous-unwind-tables/}" + conf_cflags="${conf_cflags/-funwind-tables/}" +%else + conf_cflags="$cflags" +%endif + CFLAGS="$conf_cflags" CC="$BuildCC" CXX="$BuildCCplus" ../configure \ --prefix=%{_prefix} \ --libexecdir=%{_libdir} --infodir=%{_infodir} \ --enable-add-ons=nptl$addons --without-cvs --enable-profile \ @@ -582,7 +599,8 @@ --with-tls --with-__thread --enable-kernel=%{enablekernel} \ --enable-bind-now # Should we enable --enable-nss-crypt to build use freebl3 hash functions? - make $PARALLEL + # explicitly set CFLAGS to use the full CFLAGS (not the reduced one for configure) + make $PARALLEL CFLAGS="$cflags" cd .. } @@ -935,7 +953,7 @@ %ifarch x86_64 /%{_lib}/ld-linux-x86-64.so.2 %else - %ifarch %arm armv5tel armv7l armv8l + %ifarch %arm /%{_lib}/ld-linux.so.3 %else /%{_lib}/ld-linux.so.2 @@ -1048,7 +1066,7 @@ %files devel %defattr(-,root,root) -%doc COPYING COPYING.LIB FAQ INSTALL NEWS NOTES README BUGS CONFORMANCE +%doc COPYING COPYING.LIB FAQ NEWS NOTES README BUGS CONFORMANCE %doc %{_mandir}/man1/catchsegv.1.gz %doc %{_mandir}/man1/rpcgen.1.gz %doc %{_mandir}/man1/sprof.1.gz ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.Ae1xxj/_old 2011-12-05 15:34:01.000000000 +0100 +++ /var/tmp/diff_new_pack.Ae1xxj/_new 2011-12-05 15:34:01.000000000 +0100 @@ -13,6 +13,8 @@ glibc-devel arch i586 block! +^/usr/include/gnu/stubs-.*\.h$ +glibc-devel-static + arch i586 block! glibc-profile arch i586 block! glibc-utils ++++++ check-build.sh ++++++ --- /var/tmp/diff_new_pack.Ae1xxj/_old 2011-12-05 15:34:01.000000000 +0100 +++ /var/tmp/diff_new_pack.Ae1xxj/_new 2011-12-05 15:34:01.000000000 +0100 @@ -13,7 +13,10 @@ # 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 16 ; then + +if test ${version[0]} -gt 2 ; then + : # okay +elif test ${version[0]} -lt 2 -o ${version[1]} -lt 6 -o ${version[2]} -lt 16 ; then echo "FATAL: kernel too old, need kernel >= 2.6.16 for this package" 1>&2 exit 1 fi ++++++ crypt_blowfish-1.2-hack_around_arm.diff ++++++ --- /var/tmp/diff_new_pack.Ae1xxj/_old 2011-12-05 15:34:01.000000000 +0100 +++ /var/tmp/diff_new_pack.Ae1xxj/_new 2011-12-05 15:34:01.000000000 +0100 @@ -1,13 +1,9 @@ --- x86.S +++ x86.S -@@ -196,8 +196,8 @@ - hlt - jmp BF_die +@@ -199,5 +199,5 @@ + #endif --#endif -- #if defined(__ELF__) && defined(__linux__) - .section .note.GNU-stack,"",@progbits +-.section .note.GNU-stack,"",@progbits ++.section .note.GNU-stack,"",%progbits #endif -+ -+#endif ++++++ glibc-2.14-32args-printf.patch ++++++ # patch to fix printf when register_printf_function is in use and the format to # printf contains more than 64 elements. # # extend_alloca modifies nspecs_max (2nd arg) with the size of the space, not the # number of elements. Use a temporary to store the return value. Explicitly set the correct size. # # bnc#733140 # # Rich Coe ([email protected]) # --- stdio-common/vfprintf.c.orig 2011-11-28 11:53:32.937976831 -0600 +++ stdio-common/vfprintf.c 2011-11-28 16:07:35.546839533 -0600 @@ -1683,8 +1683,10 @@ do_positional: { /* Extend the array of format specifiers. */ struct printf_spec *old = specs; - specs = extend_alloca (specs, nspecs_max, + size_t nsize = nspecs_max; + specs = extend_alloca (specs, nsize, 2 * nspecs_max * sizeof (*specs)); + nspecs_max = 2 * nspecs_max; /* Copy the old array's elements to the new space. */ memmove (specs, old, nspecs * sizeof (struct printf_spec)); ++++++ glibc-2.3.locales.diff.bz2 ++++++ --- /var/tmp/diff_new_pack.Ae1xxj/_old 2011-12-05 15:34:01.000000000 +0100 +++ /var/tmp/diff_new_pack.Ae1xxj/_new 2011-12-05 15:34:01.000000000 +0100 @@ -2,45 +2,20 @@ =================================================================== --- localedata/SUPPORTED.orig +++ localedata/SUPPORTED -@@ -416,3 +416,38 @@ zh_TW.UTF-8/UTF-8 \ +@@ -430,3 +430,13 @@ zh_TW.UTF-8/UTF-8 \ zh_TW/BIG5 \ zu_ZA.UTF-8/UTF-8 \ zu_ZA/ISO-8859-1 \ -+aa_ER.UTF-8/UTF-8 \ -+aa_ET.UTF-8/UTF-8 \ -+am_ET.UTF-8/UTF-8 \ -+ar_IN.UTF-8/UTF-8 \ -+bn_BD.UTF-8/UTF-8 \ -+bn_IN.UTF-8/UTF-8 \ -+byn_ER.UTF-8/UTF-8 \ +en_BE.UTF-8/UTF-8 \ +en_BE/ISO-8859-1 \ +en_BE@euro/ISO-8859-15 \ +en_GB.ISO-8859-15/ISO-8859-15 \ +en_US.ISO-8859-15/ISO-8859-15 \ -+en_IN.UTF-8/UTF-8 \ -+fa_IR.UTF-8/UTF-8 \ -+hi_IN.UTF-8/UTF-8 \ +ja_JP.SJIS/SHIFT_JIS \ +ja_JP.SHIFT_JISX0213/SHIFT_JISX0213 \ -+ml_IN.UTF-8/UTF-8 \ -+mn_MN.UTF-8/UTF-8 \ -+mr_IN.UTF-8/UTF-8 \ -+ne_NP.UTF-8/UTF-8 \ -+om_ET.UTF-8/UTF-8 \ -+pa_IN.UTF-8/UTF-8 \ -+se_NO.UTF-8/UTF-8 \ +sh_YU.UTF-8/UTF-8 \ +sh_YU/ISO-8859-2 \ -+sid_ET.UTF-8/UTF-8 \ -+so_ET.UTF-8/UTF-8 \ -+sv_SE.ISO-8859-15/ISO-8859-15 \ -+ta_IN.UTF-8/UTF-8 \ -+te_IN.UTF-8/UTF-8 \ -+ti_ER.UTF-8/UTF-8 \ -+ti_ET.UTF-8/UTF-8 \ -+tig_ER.UTF-8/UTF-8 \ -+ur_PK.UTF-8/UTF-8 \ ++ Index: localedata/locales/LC_COLLATE.ISO14651 =================================================================== --- /dev/null ++++++ glibc-arm-clone-unwind-fix.diff ++++++ --- ports/sysdeps/unix/sysv/linux/arm/clone.S +++ ports/sysdeps/unix/sysv/linux/arm/clone.S @@ -81,8 +81,11 @@ RETINSTR(, lr) cfi_startproc - cfi_undefined (lr) +PSEUDO_END (__clone) + 1: + .fnstart + .cantunwind #ifdef RESET_PID tst ip, #CLONE_THREAD bne 3f @@ -116,6 +119,6 @@ @ and we are done, passing the return value through r0 b PLTJMP(HIDDEN_JUMPTARGET(_exit)) -PSEUDO_END (__clone) + .fnend weak_alias (__clone, clone) ++++++ glibc-ports-2.14.tar.bz2 -> glibc-ports-2.14.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glibc-ports-2.14/ChangeLog.arm new/glibc-ports-2.14.1/ChangeLog.arm --- old/glibc-ports-2.14/ChangeLog.arm 2011-05-31 13:25:32.000000000 +0200 +++ new/glibc-ports-2.14.1/ChangeLog.arm 2011-09-06 16:10:43.000000000 +0200 @@ -1,3 +1,11 @@ +2011-06-30 Richard Sandiford <[email protected]> + + * sysdeps/arm/elf/start.S (_start): Align the constant pool to 4 bytes. + +2010-06-20 Joseph Myers <[email protected]> + + * sysdeps/unix/sysv/linux/arm/eabi/internal_sendmmsg.S: New. + 2011-05-07 Konstantinos Margaritis <[email protected]> * sysdeps/arm/preconfigure: Detect arm-linux-gnueabi* as ARM EABI. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glibc-ports-2.14/ChangeLog.mips new/glibc-ports-2.14.1/ChangeLog.mips --- old/glibc-ports-2.14/ChangeLog.mips 2011-05-31 13:25:32.000000000 +0200 +++ new/glibc-ports-2.14.1/ChangeLog.mips 2011-09-06 16:10:43.000000000 +0200 @@ -1,3 +1,21 @@ +2011-09-06 Joseph Myers <[email protected]> + + [BZ #13109] + * sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list (fstatfs) + (statfs): New. + * sysdeps/unix/sysv/linux/mips/mips64/n64/fstatfs64.c, + sysdeps/unix/sysv/linux/mips/mips64/n64/statfs64.c: New. + +2011-06-20 Joseph Myers <[email protected]> + + * sysdeps/unix/sysv/linux/mips/mips32/sendmmsg.c, + sysdeps/unix/sysv/linux/mips/mips32/internal_sendmmsg.S: New. + +2011-06-20 Joseph Myers <[email protected]> + + * sysdeps/unix/sysv/linux/mips/bits/siginfo.h (SI_USER): Don't + mention raise in the comment. + 2011-05-23 Aurelien Jarno <[email protected]> * sysdeps/unix/sysv/linux/mips/bits/resource.h (RLIMIT_RTTIME): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glibc-ports-2.14/sysdeps/arm/elf/start.S new/glibc-ports-2.14.1/sysdeps/arm/elf/start.S --- old/glibc-ports-2.14/sysdeps/arm/elf/start.S 2011-05-31 13:25:32.000000000 +0200 +++ new/glibc-ports-2.14.1/sysdeps/arm/elf/start.S 2011-09-06 16:10:43.000000000 +0200 @@ -134,6 +134,7 @@ bl abort #ifdef SHARED + .align 2 .L_GOT: .word _GLOBAL_OFFSET_TABLE_ - .L_GOT .word __libc_csu_fini(GOT) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glibc-ports-2.14/sysdeps/unix/sysv/linux/arm/eabi/internal_sendmmsg.S new/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/arm/eabi/internal_sendmmsg.S --- old/glibc-ports-2.14/sysdeps/unix/sysv/linux/arm/eabi/internal_sendmmsg.S 1970-01-01 01:00:00.000000000 +0100 +++ new/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/arm/eabi/internal_sendmmsg.S 2011-09-06 16:10:43.000000000 +0200 @@ -0,0 +1,6 @@ +/* Tag_ABI_align8_preserved: This code preserves 8-byte + alignment in any callee. */ + .eabi_attribute 25, 1 +/* Tag_ABI_align8_needed: This code may require 8-byte alignment from + the caller. */ + .eabi_attribute 24, 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glibc-ports-2.14/sysdeps/unix/sysv/linux/mips/bits/siginfo.h new/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/mips/bits/siginfo.h --- old/glibc-ports-2.14/sysdeps/unix/sysv/linux/mips/bits/siginfo.h 2011-05-31 13:25:32.000000000 +0200 +++ new/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/mips/bits/siginfo.h 2011-09-06 16:10:43.000000000 +0200 @@ -1,5 +1,5 @@ /* siginfo_t, sigevent and constants. Linux/MIPS version. - Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 + Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2011 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -146,7 +146,7 @@ # define SI_ASYNCIO SI_ASYNCIO SI_QUEUE, /* Sent by sigqueue. */ # define SI_QUEUE SI_QUEUE - SI_USER, /* Sent by kill, sigsend, raise. */ + SI_USER, /* Sent by kill, sigsend. */ # define SI_USER SI_USER SI_KERNEL = 0x80 /* Send by kernel. */ #define SI_KERNEL SI_KERNEL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glibc-ports-2.14/sysdeps/unix/sysv/linux/mips/bits/socket.h new/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/mips/bits/socket.h --- old/glibc-ports-2.14/sysdeps/unix/sysv/linux/mips/bits/socket.h 2011-05-31 13:25:32.000000000 +0200 +++ new/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/mips/bits/socket.h 2011-09-06 16:10:43.000000000 +0200 @@ -415,7 +415,7 @@ __BEGIN_DECLS -/* Receive a message as described by MESSAGE from socket FD. +/* Receive up to VLEN messages as described by VMESSAGES from socket FD. Returns the number of bytes read or -1 for errors. This function is a cancellation point and therefore not marked with @@ -424,6 +424,13 @@ unsigned int __vlen, int __flags, __const struct timespec *__tmo); +/* Send a VLEN messages as described by VMESSAGES to socket FD. + Return the number of datagrams successfully written or -1 for errors. +This function is a cancellation point and therefore not marked with + __THROW. */ +extern int sendmmsg (int __fd, struct mmsghdr *__vmessages, + unsigned int __vlen, int __flags); + __END_DECLS #endif /* bits/socket.h */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glibc-ports-2.14/sysdeps/unix/sysv/linux/mips/mips32/internal_sendmmsg.S new/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/mips/mips32/internal_sendmmsg.S --- old/glibc-ports-2.14/sysdeps/unix/sysv/linux/mips/mips32/internal_sendmmsg.S 1970-01-01 01:00:00.000000000 +0100 +++ new/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/mips/mips32/internal_sendmmsg.S 2011-09-06 16:10:43.000000000 +0200 @@ -0,0 +1,2 @@ +/* MIPS does not have socket.S and the socketcall syscall should + generally be avoided, though it exists. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glibc-ports-2.14/sysdeps/unix/sysv/linux/mips/mips32/sendmmsg.c new/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/mips/mips32/sendmmsg.c --- old/glibc-ports-2.14/sysdeps/unix/sysv/linux/mips/mips32/sendmmsg.c 1970-01-01 01:00:00.000000000 +0100 +++ new/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/mips/mips32/sendmmsg.c 2011-09-06 16:10:43.000000000 +0200 @@ -0,0 +1,31 @@ +/* Copyright (C) 2011 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, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +/* Avoid sendmmsg.c trying to use a definition based on the socketcall + syscall and internal_sendmmsg.S. */ + +#include <errno.h> +#include <sys/socket.h> + +#include <sysdep-cancel.h> +#include <sys/syscall.h> +#include <kernel-features.h> + +#undef __NR_socketcall + +#include <sysdeps/unix/sysv/linux/sendmmsg.c> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glibc-ports-2.14/sysdeps/unix/sysv/linux/mips/mips64/n64/fstatfs64.c new/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/mips/mips64/n64/fstatfs64.c --- old/glibc-ports-2.14/sysdeps/unix/sysv/linux/mips/mips64/n64/fstatfs64.c 1970-01-01 01:00:00.000000000 +0100 +++ new/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/mips/mips64/n64/fstatfs64.c 2011-09-06 16:10:43.000000000 +0200 @@ -0,0 +1 @@ +/* Empty. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glibc-ports-2.14/sysdeps/unix/sysv/linux/mips/mips64/n64/statfs64.c new/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/mips/mips64/n64/statfs64.c --- old/glibc-ports-2.14/sysdeps/unix/sysv/linux/mips/mips64/n64/statfs64.c 1970-01-01 01:00:00.000000000 +0100 +++ new/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/mips/mips64/n64/statfs64.c 2011-09-06 16:10:43.000000000 +0200 @@ -0,0 +1 @@ +/* Empty. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glibc-ports-2.14/sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list new/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list --- old/glibc-ports-2.14/sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list 2011-05-31 13:25:32.000000000 +0200 +++ new/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list 2011-09-06 16:10:43.000000000 +0200 @@ -5,3 +5,6 @@ prlimit EXTRA prlimit64 i:iipp prlimit prlimit64 fanotify_mark EXTRA fanotify_mark i:iiiis fanotify_mark + +fstatfs - fstatfs i:ip __fstatfs fstatfs fstatfs64 __fstatfs64 +statfs - statfs i:sp __statfs statfs statfs64 __statfs64 ++++++ glibc-ports-2.15-ifunc-trace.patch ++++++ commit 0507f293c9b67d8eec92e8178308d72f1ed88449 Author: Andreas Schwab <[email protected]> Date: Wed Oct 5 11:51:41 2011 +0200 arm: don't call ifunc functions in trace mode --- a/sysdeps/arm/dl-machine.h +++ b/sysdeps/arm/dl-machine.h @@ -335,7 +335,7 @@ auto inline void __attribute__ ((always_inline)) elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc, const Elf32_Sym *sym, const struct r_found_version *version, - void *const reloc_addr_arg) + void *const reloc_addr_arg, int skip_ifunc) { Elf32_Addr *const reloc_addr = reloc_addr_arg; const unsigned int r_type = ELF32_R_TYPE (reloc->r_info); @@ -369,9 +369,9 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc, Elf32_Addr value = sym_map == NULL ? 0 : sym_map->l_addr + sym->st_value; if (sym != NULL - && __builtin_expect (ELFW(ST_TYPE) (sym->st_info) == STT_GNU_IFUNC, - 0) - && __builtin_expect (sym->st_shndx != SHN_UNDEF, 1)) + && __builtin_expect (ELFW(ST_TYPE) (sym->st_info) == STT_GNU_IFUNC, 0) + && __builtin_expect (sym->st_shndx != SHN_UNDEF, 1) + && __builtin_expect (!skip_ifunc, 1)) value = ((Elf32_Addr (*) (void)) value) (); switch (r_type) @@ -430,7 +430,7 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc, } case R_ARM_TLS_DESC: { - struct tlsdesc volatile *td = + struct tlsdesc volatile *td = (struct tlsdesc volatile *)reloc_addr; # ifndef RTLD_BOOTSTRAP @@ -454,10 +454,10 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc, else # endif # endif - { + { td->argument.value = value + sym_map->l_tls_offset; td->entry = _dl_tlsdesc_return; - } + } } } break; @@ -525,7 +525,7 @@ auto inline void __attribute__ ((always_inline)) elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc, const Elf32_Sym *sym, const struct r_found_version *version, - void *const reloc_addr_arg) + void *const reloc_addr_arg, int skip_ifunc) { Elf32_Addr *const reloc_addr = reloc_addr_arg; const unsigned int r_type = ELF32_R_TYPE (reloc->r_info); @@ -543,9 +543,9 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc, Elf32_Addr value = sym_map == NULL ? 0 : sym_map->l_addr + sym->st_value; if (sym != NULL - && __builtin_expect (ELFW(ST_TYPE) (sym->st_info) == STT_GNU_IFUNC, - 0) - && __builtin_expect (sym->st_shndx != SHN_UNDEF, 1)) + && __builtin_expect (ELFW(ST_TYPE) (sym->st_info) == STT_GNU_IFUNC, 0) + && __builtin_expect (sym->st_shndx != SHN_UNDEF, 1) + && __builtin_expect (!skip_ifunc, 1)) value = ((Elf32_Addr (*) (void)) value) (); switch (r_type) @@ -656,7 +656,8 @@ elf_machine_rela_relative (Elf32_Addr l_addr, const Elf32_Rela *reloc, auto inline void __attribute__ ((always_inline)) elf_machine_lazy_rel (struct link_map *map, - Elf32_Addr l_addr, const Elf32_Rel *reloc) + Elf32_Addr l_addr, const Elf32_Rel *reloc, + int skip_ifunc) { Elf32_Addr *const reloc_addr = (void *) (l_addr + reloc->r_offset); const unsigned int r_type = ELF32_R_TYPE (reloc->r_info); @@ -674,8 +675,8 @@ elf_machine_lazy_rel (struct link_map *map, (struct tlsdesc volatile *)reloc_addr; /* The linker must have given us the parameter we need in the - first GOT entry, and left the second one empty. We fill the - last with the resolver address */ + first GOT entry, and left the second one empty. We fill the + last with the resolver address */ assert (td->entry == 0); td->entry = (void*)(D_PTR (map, l_info[ADDRIDX (DT_TLSDESC_PLT)]) + map->l_addr); ++++++ nscd-avoid-gcc-warning.diff ++++++ --- nscd/connections.c +++ nscd/connections.c @@ -1717,6 +1717,8 @@ ++nready; } /* NOTREACHED */ + assert(0); + return 0; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
