[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[commits] r13517 - in /fsf/trunk/libc: ./ nscd/ stdlib/ sunrpc/ sysdeps/i386/i686/multiarch/ sysdeps/ia64/fpu/ sysdeps/powerpc/powerpc...



Author: eglibc
Date: Mon Apr 18 00:03:03 2011
New Revision: 13517

Log:
Import glibc-mainline for 2011-04-18

Added:
    fsf/trunk/libc/stdlib/bug-getcontext.c
Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/NEWS
    fsf/trunk/libc/nscd/selinux.h
    fsf/trunk/libc/stdlib/Makefile
    fsf/trunk/libc/sunrpc/Makefile
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/memcpy-ssse3.S
    fsf/trunk/libc/sysdeps/ia64/fpu/s_erfcl.S
    fsf/trunk/libc/sysdeps/ia64/fpu/s_expm1l.S
    fsf/trunk/libc/sysdeps/powerpc/powerpc32/power4/strncmp.S
    fsf/trunk/libc/sysdeps/powerpc/powerpc32/power7/strncmp.S
    fsf/trunk/libc/sysdeps/powerpc/powerpc64/power4/strncmp.S
    fsf/trunk/libc/sysdeps/powerpc/powerpc64/power7/strncmp.S
    fsf/trunk/libc/sysdeps/s390/s390-32/elf/start.S
    fsf/trunk/libc/sysdeps/s390/s390-64/utf16-utf32-z9.c
    fsf/trunk/libc/sysdeps/s390/s390-64/utf8-utf16-z9.c
    fsf/trunk/libc/sysdeps/s390/s390-64/utf8-utf32-z9.c
    fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/getcontext.S
    fsf/trunk/libc/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S
    fsf/trunk/libc/sysdeps/x86_64/multiarch/memcpy-ssse3.S

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Mon Apr 18 00:03:03 2011
@@ -1,3 +1,45 @@
+2011-04-17  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	* sunrpc/Makefile ($(rpc-compat-routines.os)): Add before-compile to
+	dependencies.
+
+2011-02-06  Mike Frysinger  <vapier@xxxxxxxxxx>
+
+	[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.
+
+2011-03-28  Andreas Schwab  <schwab@xxxxxxxxxxxxxx>
+
+	* sysdeps/powerpc/powerpc32/power4/strncmp.S: Don't read past
+	differing bytes.
+	* sysdeps/powerpc/powerpc64/power4/strncmp.S: Likewise.
+	* sysdeps/powerpc/powerpc32/power7/strncmp.S: Likewise.
+	* sysdeps/powerpc/powerpc64/power7/strncmp.S: Likewise.
+
+2011-04-17  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	[BZ #12420]
+	* sysdeps/unix/sysv/linux/x86_64/getcontext.S: Reload context after
+	storing it.
+	* stdlib/bug-getcontext.c: New file.
+	* stdlib/Makefile: Add rules to build and run bug-getcontext.
+
+2011-04-13  Andreas Krebbel  <Andreas.Krebbel@xxxxxxxxxx>
+
+	* sysdeps/s390/s390-64/utf16-utf32-z9.c: Wrap the z9-109
+	instructions into .machine "z9-109".
+	* sysdeps/s390/s390-64/utf8-utf16-z9.c: Likewise.
+	* sysdeps/s390/s390-64/utf8-utf32-z9.c: Likewise.
+
+2011-04-11  Andreas Krebbel  <Andreas.Krebbel@xxxxxxxxxx>
+
+	* sysdeps/s390/s390-32/elf/start.S (_start): Skip extra zeroes
+	between environment variables and auxiliary vector.
+
 2011-04-16  Ulrich Drepper  <drepper@xxxxxxxxx>
 
 	* Makefile: Add rules to build linkobj/libc.so.

Modified: fsf/trunk/libc/NEWS
==============================================================================
--- fsf/trunk/libc/NEWS (original)
+++ fsf/trunk/libc/NEWS Mon Apr 18 00:03:03 2011
@@ -1,4 +1,4 @@
-GNU C Library NEWS -- history of user-visible changes.  2011-4-16
+GNU C Library NEWS -- history of user-visible changes.  2011-4-17
 Copyright (C) 1992-2009, 2010, 2011 Free Software Foundation, Inc.
 See the end for copying conditions.
 
@@ -18,8 +18,8 @@
 
 * The following bugs are resolved with this release:
 
-  11724, 12445, 12454, 12460, 12469, 12489, 12509, 12510, 12518, 12583, 12587,
-  12597, 12631, 12650, 12655
+  11724, 12420, 12445, 12454, 12460, 12469, 12489, 12509, 12510, 12518, 12583,
+  12587, 12597, 12631, 12650, 12653, 12655
 
 Version 2.13
 

Modified: fsf/trunk/libc/nscd/selinux.h
==============================================================================
--- fsf/trunk/libc/nscd/selinux.h (original)
+++ fsf/trunk/libc/nscd/selinux.h Mon Apr 18 00:03:03 2011
@@ -45,7 +45,7 @@
 extern void nscd_avc_print_stats (struct avc_cache_stats *cstats);
 
 # ifdef HAVE_LIBCAP
-/* Preserve capabilities to connect to connnect to the audit daemon.  */
+/* Preserve capabilities to connect to the audit daemon. */
 extern cap_t preserve_capabilities (void);
 /* Install final capabilities.  */
 extern void install_real_capabilities (cap_t new_caps);

Modified: fsf/trunk/libc/stdlib/Makefile
==============================================================================
--- fsf/trunk/libc/stdlib/Makefile (original)
+++ fsf/trunk/libc/stdlib/Makefile Mon Apr 18 00:03:03 2011
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1991-2009, 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
@@ -71,7 +71,7 @@
 		   tst-atof1 tst-atof2 tst-strtod2 tst-strtod3 tst-rand48-2 \
 		   tst-makecontext tst-strtod4 tst-strtod5 tst-qsort2	    \
 		   tst-makecontext2 tst-strtod6 tst-unsetenv1		    \
-		   tst-makecontext3
+		   tst-makecontext3 bug-getcontext
 
 include ../Makeconfig
 
@@ -145,3 +145,10 @@
 $(objpfx)tst-putenvmod.so: $(objpfx)tst-putenvmod.os
 	$(build-module)
 CFLAGS-tst-putenvmod.c = -DNOT_IN_libc=1
+
+ifeq ($(build-shared),yes)
+link-libm = $(common-objpfx)math/libm.so
+else
+link-libm = $(common-objpfx)math/libm.a
+endif
+$(objpfx)bug-getcontext: $(link-libm)

Added: fsf/trunk/libc/stdlib/bug-getcontext.c
==============================================================================
--- fsf/trunk/libc/stdlib/bug-getcontext.c (added)
+++ fsf/trunk/libc/stdlib/bug-getcontext.c Mon Apr 18 00:03:03 2011
@@ -1,0 +1,48 @@
+/* BZ 12420 */
+
+#include <errno.h>
+#include <fenv.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <ucontext.h>
+
+static int
+do_test (void)
+{
+  int except_mask =  FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW | FE_UNDERFLOW;
+  int status = feenableexcept (except_mask);
+
+  except_mask = fegetexcept ();
+  if (except_mask == -1)
+    {
+      printf("\nBefore getcontext(): fegetexcept returned: %d\n",
+	     except_mask);
+      return 1;
+    }
+
+  ucontext_t ctx;
+  status = getcontext(&ctx);
+  if (status)
+    {
+      printf("\ngetcontext failed, errno: %d.\n", errno);
+      return 1;
+    }
+
+  printf ("\nDone with getcontext()!\n");
+  fflush (NULL);
+
+  int mask = fegetexcept ();
+  if (mask != except_mask)
+    {
+      printf("\nAfter getcontext(): fegetexcept returned: %d, expected: %d.\n",
+	     mask, except_mask);
+      return 1;
+    }
+
+  printf("\nAt end fegetexcept() returned %d, expected: %d.\n",
+	 mask, except_mask);
+  return 0;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"

Modified: fsf/trunk/libc/sunrpc/Makefile
==============================================================================
--- fsf/trunk/libc/sunrpc/Makefile (original)
+++ fsf/trunk/libc/sunrpc/Makefile Mon Apr 18 00:03:03 2011
@@ -123,7 +123,7 @@
 subdir_lib: $(objpfx)librpc_compat_pic.a
 $(objpfx)librpc_compat_pic.a: $(rpc-compat-routines.os)
 	$(AR) cr$(verbose) $@ $^
-$(rpc-compat-routines.os): $(objpfx)compat-%.os: %.c
+$(rpc-compat-routines.os): $(objpfx)compat-%.os: %.c $(before-compile)
 	$(compile-command.c) -DEXPORT_RPC_SYMBOLS
 endif
 

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S Mon Apr 18 00:03:03 2011
@@ -110,7 +110,7 @@
 #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)

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/memcpy-ssse3.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/memcpy-ssse3.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/memcpy-ssse3.S Mon Apr 18 00:03:03 2011
@@ -110,7 +110,7 @@
 #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)

Modified: fsf/trunk/libc/sysdeps/ia64/fpu/s_erfcl.S
==============================================================================
--- fsf/trunk/libc/sysdeps/ia64/fpu/s_erfcl.S (original)
+++ fsf/trunk/libc/sysdeps/ia64/fpu/s_erfcl.S Mon Apr 18 00:03:03 2011
@@ -168,7 +168,7 @@
 // Case exp_small:
 //
 //   Here, exp(X) and exp(X) - 1 can all be 
-//   appproximated by a relatively simple polynomial.
+//   approximated by a relatively simple polynomial.
 //
 //   This polynomial resembles the truncated Taylor series
 //

Modified: fsf/trunk/libc/sysdeps/ia64/fpu/s_expm1l.S
==============================================================================
--- fsf/trunk/libc/sysdeps/ia64/fpu/s_expm1l.S (original)
+++ fsf/trunk/libc/sysdeps/ia64/fpu/s_expm1l.S Mon Apr 18 00:03:03 2011
@@ -139,7 +139,7 @@
 // Case exp_small:
 //
 //   Here, exp(X) and exp(X) - 1 can all be 
-//   appproximated by a relatively simple polynomial.
+//   approximated by a relatively simple polynomial.
 //
 //   This polynomial resembles the truncated Taylor series
 //

Modified: fsf/trunk/libc/sysdeps/powerpc/powerpc32/power4/strncmp.S
==============================================================================
--- fsf/trunk/libc/sysdeps/powerpc/powerpc32/power4/strncmp.S (original)
+++ fsf/trunk/libc/sysdeps/powerpc/powerpc32/power4/strncmp.S Mon Apr 18 00:03:03 2011
@@ -1,5 +1,5 @@
 /* Optimized strcmp implementation for PowerPC32.
-   Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006, 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
@@ -139,30 +139,31 @@
 	bdz	L(u4)
 	cmpw	rWORD1, rWORD2
 	beq-	cr1, L(u4)
+	bne-	L(u4)
 	lbzu    rWORD3, 1(rSTR1)
 	lbzu	rWORD4, 1(rSTR2)
-	bne-	L(u4)
 	cmpwi	cr1, rWORD3, 0
 	bdz	L(u3)
 	cmpw	rWORD3, rWORD4
 	beq-    cr1, L(u3)
+	bne-    L(u3)
 	lbzu	rWORD1, 1(rSTR1)
 	lbzu	rWORD2, 1(rSTR2)
-	bne-    L(u3)
 	cmpwi	cr1, rWORD1, 0
 	bdz	L(u4)
 	cmpw	rWORD1, rWORD2
 	beq-	cr1, L(u4)
+	bne-	L(u4)
 	lbzu	rWORD3, 1(rSTR1)
 	lbzu	rWORD4, 1(rSTR2)
-	bne-	L(u4)
 	cmpwi	cr1, rWORD3, 0
 	bdz	L(u3)
 	cmpw	rWORD3, rWORD4
 	beq-    cr1, L(u3)
+	bne-	L(u3)
 	lbzu	rWORD1, 1(rSTR1)
 	lbzu	rWORD2, 1(rSTR2)
-	beq+    L(u1)
+	b       L(u1)
 
 L(u3):  sub     rRTN, rWORD3, rWORD4
         blr

Modified: fsf/trunk/libc/sysdeps/powerpc/powerpc32/power7/strncmp.S
==============================================================================
--- fsf/trunk/libc/sysdeps/powerpc/powerpc32/power7/strncmp.S (original)
+++ fsf/trunk/libc/sysdeps/powerpc/powerpc32/power7/strncmp.S Mon Apr 18 00:03:03 2011
@@ -1,5 +1,5 @@
 /* Optimized strcmp implementation for POWER7/PowerPC32.
-   Copyright (C) 2010 Free Software Foundation, Inc.
+   Copyright (C) 2010, 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
@@ -141,30 +141,31 @@
 	bdz	L(u4)
 	cmpw	rWORD1,rWORD2
 	beq	cr1,L(u4)
+	bne	L(u4)
 	lbzu	rWORD3,1(rSTR1)
 	lbzu	rWORD4,1(rSTR2)
-	bne	L(u4)
 	cmpwi	cr1,rWORD3,0
 	bdz	L(u3)
 	cmpw	rWORD3,rWORD4
 	beq	cr1,L(u3)
+	bne	L(u3)
 	lbzu	rWORD1,1(rSTR1)
 	lbzu	rWORD2,1(rSTR2)
-	bne	L(u3)
 	cmpwi	cr1,rWORD1,0
 	bdz	L(u4)
 	cmpw	rWORD1,rWORD2
 	beq	cr1,L(u4)
+	bne	L(u4)
 	lbzu	rWORD3,1(rSTR1)
 	lbzu	rWORD4,1(rSTR2)
-	bne	L(u4)
 	cmpwi	cr1,rWORD3,0
 	bdz	L(u3)
 	cmpw	rWORD3,rWORD4
 	beq	cr1,L(u3)
+	bne	L(u3)
 	lbzu	rWORD1,1(rSTR1)
 	lbzu	rWORD2,1(rSTR2)
-	beq	L(u1)
+	b	L(u1)
 
 L(u3):  sub	rRTN,rWORD3,rWORD4
 	blr

Modified: fsf/trunk/libc/sysdeps/powerpc/powerpc64/power4/strncmp.S
==============================================================================
--- fsf/trunk/libc/sysdeps/powerpc/powerpc64/power4/strncmp.S (original)
+++ fsf/trunk/libc/sysdeps/powerpc/powerpc64/power4/strncmp.S Mon Apr 18 00:03:03 2011
@@ -1,5 +1,5 @@
 /* Optimized strcmp implementation for PowerPC64.
-   Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006, 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
@@ -143,30 +143,31 @@
 	bdz	L(u4)
 	cmpd	rWORD1, rWORD2
 	beq-	cr1, L(u4)
+	bne-	L(u4)
 	lbzu    rWORD3, 1(rSTR1)
 	lbzu	rWORD4, 1(rSTR2)
-	bne-	L(u4)
 	cmpdi	cr1, rWORD3, 0
 	bdz	L(u3)
 	cmpd	rWORD3, rWORD4
 	beq-    cr1, L(u3)
+	bne-    L(u3)
 	lbzu	rWORD1, 1(rSTR1)
 	lbzu	rWORD2, 1(rSTR2)
-	bne-    L(u3)
 	cmpdi	cr1, rWORD1, 0
 	bdz	L(u4)
 	cmpd	rWORD1, rWORD2
 	beq-	cr1, L(u4)
+	bne-	L(u4)
 	lbzu	rWORD3, 1(rSTR1)
 	lbzu	rWORD4, 1(rSTR2)
-	bne-	L(u4)
 	cmpdi	cr1, rWORD3, 0
 	bdz	L(u3)
 	cmpd	rWORD3, rWORD4
 	beq-    cr1, L(u3)
+	bne-    L(u3)
 	lbzu	rWORD1, 1(rSTR1)
 	lbzu	rWORD2, 1(rSTR2)
-	beq+    L(u1)
+	b       L(u1)
 
 L(u3):  sub     rRTN, rWORD3, rWORD4
         blr

Modified: fsf/trunk/libc/sysdeps/powerpc/powerpc64/power7/strncmp.S
==============================================================================
--- fsf/trunk/libc/sysdeps/powerpc/powerpc64/power7/strncmp.S (original)
+++ fsf/trunk/libc/sysdeps/powerpc/powerpc64/power7/strncmp.S Mon Apr 18 00:03:03 2011
@@ -1,5 +1,5 @@
 /* Optimized strcmp implementation for POWER7/PowerPC64.
-   Copyright (C) 2010 Free Software Foundation, Inc.
+   Copyright (C) 2010, 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
@@ -145,30 +145,31 @@
 	bdz	L(u4)
 	cmpd	rWORD1,rWORD2
 	beq	cr1,L(u4)
+	bne	L(u4)
 	lbzu	rWORD3,1(rSTR1)
 	lbzu	rWORD4,1(rSTR2)
-	bne	L(u4)
 	cmpdi	cr1,rWORD3,0
 	bdz	L(u3)
 	cmpd	rWORD3,rWORD4
 	beq	cr1,L(u3)
+	bne	L(u3)
 	lbzu	rWORD1,1(rSTR1)
 	lbzu	rWORD2,1(rSTR2)
-	bne	L(u3)
 	cmpdi	cr1,rWORD1,0
 	bdz	L(u4)
 	cmpd	rWORD1,rWORD2
 	beq	cr1,L(u4)
+	bne	L(u4)
 	lbzu	rWORD3,1(rSTR1)
 	lbzu	rWORD4,1(rSTR2)
-	bne	L(u4)
 	cmpdi	cr1,rWORD3,0
 	bdz	L(u3)
 	cmpd	rWORD3,rWORD4
 	beq	cr1,L(u3)
+	bne	L(u3)
 	lbzu	rWORD1,1(rSTR1)
 	lbzu	rWORD2,1(rSTR2)
-	beq	L(u1)
+	b	L(u1)
 
 L(u3):  sub	rRTN,rWORD3,rWORD4
 	blr

Modified: fsf/trunk/libc/sysdeps/s390/s390-32/elf/start.S
==============================================================================
--- fsf/trunk/libc/sysdeps/s390/s390-32/elf/start.S (original)
+++ fsf/trunk/libc/sysdeps/s390/s390-32/elf/start.S Mon Apr 18 00:03:03 2011
@@ -74,6 +74,18 @@
 	la	%r6,4(%r6)
 	ltr	%r5,%r5
 	jne	.L12
+
+	/* Usually the auxiliary vector can be expected directly after
+	   the environment variables.  But we have to skip extra zeros
+	   because the loader might have removed unsecure variables for
+	   setuid programs.  */
+
+.L26:	l	%r5,0(%r6)
+	la	%r6,4(%r6)
+	ltr	%r5,%r5
+	jz	.L26
+
+	ahi	%r6,-4
 
 	/* Obtain the needed values from the auxiliary vector.  */
 

Modified: fsf/trunk/libc/sysdeps/s390/s390-64/utf16-utf32-z9.c
==============================================================================
--- fsf/trunk/libc/sysdeps/s390/s390-64/utf16-utf32-z9.c (original)
+++ fsf/trunk/libc/sysdeps/s390/s390-64/utf16-utf32-z9.c Mon Apr 18 00:03:03 2011
@@ -169,7 +169,10 @@
     register unsigned long long outlen asm("11") = outend - outptr;	\
     uint64_t cc = 0;							\
 									\
-    asm volatile ("0: " INSTRUCTION "  \n\t"				\
+    asm volatile (".machine push       \n\t"				\
+                  ".machine \"z9-109\" \n\t"				\
+		  "0: " INSTRUCTION "  \n\t"				\
+                  ".machine pop        \n\t"				\
                   "   jo     0b        \n\t"				\
 		  "   ipm    %2        \n"			        \
 		  : "+a" (pOutput), "+a" (pInput), "+d" (cc),		\

Modified: fsf/trunk/libc/sysdeps/s390/s390-64/utf8-utf16-z9.c
==============================================================================
--- fsf/trunk/libc/sysdeps/s390/s390-64/utf8-utf16-z9.c (original)
+++ fsf/trunk/libc/sysdeps/s390/s390-64/utf8-utf16-z9.c Mon Apr 18 00:03:03 2011
@@ -151,7 +151,10 @@
     register unsigned long long outlen asm("11") = outend - outptr;	\
     uint64_t cc = 0;							\
 									\
-    asm volatile ("0: " INSTRUCTION "  \n\t"				\
+    asm volatile (".machine push       \n\t"				\
+                  ".machine \"z9-109\" \n\t"				\
+		  "0: " INSTRUCTION "  \n\t"				\
+                  ".machine pop        \n\t"				\
                   "   jo     0b        \n\t"				\
 		  "   ipm    %2        \n"			        \
 		  : "+a" (pOutput), "+a" (pInput), "+d" (cc),		\

Modified: fsf/trunk/libc/sysdeps/s390/s390-64/utf8-utf32-z9.c
==============================================================================
--- fsf/trunk/libc/sysdeps/s390/s390-64/utf8-utf32-z9.c (original)
+++ fsf/trunk/libc/sysdeps/s390/s390-64/utf8-utf32-z9.c Mon Apr 18 00:03:03 2011
@@ -155,7 +155,10 @@
     register unsigned long long outlen asm("11") = outend - outptr;	\
     uint64_t cc = 0;							\
 									\
-    asm volatile ("0: " INSTRUCTION "  \n\t"				\
+    asm volatile (".machine push       \n\t"				\
+                  ".machine \"z9-109\" \n\t"				\
+		  "0: " INSTRUCTION "  \n\t"				\
+                  ".machine pop        \n\t"				\
                   "   jo     0b        \n\t"				\
 		  "   ipm    %2        \n"				\
 		  : "+a" (pOutput), "+a" (pInput), "+d" (cc),		\

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/getcontext.S
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/getcontext.S (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/getcontext.S Mon Apr 18 00:03:03 2011
@@ -1,5 +1,5 @@
 /* Save current context.
-   Copyright (C) 2002, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Andreas Jaeger <aj@xxxxxxx>, 2002.
 
@@ -62,6 +62,7 @@
 	movq	%rcx, oFPREGS(%rdi)
 	/* Save the floating-point environment.  */
 	fnstenv	(%rcx)
+	fldenv	(%rcx)
 	stmxcsr oMXCSR(%rdi)
 
 	/* Save the current signal mask with

Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S Mon Apr 18 00:03:03 2011
@@ -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)

Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/memcpy-ssse3.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/memcpy-ssse3.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/memcpy-ssse3.S Mon Apr 18 00:03:03 2011
@@ -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)