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

[Commits] r17009 - in /fsf/trunk/libc: ./ sysdeps/i386/ sysdeps/i386/fpu/ sysdeps/i386/i686/fpu/ sysdeps/powerpc/ sysdeps/powerpc/powe...



Author: eglibc
Date: Tue Feb  7 00:02:33 2012
New Revision: 17009

Log:
Import glibc-mainline for 2012-02-07

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/sysdeps/i386/asm-syntax.h
    fsf/trunk/libc/sysdeps/i386/fpu/e_acosh.S
    fsf/trunk/libc/sysdeps/i386/fpu/e_acoshf.S
    fsf/trunk/libc/sysdeps/i386/fpu/e_acoshl.S
    fsf/trunk/libc/sysdeps/i386/fpu/e_atanh.S
    fsf/trunk/libc/sysdeps/i386/fpu/e_atanhf.S
    fsf/trunk/libc/sysdeps/i386/fpu/e_atanhl.S
    fsf/trunk/libc/sysdeps/i386/fpu/e_log.S
    fsf/trunk/libc/sysdeps/i386/fpu/e_log10.S
    fsf/trunk/libc/sysdeps/i386/fpu/e_log10f.S
    fsf/trunk/libc/sysdeps/i386/fpu/e_log10l.S
    fsf/trunk/libc/sysdeps/i386/fpu/e_log2.S
    fsf/trunk/libc/sysdeps/i386/fpu/e_log2f.S
    fsf/trunk/libc/sysdeps/i386/fpu/e_log2l.S
    fsf/trunk/libc/sysdeps/i386/fpu/e_logf.S
    fsf/trunk/libc/sysdeps/i386/fpu/e_logl.S
    fsf/trunk/libc/sysdeps/i386/fpu/e_pow.S
    fsf/trunk/libc/sysdeps/i386/fpu/e_powf.S
    fsf/trunk/libc/sysdeps/i386/fpu/e_powl.S
    fsf/trunk/libc/sysdeps/i386/fpu/e_scalb.S
    fsf/trunk/libc/sysdeps/i386/fpu/e_scalbf.S
    fsf/trunk/libc/sysdeps/i386/fpu/e_scalbl.S
    fsf/trunk/libc/sysdeps/i386/fpu/s_asinh.S
    fsf/trunk/libc/sysdeps/i386/fpu/s_asinhf.S
    fsf/trunk/libc/sysdeps/i386/fpu/s_asinhl.S
    fsf/trunk/libc/sysdeps/i386/fpu/s_cbrt.S
    fsf/trunk/libc/sysdeps/i386/fpu/s_cbrtf.S
    fsf/trunk/libc/sysdeps/i386/fpu/s_cbrtl.S
    fsf/trunk/libc/sysdeps/i386/fpu/s_cexp.S
    fsf/trunk/libc/sysdeps/i386/fpu/s_cexpf.S
    fsf/trunk/libc/sysdeps/i386/fpu/s_cexpl.S
    fsf/trunk/libc/sysdeps/i386/fpu/s_expm1.S
    fsf/trunk/libc/sysdeps/i386/fpu/s_expm1f.S
    fsf/trunk/libc/sysdeps/i386/fpu/s_expm1l.S
    fsf/trunk/libc/sysdeps/i386/fpu/s_frexp.S
    fsf/trunk/libc/sysdeps/i386/fpu/s_frexpf.S
    fsf/trunk/libc/sysdeps/i386/fpu/s_frexpl.S
    fsf/trunk/libc/sysdeps/i386/fpu/s_log1p.S
    fsf/trunk/libc/sysdeps/i386/fpu/s_log1pf.S
    fsf/trunk/libc/sysdeps/i386/fpu/s_log1pl.S
    fsf/trunk/libc/sysdeps/i386/i686/fpu/e_logl.S
    fsf/trunk/libc/sysdeps/i386/sysdep.h
    fsf/trunk/libc/sysdeps/powerpc/powerpc32/sysdep.h
    fsf/trunk/libc/sysdeps/powerpc/powerpc64/sysdep.h
    fsf/trunk/libc/sysdeps/powerpc/sysdep.h
    fsf/trunk/libc/sysdeps/s390/asm-syntax.h
    fsf/trunk/libc/sysdeps/x86_64/fpu/e_log10l.S
    fsf/trunk/libc/sysdeps/x86_64/fpu/e_log2l.S
    fsf/trunk/libc/sysdeps/x86_64/fpu/e_logl.S
    fsf/trunk/libc/sysdeps/x86_64/fpu/e_powl.S
    fsf/trunk/libc/sysdeps/x86_64/fpu/e_scalbl.S
    fsf/trunk/libc/sysdeps/x86_64/fpu/s_copysign.S
    fsf/trunk/libc/sysdeps/x86_64/fpu/s_copysignf.S
    fsf/trunk/libc/sysdeps/x86_64/fpu/s_expm1l.S
    fsf/trunk/libc/sysdeps/x86_64/fpu/s_log1pl.S

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Tue Feb  7 00:02:33 2012
@@ -1,3 +1,71 @@
+2012-02-06  Marek Polacek  <polacek@xxxxxxxxxx>
+
+	* sysdeps/s390/asm-syntax.h: Remove __ELF__ conditionals.
+	* sysdeps/i386/fpu/e_powf.S: Likewise.
+	* sysdeps/i386/fpu/e_atanhf.S: Likewise.
+	* sysdeps/i386/fpu/s_cexpl.S: Likewise.
+	* sysdeps/i386/fpu/e_acosh.S: Likewise.
+	* sysdeps/i386/fpu/e_pow.S: Likewise.
+	* sysdeps/i386/fpu/s_asinhl.S: Likewise.
+	* sysdeps/i386/fpu/e_acoshl.S: Likewise.
+	* sysdeps/i386/fpu/s_expm1.S: Likewise.
+	* sysdeps/i386/fpu/s_frexpf.S: Likewise.
+	* sysdeps/i386/fpu/e_log2.S: Likewise.
+	* sysdeps/i386/fpu/e_log2l.S: Likewise.
+	* sysdeps/i386/fpu/e_scalb.S: Likewise.
+	* sysdeps/i386/fpu/e_powl.S: Likewise.
+	* sysdeps/i386/fpu/s_log1p.S: Likewise.
+	* sysdeps/i386/fpu/e_log10f.S: Likewise.
+	* sysdeps/i386/fpu/s_cbrtf.S: Likewise.
+	* sysdeps/i386/fpu/e_logl.S: Likewise.
+	* sysdeps/i386/fpu/s_cbrt.S: Likewise.
+	* sysdeps/i386/fpu/s_expm1l.S: Likewise.
+	* sysdeps/i386/fpu/s_frexpl.S: Likewise.
+	* sysdeps/i386/fpu/s_expm1f.S: Likewise.
+	* sysdeps/i386/fpu/e_log2f.S: Likewise.
+	* sysdeps/i386/fpu/e_acoshf.S: Likewise.
+	* sysdeps/i386/fpu/e_log.S: Likewise.
+	* sysdeps/i386/fpu/s_cexp.S: Likewise.
+	* sysdeps/i386/fpu/e_scalbf.S: Likewise.
+	* sysdeps/i386/fpu/s_log1pl.S: Likewise.
+	* sysdeps/i386/fpu/e_logf.S: Likewise.
+	* sysdeps/i386/fpu/e_log10l.S: Likewise.
+	* sysdeps/i386/fpu/e_atanh.S: Likewise.
+	* sysdeps/i386/fpu/s_log1pf.S: Likewise.
+	* sysdeps/i386/fpu/s_asinhf.S: Likewise.
+	* sysdeps/i386/fpu/s_cexpf.S: Likewise.
+	* sysdeps/i386/fpu/e_log10.S: Likewise.
+	* sysdeps/i386/fpu/s_frexp.S: Likewise.
+	* sysdeps/i386/fpu/e_atanhl.S: Likewise.
+	* sysdeps/i386/fpu/s_asinh.S: Likewise.
+	* sysdeps/i386/fpu/s_cbrtl.S: Likewise.
+	* sysdeps/i386/fpu/e_scalbl.S: Likewise.
+	* sysdeps/i386/i686/fpu/e_logl.S: Likewise.
+	* sysdeps/i386/asm-syntax.h: Likewise.
+	* sysdeps/x86_64/fpu/e_log2l.S: Likewise.
+	* sysdeps/x86_64/fpu/e_powl.S: Likewise.
+	* sysdeps/x86_64/fpu/e_logl.S: Likewise.
+	* sysdeps/x86_64/fpu/s_expm1l.S: Likewise.
+	* sysdeps/x86_64/fpu/s_log1pl.S: Likewise.
+	* sysdeps/x86_64/fpu/e_log10l.S: Likewise.
+	* sysdeps/x86_64/fpu/s_copysignf.S: Likewise.
+	* sysdeps/x86_64/fpu/s_copysign.S: Likewise.
+	* sysdeps/x86_64/fpu/e_scalbl.S: Likewise.
+	* sysdeps/powerpc/sysdep.h: Likewise.
+	* sysdeps/powerpc/powerpc64/sysdep.h: Likewise.
+	* sysdeps/powerpc/powerpc32/sysdep.h: Likewise.
+
+2012-02-06  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	[BZ #411]
+	* sysdeps/i386/sysdep.h (__i686): Undefine and redefine.
+
+2012-02-06  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/i386/sysdep.h: Include <features.h>.
+	(GET_PC_THUNK, GET_PC_THUNK_STR): Define conditionally on compiler
+	version.
+
 2012-02-05  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/i386/sysdep.h (SETUP_PIC_REG_STR, LOAD_PIC_REG_STR):

Modified: fsf/trunk/libc/sysdeps/i386/asm-syntax.h
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/asm-syntax.h (original)
+++ fsf/trunk/libc/sysdeps/i386/asm-syntax.h Tue Feb  7 00:02:33 2012
@@ -22,8 +22,4 @@
 #define ALIGN(log) .align 1<<log
 
 #undef L
-#ifdef __ELF__
-# define L(body) .L##body
-#else
-# define L(body) L##body
-#endif
+#define L(body) .L##body

Modified: fsf/trunk/libc/sysdeps/i386/fpu/e_acosh.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/fpu/e_acosh.S (original)
+++ fsf/trunk/libc/sysdeps/i386/fpu/e_acosh.S Tue Feb  7 00:02:33 2012
@@ -1,5 +1,5 @@
 /* ix87 specific implementation of arcsinh.
-   Copyright (C) 1996, 2005, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1996, 2005, 2011-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
 
@@ -20,11 +20,7 @@
 
 #include <machine/asm.h>
 
-#ifdef __ELF__
 	.section .rodata.cst8,"aM",@progbits,8
-#else
-	.text
-#endif
 
 	.p2align 3
 	ASM_TYPE_DIRECTIVE(one,@object)

Modified: fsf/trunk/libc/sysdeps/i386/fpu/e_acoshf.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/fpu/e_acoshf.S (original)
+++ fsf/trunk/libc/sysdeps/i386/fpu/e_acoshf.S Tue Feb  7 00:02:33 2012
@@ -1,5 +1,5 @@
 /* ix87 specific implementation of arcsinh.
-   Copyright (C) 1996, 1997, 2005, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1996-1997, 2005, 2011-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
 
@@ -20,11 +20,7 @@
 
 #include <machine/asm.h>
 
-#ifdef __ELF__
 	.section .rodata.cst8,"aM",@progbits,8
-#else
-	.text
-#endif
 
 	.p2align 3
 	ASM_TYPE_DIRECTIVE(one,@object)

Modified: fsf/trunk/libc/sysdeps/i386/fpu/e_acoshl.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/fpu/e_acoshl.S (original)
+++ fsf/trunk/libc/sysdeps/i386/fpu/e_acoshl.S Tue Feb  7 00:02:33 2012
@@ -1,5 +1,5 @@
 /* ix87 specific implementation of arcsinh.
-   Copyright (C) 1996, 1997, 2005, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1996-1997, 2005, 2011-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
 
@@ -20,11 +20,7 @@
 
 #include <machine/asm.h>
 
-#ifdef __ELF__
 	.section .rodata.cst8,"aM",@progbits,8
-#else
-	.text
-#endif
 
 	.p2align 3
 	/* Please note that we use double value for 1.0.  This number

Modified: fsf/trunk/libc/sysdeps/i386/fpu/e_atanh.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/fpu/e_atanh.S (original)
+++ fsf/trunk/libc/sysdeps/i386/fpu/e_atanh.S Tue Feb  7 00:02:33 2012
@@ -1,5 +1,5 @@
 /* ix87 specific implementation of arctanh function.
-   Copyright (C) 1996, 1999, 2005, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1999, 2005, 2011-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
 
@@ -20,11 +20,7 @@
 
 #include <machine/asm.h>
 
-#ifdef __ELF__
 	.section .rodata
-#else
-	.text
-#endif
 
 	.align ALIGNARG(4)
 	ASM_TYPE_DIRECTIVE(half,@object)

Modified: fsf/trunk/libc/sysdeps/i386/fpu/e_atanhf.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/fpu/e_atanhf.S (original)
+++ fsf/trunk/libc/sysdeps/i386/fpu/e_atanhf.S Tue Feb  7 00:02:33 2012
@@ -1,5 +1,5 @@
 /* ix87 specific implementation of arctanh function.
-   Copyright (C) 1996, 1999, 2005, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1999, 2005, 2011-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
 
@@ -20,11 +20,7 @@
 
 #include <machine/asm.h>
 
-#ifdef __ELF__
 	.section .rodata
-#else
-	.text
-#endif
 
 	.align ALIGNARG(4)
 	ASM_TYPE_DIRECTIVE(half,@object)

Modified: fsf/trunk/libc/sysdeps/i386/fpu/e_atanhl.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/fpu/e_atanhl.S (original)
+++ fsf/trunk/libc/sysdeps/i386/fpu/e_atanhl.S Tue Feb  7 00:02:33 2012
@@ -1,5 +1,5 @@
 /* ix87 specific implementation of arctanh function.
-   Copyright (C) 1996, 1999, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1999, 2011-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
 
@@ -20,11 +20,7 @@
 
 #include <machine/asm.h>
 
-#ifdef __ELF__
 	.section .rodata
-#else
-	.text
-#endif
 
 	.align ALIGNARG(4)
 	/* Please note that we use double values for 0.5 and 1.0.  These

Modified: fsf/trunk/libc/sysdeps/i386/fpu/e_log.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/fpu/e_log.S (original)
+++ fsf/trunk/libc/sysdeps/i386/fpu/e_log.S Tue Feb  7 00:02:33 2012
@@ -7,11 +7,8 @@
 
 #include <machine/asm.h>
 
-#ifdef __ELF__
 	.section .rodata.cst8,"aM",@progbits,8
-#else
-	.text
-#endif
+
 	.p2align 3
 	ASM_TYPE_DIRECTIVE(one,@object)
 one:	.double 1.0

Modified: fsf/trunk/libc/sysdeps/i386/fpu/e_log10.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/fpu/e_log10.S (original)
+++ fsf/trunk/libc/sysdeps/i386/fpu/e_log10.S Tue Feb  7 00:02:33 2012
@@ -7,11 +7,8 @@
 
 #include <machine/asm.h>
 
-#ifdef __ELF__
 	.section .rodata.cst8,"aM",@progbits,8
-#else
-	.text
-#endif
+
 	.p2align 3
 	ASM_TYPE_DIRECTIVE(one,@object)
 one:	.double 1.0

Modified: fsf/trunk/libc/sysdeps/i386/fpu/e_log10f.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/fpu/e_log10f.S (original)
+++ fsf/trunk/libc/sysdeps/i386/fpu/e_log10f.S Tue Feb  7 00:02:33 2012
@@ -8,11 +8,8 @@
 
 #include <machine/asm.h>
 
-#ifdef __ELF__
 	.section .rodata.cst8,"aM",@progbits,8
-#else
-	.text
-#endif
+
 	.p2align 3
 	ASM_TYPE_DIRECTIVE(one,@object)
 one:	.double 1.0

Modified: fsf/trunk/libc/sysdeps/i386/fpu/e_log10l.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/fpu/e_log10l.S (original)
+++ fsf/trunk/libc/sysdeps/i386/fpu/e_log10l.S Tue Feb  7 00:02:33 2012
@@ -9,11 +9,8 @@
 
 #include <machine/asm.h>
 
-#ifdef __ELF__
 	.section .rodata.cst8,"aM",@progbits,8
-#else
-	.text
-#endif
+
 	.p2align 3
 	ASM_TYPE_DIRECTIVE(one,@object)
 one:	.double 1.0

Modified: fsf/trunk/libc/sysdeps/i386/fpu/e_log2.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/fpu/e_log2.S (original)
+++ fsf/trunk/libc/sysdeps/i386/fpu/e_log2.S Tue Feb  7 00:02:33 2012
@@ -8,11 +8,8 @@
 
 #include <machine/asm.h>
 
-#ifdef __ELF__
 	.section .rodata.cst8,"aM",@progbits,8
-#else
-	.text
-#endif
+
 	.p2align 3
 	ASM_TYPE_DIRECTIVE(one,@object)
 one:	.double 1.0

Modified: fsf/trunk/libc/sysdeps/i386/fpu/e_log2f.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/fpu/e_log2f.S (original)
+++ fsf/trunk/libc/sysdeps/i386/fpu/e_log2f.S Tue Feb  7 00:02:33 2012
@@ -8,11 +8,8 @@
 
 #include <machine/asm.h>
 
-#ifdef __ELF__
 	.section .rodata.cst8,"aM",@progbits,8
-#else
-	.text
-#endif
+
 	.p2align 3
 	ASM_TYPE_DIRECTIVE(one,@object)
 one:	.double 1.0

Modified: fsf/trunk/libc/sysdeps/i386/fpu/e_log2l.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/fpu/e_log2l.S (original)
+++ fsf/trunk/libc/sysdeps/i386/fpu/e_log2l.S Tue Feb  7 00:02:33 2012
@@ -8,11 +8,8 @@
 
 #include <machine/asm.h>
 
-#ifdef __ELF__
 	.section .rodata.cst8,"aM",@progbits,8
-#else
-	.text
-#endif
+
 	.p2align 3
 	ASM_TYPE_DIRECTIVE(one,@object)
 one:	.double 1.0

Modified: fsf/trunk/libc/sysdeps/i386/fpu/e_logf.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/fpu/e_logf.S (original)
+++ fsf/trunk/libc/sysdeps/i386/fpu/e_logf.S Tue Feb  7 00:02:33 2012
@@ -8,11 +8,8 @@
 
 #include <machine/asm.h>
 
-#ifdef __ELF__
 	.section .rodata.cst8,"aM",@progbits,8
-#else
-	.text
-#endif
+
 	.p2align 3
 	ASM_TYPE_DIRECTIVE(one,@object)
 one:	.double 1.0

Modified: fsf/trunk/libc/sysdeps/i386/fpu/e_logl.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/fpu/e_logl.S (original)
+++ fsf/trunk/libc/sysdeps/i386/fpu/e_logl.S Tue Feb  7 00:02:33 2012
@@ -8,11 +8,8 @@
 #include <machine/asm.h>
 
 
-#ifdef __ELF__
 	.section .rodata.cst8,"aM",@progbits,8
-#else
-	.text
-#endif
+
 	.p2align 3
 	ASM_TYPE_DIRECTIVE(one,@object)
 one:	.double 1.0

Modified: fsf/trunk/libc/sysdeps/i386/fpu/e_pow.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/fpu/e_pow.S (original)
+++ fsf/trunk/libc/sysdeps/i386/fpu/e_pow.S Tue Feb  7 00:02:33 2012
@@ -1,5 +1,5 @@
 /* ix87 specific implementation of pow function.
-   Copyright (C) 1996, 1997, 1998, 1999, 2001, 2004, 2005, 2007, 2011
+   Copyright (C) 1996-1999, 2001, 2004-2005, 2007, 2011-2012
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
@@ -21,11 +21,8 @@
 
 #include <machine/asm.h>
 
-#ifdef __ELF__
 	.section .rodata.cst8,"aM",@progbits,8
-#else
-	.text
-#endif
+
 	.p2align 3
 	ASM_TYPE_DIRECTIVE(one,@object)
 one:	.double 1.0
@@ -37,11 +34,8 @@
 p63:	.byte 0, 0, 0, 0, 0, 0, 0xe0, 0x43
 	ASM_SIZE_DIRECTIVE(p63)
 
-#ifdef __ELF__
 	.section .rodata.cst16,"aM",@progbits,16
-#else
-	.text
-#endif
+
 	.p2align 3
 	ASM_TYPE_DIRECTIVE(infinity,@object)
 inf_zero:

Modified: fsf/trunk/libc/sysdeps/i386/fpu/e_powf.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/fpu/e_powf.S (original)
+++ fsf/trunk/libc/sysdeps/i386/fpu/e_powf.S Tue Feb  7 00:02:33 2012
@@ -1,5 +1,5 @@
 /* ix87 specific implementation of pow function.
-   Copyright (C) 1996, 1997, 1999, 2001, 2004, 2005, 2007, 2011
+   Copyright (C) 1996-1997, 1999, 2001, 2004, 2005, 2007, 2011-2012
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
@@ -21,11 +21,8 @@
 
 #include <machine/asm.h>
 
-#ifdef __ELF__
 	.section .rodata.cst8,"aM",@progbits,8
-#else
-	.text
-#endif
+
 	.p2align 3
 	ASM_TYPE_DIRECTIVE(one,@object)
 one:	.double 1.0
@@ -37,11 +34,8 @@
 p31:	.byte 0, 0, 0, 0, 0, 0, 0xe0, 0x41
 	ASM_SIZE_DIRECTIVE(p31)
 
-#ifdef __ELF__
 	.section .rodata.cst16,"aM",@progbits,16
-#else
-	.text
-#endif
+
 	.p2align 3
 	ASM_TYPE_DIRECTIVE(infinity,@object)
 inf_zero:

Modified: fsf/trunk/libc/sysdeps/i386/fpu/e_powl.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/fpu/e_powl.S (original)
+++ fsf/trunk/libc/sysdeps/i386/fpu/e_powl.S Tue Feb  7 00:02:33 2012
@@ -1,5 +1,5 @@
 /* ix87 specific implementation of pow function.
-   Copyright (C) 1996, 1997, 1998, 1999, 2001, 2004, 2005, 2007, 2011
+   Copyright (C) 1996-1999, 2001, 2004-2005, 2007, 2011-2012
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
@@ -21,11 +21,8 @@
 
 #include <machine/asm.h>
 
-#ifdef __ELF__
 	.section .rodata.cst8,"aM",@progbits,8
-#else
-	.text
-#endif
+
 	.p2align 3
 	ASM_TYPE_DIRECTIVE(one,@object)
 one:	.double 1.0
@@ -37,11 +34,8 @@
 p63:	.byte 0, 0, 0, 0, 0, 0, 0xe0, 0x43
 	ASM_SIZE_DIRECTIVE(p63)
 
-#ifdef __ELF__
 	.section .rodata.cst16,"aM",@progbits,16
-#else
-	.text
-#endif
+
 	.p2align 3
 	ASM_TYPE_DIRECTIVE(infinity,@object)
 inf_zero:

Modified: fsf/trunk/libc/sysdeps/i386/fpu/e_scalb.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/fpu/e_scalb.S (original)
+++ fsf/trunk/libc/sysdeps/i386/fpu/e_scalb.S Tue Feb  7 00:02:33 2012
@@ -7,11 +7,7 @@
 
 #include <machine/asm.h>
 
-#ifdef __ELF__
 	.section .rodata
-#else
-	.text
-#endif
 
 	.align ALIGNARG(4)
 	ASM_TYPE_DIRECTIVE(zero_nan,@object)

Modified: fsf/trunk/libc/sysdeps/i386/fpu/e_scalbf.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/fpu/e_scalbf.S (original)
+++ fsf/trunk/libc/sysdeps/i386/fpu/e_scalbf.S Tue Feb  7 00:02:33 2012
@@ -8,11 +8,7 @@
 
 #include <machine/asm.h>
 
-#ifdef __ELF__
 	.section .rodata
-#else
-	.text
-#endif
 
 	.align ALIGNARG(4)
 	ASM_TYPE_DIRECTIVE(zero_nan,@object)

Modified: fsf/trunk/libc/sysdeps/i386/fpu/e_scalbl.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/fpu/e_scalbl.S (original)
+++ fsf/trunk/libc/sysdeps/i386/fpu/e_scalbl.S Tue Feb  7 00:02:33 2012
@@ -9,11 +9,7 @@
 
 #include <machine/asm.h>
 
-#ifdef __ELF__
 	.section .rodata
-#else
-	.text
-#endif
 
 	.align ALIGNARG(4)
 	ASM_TYPE_DIRECTIVE(zero_nan,@object)

Modified: fsf/trunk/libc/sysdeps/i386/fpu/s_asinh.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/fpu/s_asinh.S (original)
+++ fsf/trunk/libc/sysdeps/i386/fpu/s_asinh.S Tue Feb  7 00:02:33 2012
@@ -1,5 +1,5 @@
 /* ix87 specific implementation of arcsinh.
-   Copyright (C) 1996, 1997, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1996-1997, 2005, 2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
 
@@ -20,11 +20,7 @@
 
 #include <machine/asm.h>
 
-#ifdef __ELF__
 	.section .rodata
-#else
-	.text
-#endif
 
 	.align ALIGNARG(4)
 	ASM_TYPE_DIRECTIVE(huge,@object)

Modified: fsf/trunk/libc/sysdeps/i386/fpu/s_asinhf.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/fpu/s_asinhf.S (original)
+++ fsf/trunk/libc/sysdeps/i386/fpu/s_asinhf.S Tue Feb  7 00:02:33 2012
@@ -1,5 +1,5 @@
 /* ix87 specific implementation of arcsinh.
-   Copyright (C) 1996, 1997, 1999, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1996-1997, 1999, 2005, 2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
 
@@ -20,11 +20,7 @@
 
 #include <machine/asm.h>
 
-#ifdef __ELF__
 	.section .rodata
-#else
-	.text
-#endif
 
 	.align ALIGNARG(4)
 	ASM_TYPE_DIRECTIVE(huge,@object)

Modified: fsf/trunk/libc/sysdeps/i386/fpu/s_asinhl.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/fpu/s_asinhl.S (original)
+++ fsf/trunk/libc/sysdeps/i386/fpu/s_asinhl.S Tue Feb  7 00:02:33 2012
@@ -1,5 +1,5 @@
 /* ix87 specific implementation of arcsinh.
-   Copyright (C) 1996, 1997, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1996-1997, 2005, 2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
 
@@ -20,11 +20,7 @@
 
 #include <machine/asm.h>
 
-#ifdef __ELF__
 	.section .rodata
-#else
-	.text
-#endif
 
 	.align ALIGNARG(4)
 	ASM_TYPE_DIRECTIVE(huge,@object)

Modified: fsf/trunk/libc/sysdeps/i386/fpu/s_cbrt.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/fpu/s_cbrt.S (original)
+++ fsf/trunk/libc/sysdeps/i386/fpu/s_cbrt.S Tue Feb  7 00:02:33 2012
@@ -1,5 +1,5 @@
 /* Compute cubic root of double value.
-   Copyright (C) 1997, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2005, 2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Dirk Alboth <dirka@xxxxxxxxxxxxxxxx> and
    Ulrich Drepper <drepper@xxxxxxxxxx>, 1997.
@@ -21,11 +21,7 @@
 
 #include <machine/asm.h>
 
-#ifdef __ELF__
         .section .rodata
-#else
-        .text
-#endif
 
         .align ALIGNARG(4)
         ASM_TYPE_DIRECTIVE(f7,@object)

Modified: fsf/trunk/libc/sysdeps/i386/fpu/s_cbrtf.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/fpu/s_cbrtf.S (original)
+++ fsf/trunk/libc/sysdeps/i386/fpu/s_cbrtf.S Tue Feb  7 00:02:33 2012
@@ -1,5 +1,5 @@
 /* Compute cubic root of float value.
-   Copyright (C) 1997, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2005, 2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Dirk Alboth <dirka@xxxxxxxxxxxxxxxx> and
    Ulrich Drepper <drepper@xxxxxxxxxx>, 1997.
@@ -21,11 +21,7 @@
 
 #include <machine/asm.h>
 
-#ifdef __ELF__
         .section .rodata
-#else
-        .text
-#endif
 
         .align ALIGNARG(4)
         ASM_TYPE_DIRECTIVE(f3,@object)

Modified: fsf/trunk/libc/sysdeps/i386/fpu/s_cbrtl.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/fpu/s_cbrtl.S (original)
+++ fsf/trunk/libc/sysdeps/i386/fpu/s_cbrtl.S Tue Feb  7 00:02:33 2012
@@ -1,5 +1,5 @@
 /* Compute cubic root of long double value.
-   Copyright (C) 1997, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2005, 2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Dirk Alboth <dirka@xxxxxxxxxxxxxxxx> and
    Ulrich Drepper <drepper@xxxxxxxxxx>, 1997.
@@ -21,11 +21,7 @@
 
 #include <machine/asm.h>
 
-#ifdef __ELF__
         .section .rodata
-#else
-        .text
-#endif
 
         .align ALIGNARG(4)
         ASM_TYPE_DIRECTIVE(f8,@object)

Modified: fsf/trunk/libc/sysdeps/i386/fpu/s_cexp.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/fpu/s_cexp.S (original)
+++ fsf/trunk/libc/sysdeps/i386/fpu/s_cexp.S Tue Feb  7 00:02:33 2012
@@ -1,5 +1,5 @@
 /* ix87 specific implementation of complex exponential function for double.
-   Copyright (C) 1997, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2005, 2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1997.
 
@@ -20,11 +20,8 @@
 
 #include <sysdep.h>
 
-#ifdef __ELF__
 	.section .rodata
-#else
-	.text
-#endif
+
 	.align ALIGNARG(4)
 	ASM_TYPE_DIRECTIVE(huge_nan_null_null,@object)
 huge_nan_null_null:

Modified: fsf/trunk/libc/sysdeps/i386/fpu/s_cexpf.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/fpu/s_cexpf.S (original)
+++ fsf/trunk/libc/sysdeps/i386/fpu/s_cexpf.S Tue Feb  7 00:02:33 2012
@@ -1,5 +1,5 @@
 /* ix87 specific implementation of complex exponential function for double.
-   Copyright (C) 1997, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2005, 2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1997.
 
@@ -20,11 +20,8 @@
 
 #include <sysdep.h>
 
-#ifdef __ELF__
 	.section .rodata
-#else
-	.text
-#endif
+
 	.align ALIGNARG(4)
 	ASM_TYPE_DIRECTIVE(huge_nan_null_null,@object)
 huge_nan_null_null:

Modified: fsf/trunk/libc/sysdeps/i386/fpu/s_cexpl.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/fpu/s_cexpl.S (original)
+++ fsf/trunk/libc/sysdeps/i386/fpu/s_cexpl.S Tue Feb  7 00:02:33 2012
@@ -1,5 +1,5 @@
 /* ix87 specific implementation of complex exponential function for double.
-   Copyright (C) 1997, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2005, 2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1997.
 
@@ -20,11 +20,8 @@
 
 #include <sysdep.h>
 
-#ifdef __ELF__
 	.section .rodata
-#else
-	.text
-#endif
+
 	.align ALIGNARG(4)
 	ASM_TYPE_DIRECTIVE(huge_nan_null_null,@object)
 huge_nan_null_null:

Modified: fsf/trunk/libc/sysdeps/i386/fpu/s_expm1.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/fpu/s_expm1.S (original)
+++ fsf/trunk/libc/sysdeps/i386/fpu/s_expm1.S Tue Feb  7 00:02:33 2012
@@ -1,5 +1,5 @@
 /* ix87 specific implementation of exp(x)-1.
-   Copyright (C) 1996, 1997, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1996-1997, 2005, 2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
    Based on code by John C. Bowman <bowman@xxxxxxxxxxxxxxxxxxx>.
@@ -25,11 +25,8 @@
 #include <sysdep.h>
 #include <machine/asm.h>
 
-#ifdef __ELF__
 	.section .rodata
-#else
-	.text
-#endif
+
 	.align ALIGNARG(4)
 	ASM_TYPE_DIRECTIVE(minus1,@object)
 minus1:	.double -1.0

Modified: fsf/trunk/libc/sysdeps/i386/fpu/s_expm1f.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/fpu/s_expm1f.S (original)
+++ fsf/trunk/libc/sysdeps/i386/fpu/s_expm1f.S Tue Feb  7 00:02:33 2012
@@ -1,5 +1,5 @@
 /* ix87 specific implementation of exp(x)-1.
-   Copyright (C) 1996, 1997, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1996-1997, 2005, 2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
    Based on code by John C. Bowman <bowman@xxxxxxxxxxxxxxxxxxx>.
@@ -25,11 +25,8 @@
 #include <sysdep.h>
 #include <machine/asm.h>
 
-#ifdef __ELF__
 	.section .rodata
-#else
-	.text
-#endif
+
 	.align ALIGNARG(4)
 	ASM_TYPE_DIRECTIVE(minus1,@object)
 minus1:	.double -1.0

Modified: fsf/trunk/libc/sysdeps/i386/fpu/s_expm1l.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/fpu/s_expm1l.S (original)
+++ fsf/trunk/libc/sysdeps/i386/fpu/s_expm1l.S Tue Feb  7 00:02:33 2012
@@ -1,5 +1,5 @@
 /* ix87 specific implementation of exp(x)-1.
-   Copyright (C) 1996, 1997, 2002, 2005, 2008 Free Software Foundation, Inc.
+   Copyright (C) 1996-1997, 2002, 2005, 2008, 2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
    Based on code by John C. Bowman <bowman@xxxxxxxxxxxxxxxxxxx>.
@@ -25,11 +25,8 @@
 #include <sysdep.h>
 #include <machine/asm.h>
 
-#ifdef __ELF__
 	.section .rodata
-#else
-	.text
-#endif
+
 	.align ALIGNARG(4)
 	ASM_TYPE_DIRECTIVE(minus1,@object)
 minus1:	.double -1.0

Modified: fsf/trunk/libc/sysdeps/i386/fpu/s_frexp.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/fpu/s_frexp.S (original)
+++ fsf/trunk/libc/sysdeps/i386/fpu/s_frexp.S Tue Feb  7 00:02:33 2012
@@ -1,5 +1,5 @@
 /* ix87 specific frexp implementation for double.
-   Copyright (C) 1997, 2000, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2000, 2005, 2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1997.
 
@@ -22,11 +22,7 @@
 #include "bp-sym.h"
 #include "bp-asm.h"
 
-#ifdef __ELF__
 	.section .rodata
-#else
-	.text
-#endif
 
 	.align ALIGNARG(4)
 	ASM_TYPE_DIRECTIVE(two54,@object)

Modified: fsf/trunk/libc/sysdeps/i386/fpu/s_frexpf.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/fpu/s_frexpf.S (original)
+++ fsf/trunk/libc/sysdeps/i386/fpu/s_frexpf.S Tue Feb  7 00:02:33 2012
@@ -1,5 +1,5 @@
 /* ix87 specific frexp implementation for float.
-   Copyright (C) 1997, 2000, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2000, 2005, 2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1997.
 
@@ -22,11 +22,7 @@
 #include "bp-sym.h"
 #include "bp-asm.h"
 
-#ifdef __ELF__
 	.section .rodata
-#else
-	.text
-#endif
 
 	.align ALIGNARG(4)
 	ASM_TYPE_DIRECTIVE(two25,@object)

Modified: fsf/trunk/libc/sysdeps/i386/fpu/s_frexpl.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/fpu/s_frexpl.S (original)
+++ fsf/trunk/libc/sysdeps/i386/fpu/s_frexpl.S Tue Feb  7 00:02:33 2012
@@ -1,5 +1,5 @@
 /* ix87 specific frexp implementation for long double.
-   Copyright (C) 1997, 2000, 2001, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2000-2001, 2005, 2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1997.
 
@@ -22,11 +22,7 @@
 #include "bp-sym.h"
 #include "bp-asm.h"
 
-#ifdef __ELF__
 	.section .rodata
-#else
-	.text
-#endif
 
 	.align ALIGNARG(4)
 	ASM_TYPE_DIRECTIVE(two64,@object)

Modified: fsf/trunk/libc/sysdeps/i386/fpu/s_log1p.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/fpu/s_log1p.S (original)
+++ fsf/trunk/libc/sysdeps/i386/fpu/s_log1p.S Tue Feb  7 00:02:33 2012
@@ -7,11 +7,8 @@
 
 RCSID("$NetBSD: s_log1p.S,v 1.7 1995/05/09 00:10:58 jtc Exp $")
 
-#ifdef __ELF__
 	.section .rodata
-#else
-	.text
-#endif
+
 	.align ALIGNARG(4)
 	/* The fyl2xp1 can only be used for values in
 		-1 + sqrt(2) / 2 <= x <= 1 - sqrt(2) / 2

Modified: fsf/trunk/libc/sysdeps/i386/fpu/s_log1pf.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/fpu/s_log1pf.S (original)
+++ fsf/trunk/libc/sysdeps/i386/fpu/s_log1pf.S Tue Feb  7 00:02:33 2012
@@ -7,11 +7,8 @@
 
 RCSID("$NetBSD: s_log1pf.S,v 1.4 1995/05/09 00:13:05 jtc Exp $")
 
-#ifdef __ELF__
 	.section .rodata
-#else
-	.text
-#endif
+
 	.align ALIGNARG(4)
 	/* The fyl2xp1 can only be used for values in
 		-1 + sqrt(2) / 2 <= x <= 1 - sqrt(2) / 2

Modified: fsf/trunk/libc/sysdeps/i386/fpu/s_log1pl.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/fpu/s_log1pl.S (original)
+++ fsf/trunk/libc/sysdeps/i386/fpu/s_log1pl.S Tue Feb  7 00:02:33 2012
@@ -9,11 +9,8 @@
 
 RCSID("$NetBSD: s_log1p.S,v 1.7 1995/05/09 00:10:58 jtc Exp $")
 
-#ifdef __ELF__
 	.section .rodata
-#else
-	.text
-#endif
+
 	.align ALIGNARG(4)
 	/* The fyl2xp1 can only be used for values in
 		-1 + sqrt(2) / 2 <= x <= 1 - sqrt(2) / 2

Modified: fsf/trunk/libc/sysdeps/i386/i686/fpu/e_logl.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/fpu/e_logl.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/fpu/e_logl.S Tue Feb  7 00:02:33 2012
@@ -9,11 +9,8 @@
 
 #include <machine/asm.h>
 
-#ifdef __ELF__
 	.section .rodata.cst8,"aM",@progbits,8
-#else
-	.text
-#endif
+
 	.p2align 3
 	ASM_TYPE_DIRECTIVE(one,@object)
 one:	.double 1.0

Modified: fsf/trunk/libc/sysdeps/i386/sysdep.h
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/sysdep.h (original)
+++ fsf/trunk/libc/sysdeps/i386/sysdep.h Tue Feb  7 00:02:33 2012
@@ -20,10 +20,29 @@
 
 #include <sysdeps/generic/sysdep.h>
 
-#ifdef __ASSEMBLER__
-# define GET_PC_THUNK(reg) __i686.get_pc_thunk.reg
+#include <features.h> /* For __GNUC_PREREQ.  */
+
+/* It is desirable that the names of PIC thunks match those used by
+   GCC so that multiple copies are eliminated by the linker.  Because
+   GCC 4.6 and earlier use __i686 in the names, it is necessary to
+   override that predefined macro.  */
+#if defined __i686 && defined __ASSEMBLER__
+#undef __i686
+#define __i686 __i686
+#endif
+
+#ifdef	__ASSEMBLER__
+# if __GNUC_PREREQ (4, 7)
+#  define GET_PC_THUNK(reg) __x86.get_pc_thunk.reg
+# else
+#  define GET_PC_THUNK(reg) __i686.get_pc_thunk.reg
+# endif
 #else
-# define GET_PC_THUNK_STR(reg) "__i686.get_pc_thunk." #reg
+# if __GNUC_PREREQ (4, 7)
+#  define GET_PC_THUNK_STR(reg) "__x86.get_pc_thunk." #reg
+# else
+#  define GET_PC_THUNK_STR(reg) "__i686.get_pc_thunk." #reg
+# endif
 #endif
 
 #ifdef	__ASSEMBLER__

Modified: fsf/trunk/libc/sysdeps/powerpc/powerpc32/sysdep.h
==============================================================================
--- fsf/trunk/libc/sysdeps/powerpc/powerpc32/sysdep.h (original)
+++ fsf/trunk/libc/sysdeps/powerpc/powerpc32/sysdep.h Tue Feb  7 00:02:33 2012
@@ -1,5 +1,5 @@
 /* Assembly macros for 32-bit PowerPC.
-   Copyright (C) 1999, 2001, 2002, 2003, 2006, 2011, 2012
+   Copyright (C) 1999, 2001-2003, 2006, 2011-2012
 	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -21,8 +21,6 @@
 #include <sysdeps/powerpc/sysdep.h>
 
 #ifdef __ASSEMBLER__
-
-#ifdef __ELF__
 
 /* If compiled for profiling, call `_mcount' at the start of each
    function.  */
@@ -160,6 +158,4 @@
 /* Label in text section.  */
 #define C_TEXT(name) name
 
-#endif /* __ELF__ */
-
 #endif	/* __ASSEMBLER__ */

Modified: fsf/trunk/libc/sysdeps/powerpc/powerpc64/sysdep.h
==============================================================================
--- fsf/trunk/libc/sysdeps/powerpc/powerpc64/sysdep.h (original)
+++ fsf/trunk/libc/sysdeps/powerpc/powerpc64/sysdep.h Tue Feb  7 00:02:33 2012
@@ -1,5 +1,5 @@
 /* Assembly macros for 64-bit PowerPC.
-   Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2002-2004, 2006, 2012 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
@@ -18,8 +18,6 @@
    02110-1301 USA.  */
 
 #include <sysdeps/powerpc/sysdep.h>
-
-#ifdef __ELF__
 
 #ifdef __ASSEMBLER__
 
@@ -313,5 +311,3 @@
 #endif
 
 #endif	/* __ASSEMBLER__ */
-
-#endif /* __ELF__ */

Modified: fsf/trunk/libc/sysdeps/powerpc/sysdep.h
==============================================================================
--- fsf/trunk/libc/sysdeps/powerpc/sysdep.h (original)
+++ fsf/trunk/libc/sysdeps/powerpc/sysdep.h Tue Feb  7 00:02:33 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2001, 2002, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2001-2002, 2006, 2012 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
@@ -169,14 +169,10 @@
 #define VRSAVE	256
 
 
-#ifdef __ELF__
-
 /* This seems to always be the case on PPC.  */
 #define ALIGNARG(log2) log2
 /* For ELF we need the `.type' directive to make shared libs work right.  */
 #define ASM_TYPE_DIRECTIVE(name,typearg) .type name,typearg;
 #define ASM_SIZE_DIRECTIVE(name) .size name,.-name
 
-#endif /* __ELF__ */
 #endif	/* __ASSEMBLER__ */
-

Modified: fsf/trunk/libc/sysdeps/s390/asm-syntax.h
==============================================================================
--- fsf/trunk/libc/sysdeps/s390/asm-syntax.h (original)
+++ fsf/trunk/libc/sysdeps/s390/asm-syntax.h Tue Feb  7 00:02:33 2012
@@ -22,8 +22,4 @@
 #define ALIGN(log) .align 1<<log
 
 #undef L
-#ifdef __ELF__
-# define L(body) .L##body
-#else
-# define L(body) L##body
-#endif
+#define L(body) .L##body

Modified: fsf/trunk/libc/sysdeps/x86_64/fpu/e_log10l.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/fpu/e_log10l.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/fpu/e_log10l.S Tue Feb  7 00:02:33 2012
@@ -10,11 +10,8 @@
 
 #include <machine/asm.h>
 
-#ifdef __ELF__
 	.section .rodata.cst8,"aM",@progbits,8
-#else
-	.text
-#endif
+
 	.p2align 3
 	ASM_TYPE_DIRECTIVE(one,@object)
 one:	.double 1.0

Modified: fsf/trunk/libc/sysdeps/x86_64/fpu/e_log2l.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/fpu/e_log2l.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/fpu/e_log2l.S Tue Feb  7 00:02:33 2012
@@ -9,11 +9,8 @@
 
 #include <machine/asm.h>
 
-#ifdef __ELF__
 	.section .rodata.cst8,"aM",@progbits,8
-#else
-	.text
-#endif
+
 	.p2align 3
 	ASM_TYPE_DIRECTIVE(one,@object)
 one:	.double 1.0

Modified: fsf/trunk/libc/sysdeps/x86_64/fpu/e_logl.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/fpu/e_logl.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/fpu/e_logl.S Tue Feb  7 00:02:33 2012
@@ -9,11 +9,8 @@
 #include <machine/asm.h>
 
 
-#ifdef __ELF__
 	.section .rodata.cst8,"aM",@progbits,8
-#else
-	.text
-#endif
+
 	.p2align 3
 	ASM_TYPE_DIRECTIVE(one,@object)
 one:	.double 1.0

Modified: fsf/trunk/libc/sysdeps/x86_64/fpu/e_powl.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/fpu/e_powl.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/fpu/e_powl.S Tue Feb  7 00:02:33 2012
@@ -1,5 +1,5 @@
 /* ix87 specific implementation of pow function.
-   Copyright (C) 1996, 1997, 1998, 1999, 2001, 2004, 2007, 2011
+   Copyright (C) 1996-1999, 2001, 2004, 2007, 2011-2012
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
@@ -21,11 +21,8 @@
 
 #include <machine/asm.h>
 
-#ifdef __ELF__
 	.section .rodata.cst8,"aM",@progbits,8
-#else
-	.text
-#endif
+
 	.p2align 3
 	ASM_TYPE_DIRECTIVE(one,@object)
 one:	.double 1.0
@@ -37,11 +34,8 @@
 p63:	.byte 0, 0, 0, 0, 0, 0, 0xe0, 0x43
 	ASM_SIZE_DIRECTIVE(p63)
 
-#ifdef __ELF__
 	.section .rodata.cst16,"aM",@progbits,16
-#else
-	.text
-#endif
+
 	.p2align 3
 	ASM_TYPE_DIRECTIVE(infinity,@object)
 inf_zero:

Modified: fsf/trunk/libc/sysdeps/x86_64/fpu/e_scalbl.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/fpu/e_scalbl.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/fpu/e_scalbl.S Tue Feb  7 00:02:33 2012
@@ -10,11 +10,7 @@
 
 #include <machine/asm.h>
 
-#ifdef __ELF__
 	.section .rodata
-#else
-	.text
-#endif
 
 	.align ALIGNARG(4)
 	ASM_TYPE_DIRECTIVE(zero_nan,@object)

Modified: fsf/trunk/libc/sysdeps/x86_64/fpu/s_copysign.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/fpu/s_copysign.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/fpu/s_copysign.S Tue Feb  7 00:02:33 2012
@@ -1,5 +1,5 @@
 /* copy sign, double version.
-   Copyright (C) 2002, 2006, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006, 2011-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Andreas Jaeger <aj@xxxxxxx>, 2002.
 
@@ -20,11 +20,7 @@
 
 #include <machine/asm.h>
 
-#ifdef __ELF__
 	.section .rodata.cst16,"aM",@progbits,16
-#else
-	.text
-#endif
 
 	.align ALIGNARG(4)
 	ASM_TYPE_DIRECTIVE(signmask,@object)

Modified: fsf/trunk/libc/sysdeps/x86_64/fpu/s_copysignf.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/fpu/s_copysignf.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/fpu/s_copysignf.S Tue Feb  7 00:02:33 2012
@@ -1,5 +1,5 @@
 /* copy sign, double version.
-   Copyright (C) 2002, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006, 2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Andreas Jaeger <aj@xxxxxxx>, 2002.
 
@@ -20,11 +20,7 @@
 
 #include <machine/asm.h>
 
-#ifdef __ELF__
 	.section .rodata
-#else
-	.text
-#endif
 
 	.align ALIGNARG(4)
 	ASM_TYPE_DIRECTIVE(mask,@object)

Modified: fsf/trunk/libc/sysdeps/x86_64/fpu/s_expm1l.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/fpu/s_expm1l.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/fpu/s_expm1l.S Tue Feb  7 00:02:33 2012
@@ -1,5 +1,5 @@
 /* ix87 specific implementation of exp(x)-1.
-   Copyright (C) 1996,1997,2001,2002,2008,2009 Free Software Foundation, Inc.
+   Copyright (C) 1996,1997,2001,2002,2008,2009,2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
    Based on code by John C. Bowman <bowman@xxxxxxxxxxxxxxxxxxx>.
@@ -24,11 +24,8 @@
 
 #include <machine/asm.h>
 
-#ifdef __ELF__
 	.section .rodata
-#else
-	.text
-#endif
+
 	.align ALIGNARG(4)
 	ASM_TYPE_DIRECTIVE(minus1,@object)
 minus1:	.double -1.0

Modified: fsf/trunk/libc/sysdeps/x86_64/fpu/s_log1pl.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/fpu/s_log1pl.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/fpu/s_log1pl.S Tue Feb  7 00:02:33 2012
@@ -10,11 +10,8 @@
 
 RCSID("$NetBSD: s_log1p.S,v 1.7 1995/05/09 00:10:58 jtc Exp $")
 
-#ifdef __ELF__
 	.section .rodata
-#else
-	.text
-#endif
+
 	.align ALIGNARG(4)
 	/* The fyl2xp1 can only be used for values in
 		-1 + sqrt(2) / 2 <= x <= 1 - sqrt(2) / 2

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits