This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, fedora/master, updated. glibc-2.14-1010-g190f6f9
- From: schwab at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 20 Jul 2011 12:00:14 -0000
- Subject: GNU C Library master sources branch, fedora/master, updated. glibc-2.14-1010-g190f6f9
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, fedora/master has been updated
via 190f6f99320583eaee781b58581ee39c97dccb8c (commit)
via 88a091601fc72234541d55c90d21818369e3e273 (commit)
via 5c02cca5e80e9cfe32ec763ffe93a8b9a6cf7bcf (commit)
via 9387ce77a098162d249d9aba21e7d0e1e456de7b (commit)
via 5551a7b6aa00e6bc2bf6a0daa98a01e7fd725ba9 (commit)
via 51846a515abd3f99662b67af71f5da770a64556e (commit)
via 19df733e643ea2a0ea95385957163d0e3d5b2d1c (commit)
via c8835729b8a4a862e70213e00b0751e1b19d3f9d (commit)
via 8991e135f7cc0f9e9c11860e570516f5d5b581dc (commit)
via b902330ca8abb08c2114aa9636c77ac0553257f9 (commit)
via 80029994814f0718aef9568c90f04b3d9a31802c (commit)
via 99710781cc47002612e609c7dc5f34692b64e9b3 (commit)
via 7dc6bd90c569c49807462b0740b18e32fab4d8b7 (commit)
via e0e722848005e335132015a64a09cad7f7a12073 (commit)
via feb1eb0be78b40d53c71474f07d1b0517ba95586 (commit)
via e1143c3d33c16b36da00252c934c51a917b6e4a3 (commit)
via 4b6eda27644d3e3684c32d912f07112f99315a90 (commit)
via 69dead0ade19aafad10c256dd603026fc2f3141f (commit)
via f3e4a3468f699d217c4034169c7f8c28fa73f312 (commit)
via 298711ffe475d2401e8037fd89538228e35ee79a (commit)
via f9d683894df1de8d72280771993affef5f77c6e2 (commit)
via db290cf59207aff09d1794e666e2854a93775f32 (commit)
via fd5e21c75d8e9221d766f4bc922a237265514ec2 (commit)
via 5c55070081c27168d27145afdf6a92cd56c9abb3 (commit)
via a6928d5102a89f152fe9d17abb26346dc8cefc9c (commit)
via 661607b3dd9f0b10667d4040843c1a3dc40f0cc9 (commit)
via 4b3d3e282a1c8a755bf5e02dd451158bdabbfcd8 (commit)
via 9fa2c03227e159050e9dc4ec1e315e5909901580 (commit)
from 0e6b1e60e40fb230df4198f502ddfc069d06092f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=190f6f99320583eaee781b58581ee39c97dccb8c
commit 190f6f99320583eaee781b58581ee39c97dccb8c
Author: Andreas Schwab <schwab@redhat.com>
Date: Wed Jul 20 11:56:39 2011 +0200
2.14.90-3
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index f94273b..bdfc2b7 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -24,7 +24,7 @@
Summary: The GNU libc libraries
Name: glibc
Version: %{glibcversion}
-Release: 2
+Release: 3
# GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
# Things that are linked directly into dynamically linked programs
# and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -1075,6 +1075,15 @@ rm -f *.filelist*
%endif
%changelog
+* Wed Jul 20 2011 Andreas Schwab <schwab@redhat.com> - 2.14.90-3
+- Update from master
+ - S/390: Don't use r11 in INTERNAL_VSYSCALL_NCS macro
+ - Avoid warning in nscd config file parsing code
+ - Improve 64 bit strcat functions with SSE2/SSSE3
+ - Fix alloca accounting in strxfrm
+ - Avoid possible crashes in anormal nscd exits
+ - Updated Swedish and Dutch translations
+
* Thu Jul 14 2011 Andreas Schwab <schwab@redhat.com> - 2.14.90-2
- Update from master
- Generalize framework to register monitoring of files in nscd
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=88a091601fc72234541d55c90d21818369e3e273
commit 88a091601fc72234541d55c90d21818369e3e273
Author: Andreas Schwab <schwab@linux-m68k.org>
Date: Sat Jul 9 20:09:23 2011 +0200
Fix missing include
diff --git a/ChangeLog b/ChangeLog
index 5970c88..ec41e0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-09 Andreas Schwab <schwab@linux-m68k.org>
+
+ * sysdeps/unix/sysv/linux/pathconf.c: Include <string.h>.
+
2011-07-04 Aurelien Jarno <aurelien@aurel32.net>
* sysdeps/powerpc/dl-tls.h: Add _PPC_DL_TLS_H inclusion
diff --git a/sysdeps/unix/sysv/linux/pathconf.c b/sysdeps/unix/sysv/linux/pathconf.c
index 1859314..191ed7b 100644
--- a/sysdeps/unix/sysv/linux/pathconf.c
+++ b/sysdeps/unix/sysv/linux/pathconf.c
@@ -20,6 +20,7 @@
#include <errno.h>
#include <mntent.h>
#include <stdio_ext.h>
+#include <string.h>
#include <unistd.h>
#include <sys/sysmacros.h>
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=5c02cca5e80e9cfe32ec763ffe93a8b9a6cf7bcf
commit 5c02cca5e80e9cfe32ec763ffe93a8b9a6cf7bcf
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Mon Jul 4 01:45:03 2011 +0200
Fix duplicate definition of Elf64_FuncDesc
diff --git a/ChangeLog b/ChangeLog
index 2e67d7c..5970c88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-07-04 Aurelien Jarno <aurelien@aurel32.net>
+
+ * sysdeps/powerpc/dl-tls.h: Add _PPC_DL_TLS_H inclusion
+ protection macro.
+ * sysdeps/powerpc/powerpc64/dl-irel.h: Include <ldsodefs.h>
+ and <dl-machine.h>.
+ (Elf64_FuncDesc): Remove.
+
2011-07-13 Andreas Krebbel <Andreas.Krebbel@de.ibm.com>
* sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
diff --git a/sysdeps/powerpc/dl-tls.h b/sysdeps/powerpc/dl-tls.h
index 9ab81f9..5fd1b23 100644
--- a/sysdeps/powerpc/dl-tls.h
+++ b/sysdeps/powerpc/dl-tls.h
@@ -17,6 +17,8 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
+#ifndef _PPC_DL_TLS_H
+# define _PPC_DL_TLS_H 1
/* Type used for the representation of TLS information in the TOC. */
typedef struct
@@ -50,3 +52,5 @@ extern void *__tls_get_addr (tls_index *ti);
/* Value used for dtv entries for which the allocation is delayed. */
#define TLS_DTV_UNALLOCATED ((void *) -1l)
+
+#endif /* dl-tls.h */
diff --git a/sysdeps/powerpc/powerpc64/dl-irel.h b/sysdeps/powerpc/powerpc64/dl-irel.h
index 3c2668f..56e1cc5 100644
--- a/sysdeps/powerpc/powerpc64/dl-irel.h
+++ b/sysdeps/powerpc/powerpc64/dl-irel.h
@@ -23,16 +23,11 @@
#include <stdio.h>
#include <unistd.h>
+#include <ldsodefs.h>
+#include <dl-machine.h>
#define ELF_MACHINE_IRELA 1
-typedef struct
-{
- Elf64_Addr fd_func;
- Elf64_Addr fd_toc;
- Elf64_Addr fd_aux;
-} Elf64_FuncDesc;
-
static inline Elf64_Addr
__attribute ((always_inline))
elf_ifunc_invoke (Elf64_Addr addr)
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=9387ce77a098162d249d9aba21e7d0e1e456de7b
commit 9387ce77a098162d249d9aba21e7d0e1e456de7b
Merge: e1143c3 5551a7b
Author: Andreas Schwab <schwab@redhat.com>
Date: Wed Jul 20 10:20:56 2011 +0200
Merge remote-tracking branch 'origin/master' into fedora/master
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=e1143c3d33c16b36da00252c934c51a917b6e4a3
commit e1143c3d33c16b36da00252c934c51a917b6e4a3
Author: Andreas Schwab <schwab@redhat.com>
Date: Fri Jul 15 09:01:41 2011 +0200
Revert "Revert "Fix a braino in new relro configure test.""
This reverts commit 96ac5e3457809c1531fa74ea1065f974896f5b5f.
diff --git a/ChangeLog b/ChangeLog
index a241bf1..8d27682 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-11 Roland McGrath <roland@hack.frob.com>
+
+ * configure.in (-z relro check): Fix test code to make the variable
+ truly const.
+ * configure: Regenerated.
+
2011-07-11 Ulrich Drepper <drepper@gmail.com>
* nscd/nscd.h (struct traced_file): Define.
diff --git a/configure b/configure
index 3281b3f..6d0578b 100755
--- a/configure
+++ b/configure
@@ -6451,7 +6451,7 @@ else
int _start (void) { return 42; }
extern void _exit (int);
-const void *relro[] = { &_start, &_exit, 0 };
+const void *const relro[] = { &_start, &_exit, 0 };
_ACEOF
cat > conftest.awk <<\EOF
diff --git a/configure.in b/configure.in
index 308cbca..1fa029c 100644
--- a/configure.in
+++ b/configure.in
@@ -1630,7 +1630,7 @@ EOF
AC_LANG_CONFTEST([AC_LANG_SOURCE([[
int _start (void) { return 42; }
extern void _exit (int);
-const void *relro[] = { &_start, &_exit, 0 };
+const void *const relro[] = { &_start, &_exit, 0 };
]])])
cat > conftest.awk <<\EOF
BEGIN {
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=4b6eda27644d3e3684c32d912f07112f99315a90
commit 4b6eda27644d3e3684c32d912f07112f99315a90
Author: Andreas Schwab <schwab@redhat.com>
Date: Fri Jul 15 09:01:27 2011 +0200
Revert "Revert "Rewrite -z relro configure check to be empirical.""
This reverts commit 49a673166cd275df8c572715e973c587228f5d57.
diff --git a/ChangeLog b/ChangeLog
index dd25c42..a241bf1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -58,6 +58,10 @@
Use an empirical test on a built program.
* configure: Regenerated.
+ * configure.in (-z relro check): Use an empirical test on a built DSO.
+ Detect, but do not require, on ia64.
+ * configure: Regenerated.
+
* configure.in (READELF): Find it with AC_CHECK_TOOL.
Update tests that use readelf to use $READELF instead.
* configure: Regenerated.
diff --git a/configure b/configure
index 2700e94..3281b3f 100755
--- a/configure
+++ b/configure
@@ -6418,40 +6418,97 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_z_initfirst" >&5
$as_echo "$libc_cv_z_initfirst" >&6; }
+ # Add-on fragments can set these for other machines.
+ libc_commonpagesize=${libc_commonpagesize:-no}
+ libc_relro_required=${libc_relro_required:-no}
case "$base_machine" in
- i[34567]86 | x86_64 | powerpc* | s390* | sparc* | alpha*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -z relro option" >&5
+ i[34567]86 | x86_64 | powerpc* | s390*)
+ libc_commonpagesize=0x1000
+ libc_relro_required=yes
+ ;;
+ sparc*)
+ libc_commonpagesize=0x2000
+ libc_relro_required=yes
+ ;;
+ ia64*)
+ libc_commonpagesize=0x4000
+ ;;
+ alpha*)
+ libc_commonpagesize=0x10000
+ libc_relro_required=yes
+ ;;
+ esac
+
+ if test $libc_commonpagesize != no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -z relro option" >&5
$as_echo_n "checking for -z relro option... " >&6; }
if ${libc_cv_z_relro+:} false; then :
$as_echo_n "(cached) " >&6
else
- libc_cv_z_relro=no
- if { ac_try='${CC-cc} -v --help 2>&1|grep "z relro" 1>&5'
+ libc_cv_z_relro=no
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int _start (void) { return 42; }
+extern void _exit (int);
+const void *relro[] = { &_start, &_exit, 0 };
+
+_ACEOF
+ cat > conftest.awk <<\EOF
+BEGIN {
+ result = "no"
+ commonpagesize = strtonum(commonpagesize)
+}
+{ print "LINE:", $0 > "/dev/stderr" }
+$1 == "GNU_RELRO" {
+ vaddr = strtonum($3)
+ memsz = strtonum($6)
+ end = vaddr + memsz
+ printf "vaddr %#x memsz %#x end %#x commonpagesize %#x\n", \
+ vaddr, memsz, end, commonpagesize > "/dev/stderr"
+ result = (end % commonpagesize == 0) ? "yes" : "broken"
+}
+END { print result }
+EOF
+ { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
+ -fPIC -shared -o conftest.so conftest.c
+ -nostartfiles -nostdlib
+ -Wl,-z,relro 1>&5'
{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
(eval $ac_try) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; }
- then
- if { ac_try='${CC-cc} -Wl,--verbose 2>&1|grep DATA_SEGMENT_RELRO_END 1>&5'
+ test $ac_status = 0; }; } &&
+ { ac_try='$READELF -Wl conftest.so > conftest.ph'
{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
(eval $ac_try) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; }
- then
- libc_cv_z_relro=yes
- fi
- fi
+ test $ac_status = 0; }; } &&
+ { ac_try='
+ $AWK -v commonpagesize=$libc_commonpagesize -f conftest.awk
+ conftest.ph > conftest.cps
+ '
+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; } &&
+ libc_cv_z_relro=`cat conftest.cps 2>&5`
+ rm -f conftest*
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_z_relro" >&5
$as_echo "$libc_cv_z_relro" >&6; }
- if test "$libc_cv_z_relro" = no; then
- as_fn_error $? "linker with -z relro support required" "$LINENO" 5
- fi
- ;;
- *) ;;
- esac
+ if { test "x$libc_relro_required" = xyes &&
+ test "x$libc_cv_z_relro" != xyes
+ }
+ then
+ as_fn_error $? "linker with -z relro support required" "$LINENO" 5
+ fi
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: missing architecture parameter to check for working -z relro" >&5
+$as_echo "$as_me: WARNING: missing architecture parameter to check for working -z relro" >&2;}
+ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Bgroup option" >&5
$as_echo_n "checking for -Bgroup option... " >&6; }
diff --git a/configure.in b/configure.in
index be882bf..308cbca 100644
--- a/configure.in
+++ b/configure.in
@@ -1602,26 +1602,72 @@ EOF
fi
rm -f conftest*])
+ # Add-on fragments can set these for other machines.
+ libc_commonpagesize=${libc_commonpagesize:-no}
+ libc_relro_required=${libc_relro_required:-no}
case "$base_machine" in
-changequote(,)dnl
- i[34567]86 | x86_64 | powerpc* | s390* | sparc* | alpha*)
-changequote([,])dnl
- AC_CACHE_CHECK(for -z relro option,
- libc_cv_z_relro, [dnl
- libc_cv_z_relro=no
- if AC_TRY_COMMAND([${CC-cc} -v --help 2>&1|grep "z relro" 1>&AS_MESSAGE_LOG_FD])
- then
- if AC_TRY_COMMAND([${CC-cc} -Wl,--verbose 2>&1|grep DATA_SEGMENT_RELRO_END 1>&AS_MESSAGE_LOG_FD])
+ i[[34567]]86 | x86_64 | powerpc* | s390*)
+ libc_commonpagesize=0x1000
+ libc_relro_required=yes
+ ;;
+ sparc*)
+ libc_commonpagesize=0x2000
+ libc_relro_required=yes
+ ;;
+ ia64*)
+ libc_commonpagesize=0x4000
+ ;;
+ alpha*)
+ libc_commonpagesize=0x10000
+ libc_relro_required=yes
+ ;;
+ esac
+
+ if test $libc_commonpagesize != no; then
+ AC_CACHE_CHECK(for -z relro option,
+ libc_cv_z_relro, [dnl
+ libc_cv_z_relro=no
+ AC_LANG_CONFTEST([AC_LANG_SOURCE([[
+int _start (void) { return 42; }
+extern void _exit (int);
+const void *relro[] = { &_start, &_exit, 0 };
+]])])
+ cat > conftest.awk <<\EOF
+BEGIN {
+ result = "no"
+ commonpagesize = strtonum(commonpagesize)
+}
+{ print "LINE:", $0 > "/dev/stderr" }
+$1 == "GNU_RELRO" {
+ vaddr = strtonum($3)
+ memsz = strtonum($6)
+ end = vaddr + memsz
+ printf "vaddr %#x memsz %#x end %#x commonpagesize %#x\n", \
+ vaddr, memsz, end, commonpagesize > "/dev/stderr"
+ result = (end % commonpagesize == 0) ? "yes" : "broken"
+}
+END { print result }
+EOF
+ AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
+ -fPIC -shared -o conftest.so conftest.c
+ -nostartfiles -nostdlib
+ -Wl,-z,relro 1>&AS_MESSAGE_LOG_FD]) &&
+ AC_TRY_COMMAND([$READELF -Wl conftest.so > conftest.ph]) &&
+ AC_TRY_COMMAND([
+ $AWK -v commonpagesize=$libc_commonpagesize -f conftest.awk
+ conftest.ph > conftest.cps
+ ]) &&
+ libc_cv_z_relro=`cat conftest.cps 2>&AS_MESSAGE_LOG_FD`
+ rm -f conftest*])
+ if { test "x$libc_relro_required" = xyes &&
+ test "x$libc_cv_z_relro" != xyes
+ }
then
- libc_cv_z_relro=yes
+ AC_MSG_ERROR(linker with -z relro support required)
fi
- fi])
- if test "$libc_cv_z_relro" = no; then
- AC_MSG_ERROR(linker with -z relro support required)
- fi
- ;;
- *) ;;
- esac
+ else
+ AC_MSG_WARN([missing architecture parameter to check for working -z relro])
+ fi
AC_CACHE_CHECK(for -Bgroup option,
libc_cv_Bgroup, [dnl
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=69dead0ade19aafad10c256dd603026fc2f3141f
commit 69dead0ade19aafad10c256dd603026fc2f3141f
Author: Andreas Schwab <schwab@redhat.com>
Date: Fri Jul 15 15:27:15 2011 +0200
Use eabi for arm
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 919b9ae..f94273b 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -61,6 +61,9 @@ BuildRequires: gcc >= 3.2
%define enablekernel 2.6.32
Conflicts: kernel < %{enablekernel}
%define target %{_target_cpu}-redhat-linux
+%ifarch %{arm}
+%define target %{_target_cpu}-redhat-linuxeabi
+%endif
%ifarch %{multiarcharches}
# Need STT_IFUNC support
%ifarch ppc ppc64
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f3e4a3468f699d217c4034169c7f8c28fa73f312
commit f3e4a3468f699d217c4034169c7f8c28fa73f312
Author: Andreas Schwab <schwab@redhat.com>
Date: Fri Jul 15 13:41:31 2011 +0200
Specfile cleanup
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index e16e3ba..919b9ae 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -60,11 +60,7 @@ BuildRequires: systemtap-sdt-devel
BuildRequires: gcc >= 3.2
%define enablekernel 2.6.32
Conflicts: kernel < %{enablekernel}
-%ifarch i386
-%define nptl_target_cpu i486
-%else
-%define nptl_target_cpu %{_target_cpu}
-%endif
+%define target %{_target_cpu}-redhat-linux
%ifarch %{multiarcharches}
# Need STT_IFUNC support
%ifarch ppc ppc64
@@ -281,7 +277,7 @@ touch locale/programs/*-kw.h
GCC=gcc
GXX=g++
%ifarch %{ix86}
-BuildFlags="-march=%{nptl_target_cpu} -mtune=generic"
+BuildFlags="-march=%{_target_cpu} -mtune=generic"
%endif
%ifarch i686
BuildFlags="-march=i686 -mtune=generic"
@@ -341,10 +337,10 @@ AddOns=`echo */configure | sed -e 's!/configure!!g;s!\(linuxthreads\|nptl\|rtkai
AddOns=,rtkaio$AddOns
%endif
-build_nptl()
+build()
{
-builddir=build-%{nptl_target_cpu}-$1
-shift
+builddir=build-%{target}${1:+-$1}
+${1+shift}
rm -rf $builddir
mkdir $builddir ; cd $builddir
build_CFLAGS="$BuildFlags -g -O3 $*"
@@ -355,8 +351,7 @@ configure_CFLAGS="$build_CFLAGS -fno-asynchronous-unwind-tables"
--prefix=%{_prefix} \
--enable-add-ons=../%{glibcportsdir},nptl$AddOns \
--with-headers=%{_prefix}/include $EnableKernel --enable-bind-now \
- --with-tls --with-__thread --build %{nptl_target_cpu}-redhat-linux \
- --host %{nptl_target_cpu}-redhat-linux \
+ --with-tls --with-__thread --build=%{target} \
%ifarch %{multiarcharches}
--enable-multi-arch \
%endif
@@ -371,10 +366,10 @@ make %{?_smp_mflags} -r CFLAGS="$build_CFLAGS" %{silentrules}
cd ..
}
-build_nptl linuxnptl
+build
%if %{buildxen}
-build_nptl linuxnptl-nosegneg -mno-tls-direct-seg-refs
+build nosegneg -mno-tls-direct-seg-refs
%endif
%if %{buildpower6}
@@ -394,11 +389,11 @@ fi
AddOns="$AddOns --with-cpu=power6"
GCC="$GCC -mcpu=power6"
GXX="$GXX -mcpu=power6"
-build_nptl linuxnptl-power6
+build power6
)
%endif
-cd build-%{nptl_target_cpu}-linuxnptl
+cd build-%{target}
$GCC -static -L. -Os -g ../fedora/glibc_post_upgrade.c -o glibc_post_upgrade.%{_target_cpu} \
'-DLIBTLS="/%{_lib}/tls/"' \
'-DGCONV_MODULES_DIR="%{_prefix}/%{_lib}/gconv"' \
@@ -411,9 +406,9 @@ GCC=`cat Gcc`
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT
-make -j1 install_root=$RPM_BUILD_ROOT install -C build-%{nptl_target_cpu}-linuxnptl %{silentrules}
+make -j1 install_root=$RPM_BUILD_ROOT install -C build-%{target} %{silentrules}
%ifnarch %{auxarches}
-cd build-%{nptl_target_cpu}-linuxnptl && \
+cd build-%{target} && \
make %{?_smp_mflags} install_root=$RPM_BUILD_ROOT install-locales -C ../localedata objdir=`pwd` && \
cd ..
%endif
@@ -434,7 +429,7 @@ ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/rtkaio/librtkaio-*.so` $RPM_BUILD_ROOT/
%define nosegneg_subdir_base i686
%define nosegneg_subdir i686/nosegneg
%define nosegneg_subdir_up ../..
-cd build-%{nptl_target_cpu}-linuxnptl-nosegneg
+cd build-%{target}-nosegneg
destdir=$RPM_BUILD_ROOT/%{_lib}/%{nosegneg_subdir}
mkdir -p $destdir
for lib in libc math/libm nptl/libpthread rt/librt nptl_db/libthread_db
@@ -442,7 +437,7 @@ do
libbase=${lib#*/}
libbaseso=$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}-*.so)
# Only install if different from base lib
- if cmp -s ${lib}.so ../build-%{nptl_target_cpu}-linuxnptl/${lib}.so; then
+ if cmp -s ${lib}.so ../build-%{target}/${lib}.so; then
ln -sf %{nosegneg_subdir_up}/$libbaseso $destdir/$libbaseso
else
cp -a ${lib}.so $destdir/$libbaseso
@@ -453,7 +448,7 @@ done
destdir=$RPM_BUILD_ROOT/%{_lib}/rtkaio/%{nosegneg_subdir}
mkdir -p $destdir
librtkaioso=$(basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so | sed s/librt-/librtkaio-/)
-if cmp -s rtkaio/librtkaio.so ../build-%{nptl_target_cpu}-linuxnptl/rtkaio/librtkaio.so; then
+if cmp -s rtkaio/librtkaio.so ../build-%{target}/rtkaio/librtkaio.so; then
ln -s %{nosegneg_subdir_up}/$librtkaioso $destdir/$librtkaioso
else
cp -a rtkaio/librtkaio.so $destdir/$librtkaioso
@@ -464,7 +459,7 @@ cd ..
%endif
%if %{buildpower6}
-cd build-%{nptl_target_cpu}-linuxnptl-power6
+cd build-%{target}-power6
destdir=$RPM_BUILD_ROOT/%{_lib}/power6
mkdir -p ${destdir}
for lib in libc math/libm nptl/libpthread rt/librt nptl_db/libthread_db
@@ -546,7 +541,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
chmod 644 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/gconv/gconv-modules.cache
# Install the upgrade program
-install -m 700 build-%{nptl_target_cpu}-linuxnptl/glibc_post_upgrade.%{_target_cpu} \
+install -m 700 build-%{target}/glibc_post_upgrade.%{_target_cpu} \
$RPM_BUILD_ROOT/usr/sbin/glibc_post_upgrade.%{_target_cpu}
strip -g $RPM_BUILD_ROOT%{_prefix}/%{_lib}/*.o
@@ -568,9 +563,9 @@ pushd ${RPM_BUILD_ROOT}%{_prefix}/lib/locale
rm locale-archive || :
# Intentionally we do not pass --alias-file=, aliases will be added
# by build-locale-archive.
-$olddir/build-%{nptl_target_cpu}-linuxnptl/elf/ld.so \
- --library-path $olddir/build-%{nptl_target_cpu}-linuxnptl/ \
- $olddir/build-%{nptl_target_cpu}-linuxnptl/locale/localedef \
+$olddir/build-%{target}/elf/ld.so \
+ --library-path $olddir/build-%{target}/ \
+ $olddir/build-%{target}/locale/localedef \
--prefix ${RPM_BUILD_ROOT} --add-to-archive \
*_*
rm -rf *_*
@@ -698,15 +693,15 @@ touch -r sunrpc/etc.rpc $RPM_BUILD_ROOT/etc/rpc
cd fedora
$GCC -Os -g -o build-locale-archive build-locale-archive.c \
- ../build-%{nptl_target_cpu}-linuxnptl/locale/locarchive.o \
- ../build-%{nptl_target_cpu}-linuxnptl/locale/md5.o \
+ ../build-%{target}/locale/locarchive.o \
+ ../build-%{target}/locale/md5.o \
-DDATADIR=\"%{_datadir}\" -DPREFIX=\"%{_prefix}\" \
- -L../build-%{nptl_target_cpu}-linuxnptl \
- -B../build-%{nptl_target_cpu}-linuxnptl/csu/ -lc -lc_nonshared
+ -L../build-%{target} \
+ -B../build-%{target}/csu/ -lc -lc_nonshared
install -m 700 build-locale-archive $RPM_BUILD_ROOT/usr/sbin/build-locale-archive
$GCC -Os -g -o tzdata-update tzdata-update.c \
- -L../build-%{nptl_target_cpu}-linuxnptl \
- -B../build-%{nptl_target_cpu}-linuxnptl/csu/ -lc -lc_nonshared
+ -L../build-%{target} \
+ -B../build-%{target}/csu/ -lc -lc_nonshared
install -m 700 tzdata-update $RPM_BUILD_ROOT/usr/sbin/tzdata-update
cd ..
@@ -738,7 +733,7 @@ ln -sf /%{_lib}/ld-linux-ia64.so.2 $RPM_BUILD_ROOT/lib/ld-linux-ia64.so.2
export TIMEOUTFACTOR=16
parent=$$
echo ====================TESTING=========================
-cd build-%{nptl_target_cpu}-linuxnptl
+cd build-%{target}
( make %{?_smp_mflags} -k check %{silentrules} 2>&1
sleep 10s
teepid="`ps -eo ppid,pid,command | awk '($1 == '${parent}' && $3 ~ /^tee/) { print $2 }'`"
@@ -747,7 +742,7 @@ cd build-%{nptl_target_cpu}-linuxnptl
cd ..
%if %{buildxen}
echo ====================TESTING -mno-tls-direct-seg-refs=============
-cd build-%{nptl_target_cpu}-linuxnptl-nosegneg
+cd build-%{target}-nosegneg
( make %{?_smp_mflags} -k check %{silentrules} 2>&1
sleep 10s
teepid="`ps -eo ppid,pid,command | awk '($1 == '${parent}' && $3 ~ /^tee/) { print $2 }'`"
@@ -757,7 +752,7 @@ cd ..
%endif
%if %{buildpower6}
echo ====================TESTING -mcpu=power6=============
-cd build-%{nptl_target_cpu}-linuxnptl-power6
+cd build-%{target}-power6
( if [ -d ../power6emul ]; then
export LD_PRELOAD=`cd ../power6emul; pwd`/\$LIB/power6emul.so
fi
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 141 ++
Makefile | 2 +-
Makerules | 4 +
NEWS | 5 +-
bits/sched.h | 4 +-
config.make.in | 1 +
configure | 186 ++-
configure.in | 156 ++-
crypt/md5.c | 14 +-
crypt/md5.h | 10 +-
crypt/sha256.c | 10 +-
crypt/sha256.h | 7 +-
crypt/sha512.c | 8 +-
crypt/sha512.h | 6 +-
elf/Makefile | 4 +-
elf/cache.c | 1 -
elf/dl-close.c | 2 +-
elf/dl-fini.c | 5 +-
fedora/glibc.spec.in | 75 +-
manual/intro.texi | 9 +-
nptl/ChangeLog | 5 +
nptl/allocatestack.c | 2 +-
nscd/nscd.c | 2 +-
nscd/nscd_conf.c | 32 +-
po/nl.po | 1664 ++++++++++++---------
po/sv.po | 1664 ++++++++++++---------
string/strncat.c | 6 +-
string/strxfrm_l.c | 5 +-
sysdeps/generic/ldsodefs.h | 6 +-
sysdeps/i386/Makefile | 5 +-
sysdeps/i386/i686/multiarch/strstr-c.c | 2 +
sysdeps/powerpc/dl-tls.h | 4 +
sysdeps/powerpc/powerpc64/dl-irel.h | 9 +-
sysdeps/unix/sysv/linux/bits/sched.h | 2 +-
sysdeps/unix/sysv/linux/pathconf.c | 1 +
sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h | 8 +-
sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h | 8 +-
sysdeps/x86_64/multiarch/Makefile | 6 +-
sysdeps/x86_64/multiarch/init-arch.c | 10 +-
sysdeps/x86_64/multiarch/init-arch.h | 2 +
sysdeps/x86_64/multiarch/strcat-sse2-unaligned.S | 54 +
sysdeps/x86_64/multiarch/strcat-ssse3.S | 558 +++++++
sysdeps/x86_64/multiarch/strcat.S | 85 ++
sysdeps/x86_64/multiarch/strcpy-sse2-unaligned.S | 450 ++++--
sysdeps/x86_64/multiarch/strcpy-ssse3.S | 280 ++--
sysdeps/x86_64/multiarch/strlen-no-bsf.S | 74 +-
sysdeps/x86_64/multiarch/strlen-sse2-pminub.S | 260 ++++
sysdeps/x86_64/multiarch/strlen.S | 5 +-
sysdeps/x86_64/multiarch/strncat-c.c | 8 +
sysdeps/x86_64/multiarch/strncat-sse2-unaligned.S | 3 +
sysdeps/x86_64/multiarch/strncat-ssse3.S | 3 +
sysdeps/x86_64/multiarch/strncat.S | 3 +
52 files changed, 4033 insertions(+), 1843 deletions(-)
create mode 100644 sysdeps/x86_64/multiarch/strcat-sse2-unaligned.S
create mode 100644 sysdeps/x86_64/multiarch/strcat-ssse3.S
create mode 100644 sysdeps/x86_64/multiarch/strcat.S
create mode 100644 sysdeps/x86_64/multiarch/strlen-sse2-pminub.S
create mode 100644 sysdeps/x86_64/multiarch/strncat-c.c
create mode 100644 sysdeps/x86_64/multiarch/strncat-sse2-unaligned.S
create mode 100644 sysdeps/x86_64/multiarch/strncat-ssse3.S
create mode 100644 sysdeps/x86_64/multiarch/strncat.S
hooks/post-receive
--
GNU C Library master sources