From 8591a1d11a4894e36e1e10831165e19f4e15a17f Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Feb 18 2009 22:02:09 +0000 Subject: 2.9.90-5 --- diff --git a/glibc-fedora.patch b/glibc-fedora.patch index 594541d..7a62d88 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -2101,3 +2101,142 @@ cfi_startproc; PSEUDO_END (BP_SYM (__clone)) +2009-12-18 Jakub Jelinek + + * sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S: Use + .machine push; .machine "power6" and .machine pop around mtfsf + insns outside of _ARCH_PWR6 define. + * sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S: Likewise. + * sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext-common.S: + Likewise. + * sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext-common.S: + Likewise. + +--- libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S.jj 2008-11-17 03:49:06.000000000 +0100 ++++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S 2009-02-18 22:55:07.000000000 +0100 +@@ -1,5 +1,6 @@ + /* Switch to context. +- Copyright (C) 2002, 2004, 2005, 2006, 2008 Free Software Foundation, Inc. ++ Copyright (C) 2002, 2004, 2005, 2006, 2008, 2009 ++ 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 +@@ -86,6 +87,8 @@ ENTRY(__novec_setcontext) + /* Use the extended four-operand version of the mtfsf insn. */ + mtfsf 0xff,fp0,1,0 + # else ++ .machine push ++ .machine "power6" + /* Availability of DFP indicates a 64-bit FPSCR. */ + andi. r6,r5,PPC_FEATURE_HAS_DFP + beq 5f +@@ -96,6 +99,7 @@ ENTRY(__novec_setcontext) + 5: + mtfsf 0xff,fp0 + 6: ++ .machine pop + # endif /* _ARCH_PWR6 */ + lfd fp29,(SIGCONTEXT_FP_REGS+(PT_R29*8))(r31) + lfd fp28,(SIGCONTEXT_FP_REGS+(PT_R28*8))(r31) +@@ -374,6 +378,8 @@ L(has_no_vec): + /* Use the extended four-operand version of the mtfsf insn. */ + mtfsf 0xff,fp0,1,0 + # else ++ .machine push ++ .machine "power6" + /* Availability of DFP indicates a 64-bit FPSCR. */ + andi. r6,r5,PPC_FEATURE_HAS_DFP + beq 7f +@@ -384,6 +390,7 @@ L(has_no_vec): + 7: + mtfsf 0xff,fp0 + 8: ++ .machine pop + # endif /* _ARCH_PWR6 */ + lfd fp29,(SIGCONTEXT_FP_REGS+(PT_R29*8))(r31) + lfd fp28,(SIGCONTEXT_FP_REGS+(PT_R28*8))(r31) +--- libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S.jj 2008-11-17 03:49:30.000000000 +0100 ++++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S 2009-02-18 22:55:37.000000000 +0100 +@@ -1,5 +1,6 @@ + /* Save current context and install the given one. +- Copyright (C) 2002, 2004, 2005, 2006, 2008 Free Software Foundation, Inc. ++ Copyright (C) 2002, 2004, 2005, 2006, 2008, 2009 ++ 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 +@@ -180,6 +181,8 @@ ENTRY(__novec_swapcontext) + /* Use the extended four-operand version of the mtfsf insn. */ + mtfsf 0xff,fp0,1,0 + # else ++ .machine push ++ .machine "power6" + /* Availability of DFP indicates a 64-bit FPSCR. */ + andi. r6,r8,PPC_FEATURE_HAS_DFP + beq 5f +@@ -190,6 +193,7 @@ ENTRY(__novec_swapcontext) + 5: + mtfsf 0xff,fp0 + 6: ++ .machine pop + #endif /* _ARCH_PWR6 */ + lfd fp29,(SIGCONTEXT_FP_REGS+(PT_R29*8))(r31) + lfd fp28,(SIGCONTEXT_FP_REGS+(PT_R28*8))(r31) +@@ -672,6 +676,8 @@ L(has_no_vec2): + /* Use the extended four-operand version of the mtfsf insn. */ + mtfsf 0xff,fp0,1,0 + # else ++ .machine push ++ .machine "power6" + /* Availability of DFP indicates a 64-bit FPSCR. */ + andi. r6,r8,PPC_FEATURE_HAS_DFP + beq 7f +@@ -682,6 +688,7 @@ L(has_no_vec2): + 7: + mtfsf 0xff,fp0 + 8: ++ .machine pop + #endif /* _ARCH_PWR6 */ + lfd fp29,(SIGCONTEXT_FP_REGS+(PT_R29*8))(r31) + lfd fp28,(SIGCONTEXT_FP_REGS+(PT_R28*8))(r31) +--- libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext-common.S.jj 2009-01-30 21:30:33.000000000 +0100 ++++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext-common.S 2009-02-18 22:52:48.000000000 +0100 +@@ -430,6 +430,8 @@ ENTRY(__CONTEXT_FUNC_NAME) + /* Use the extended four-operand version of the mtfsf insn. */ + mtfsf 0xff,fp31,1,0 + # else ++ .machine push ++ .machine "power6" + /* Availability of DFP indicates a 64-bit FPSCR. */ + andi. r6,r7,PPC_FEATURE_HAS_DFP + beq 7f +@@ -438,7 +440,7 @@ ENTRY(__CONTEXT_FUNC_NAME) + b 8f + /* Continue to operate on the FPSCR as if it were 32-bits. */ + 7: mtfsf 0xff,fp31 +-8: ++8: .machine pop + #endif /* _ARCH_PWR6 */ + lfd fp1,_UC_FREGS+(1*8)(r31) + lfd fp2,_UC_FREGS+(2*8)(r31) +--- libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext-common.S.jj 2009-01-30 21:29:24.000000000 +0100 ++++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext-common.S 2009-02-18 22:52:39.000000000 +0100 +@@ -204,6 +204,8 @@ ENTRY(__CONTEXT_FUNC_NAME) + /* Use the extended four-operand version of the mtfsf insn. */ + mtfsf 0xff,fp31,1,0 + # else ++ .machine push ++ .machine "power6" + /* Availability of DFP indicates a 64-bit FPSCR. */ + andi. r6,r7,PPC_FEATURE_HAS_DFP + beq 7f +@@ -212,7 +214,7 @@ ENTRY(__CONTEXT_FUNC_NAME) + b 8f + /* Continue to operate on the FPSCR as if it were 32-bits. */ + 7: mtfsf 0xff,fp31 +-8: ++8: .machine pop + # endif /* _ARCH_PWR6 */ + lfd fp1,_UC_FREGS+(1*8)(r31) + lfd fp2,_UC_FREGS+(2*8)(r31) diff --git a/glibc.spec b/glibc.spec index f64af2f..d9f122e 100644 --- a/glibc.spec +++ b/glibc.spec @@ -23,7 +23,7 @@ Summary: The GNU libc libraries Name: glibc Version: 2.9.90 -Release: 4 +Release: 5 # 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 @@ -1013,7 +1013,7 @@ rm -f *.filelist* %endif %changelog -* Wed Feb 18 2009 Jakub Jelinek 2.9.90-4 +* Wed Feb 18 2009 Jakub Jelinek 2.9.90-5 - update from trunk - adjust for i586 + i686 from i386 + i686 build - split static libraries into glibc-static subpackage