From 622c86f48086403c889a2a16f2f09badde0eac7d Mon Sep 17 00:00:00 2001 From: Marek Polacek Date: Tue, 7 Feb 2012 00:41:11 +0100 Subject: [PATCH] Remove __ELF__ conditionals --- ChangeLog | 57 ++++++++++++++++++++++++++++++ sysdeps/i386/asm-syntax.h | 6 +--- sysdeps/i386/fpu/e_acosh.S | 6 +--- sysdeps/i386/fpu/e_acoshf.S | 6 +--- sysdeps/i386/fpu/e_acoshl.S | 6 +--- sysdeps/i386/fpu/e_atanh.S | 6 +--- sysdeps/i386/fpu/e_atanhf.S | 6 +--- sysdeps/i386/fpu/e_atanhl.S | 6 +--- sysdeps/i386/fpu/e_log.S | 5 +-- sysdeps/i386/fpu/e_log10.S | 5 +-- sysdeps/i386/fpu/e_log10f.S | 5 +-- sysdeps/i386/fpu/e_log10l.S | 5 +-- sysdeps/i386/fpu/e_log2.S | 5 +-- sysdeps/i386/fpu/e_log2f.S | 5 +-- sysdeps/i386/fpu/e_log2l.S | 5 +-- sysdeps/i386/fpu/e_logf.S | 5 +-- sysdeps/i386/fpu/e_logl.S | 5 +-- sysdeps/i386/fpu/e_pow.S | 12 ++----- sysdeps/i386/fpu/e_powf.S | 12 ++----- sysdeps/i386/fpu/e_powl.S | 12 ++----- sysdeps/i386/fpu/e_scalb.S | 4 --- sysdeps/i386/fpu/e_scalbf.S | 4 --- sysdeps/i386/fpu/e_scalbl.S | 4 --- sysdeps/i386/fpu/s_asinh.S | 6 +--- sysdeps/i386/fpu/s_asinhf.S | 6 +--- sysdeps/i386/fpu/s_asinhl.S | 6 +--- sysdeps/i386/fpu/s_cbrt.S | 6 +--- sysdeps/i386/fpu/s_cbrtf.S | 6 +--- sysdeps/i386/fpu/s_cbrtl.S | 6 +--- sysdeps/i386/fpu/s_cexp.S | 7 ++-- sysdeps/i386/fpu/s_cexpf.S | 7 ++-- sysdeps/i386/fpu/s_cexpl.S | 7 ++-- sysdeps/i386/fpu/s_expm1.S | 7 ++-- sysdeps/i386/fpu/s_expm1f.S | 7 ++-- sysdeps/i386/fpu/s_expm1l.S | 7 ++-- sysdeps/i386/fpu/s_frexp.S | 6 +--- sysdeps/i386/fpu/s_frexpf.S | 6 +--- sysdeps/i386/fpu/s_frexpl.S | 6 +--- sysdeps/i386/fpu/s_log1p.S | 5 +-- sysdeps/i386/fpu/s_log1pf.S | 5 +-- sysdeps/i386/fpu/s_log1pl.S | 5 +-- sysdeps/i386/i686/fpu/e_logl.S | 5 +-- sysdeps/powerpc/powerpc32/sysdep.h | 6 +--- sysdeps/powerpc/powerpc64/sysdep.h | 6 +--- sysdeps/powerpc/sysdep.h | 6 +--- sysdeps/s390/asm-syntax.h | 6 +--- sysdeps/x86_64/fpu/e_log10l.S | 5 +-- sysdeps/x86_64/fpu/e_log2l.S | 5 +-- sysdeps/x86_64/fpu/e_logl.S | 5 +-- sysdeps/x86_64/fpu/e_powl.S | 12 ++----- sysdeps/x86_64/fpu/e_scalbl.S | 4 --- sysdeps/x86_64/fpu/s_copysign.S | 6 +--- sysdeps/x86_64/fpu/s_copysignf.S | 6 +--- sysdeps/x86_64/fpu/s_expm1l.S | 7 ++-- sysdeps/x86_64/fpu/s_log1pl.S | 5 +-- 55 files changed, 122 insertions(+), 265 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0f743112ca2..cb83d86f55c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,60 @@ +2012-02-06 Marek Polacek + + * 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 [BZ #411] diff --git a/sysdeps/i386/asm-syntax.h b/sysdeps/i386/asm-syntax.h index 4b9fd20d0de..d7315ceabee 100644 --- a/sysdeps/i386/asm-syntax.h +++ b/sysdeps/i386/asm-syntax.h @@ -22,8 +22,4 @@ #define ALIGN(log) .align 1<, 1996. @@ -20,11 +20,7 @@ #include -#ifdef __ELF__ .section .rodata.cst8,"aM",@progbits,8 -#else - .text -#endif .p2align 3 ASM_TYPE_DIRECTIVE(one,@object) diff --git a/sysdeps/i386/fpu/e_acoshf.S b/sysdeps/i386/fpu/e_acoshf.S index b55004b62df..0719bdf21c2 100644 --- a/sysdeps/i386/fpu/e_acoshf.S +++ b/sysdeps/i386/fpu/e_acoshf.S @@ -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 , 1996. @@ -20,11 +20,7 @@ #include -#ifdef __ELF__ .section .rodata.cst8,"aM",@progbits,8 -#else - .text -#endif .p2align 3 ASM_TYPE_DIRECTIVE(one,@object) diff --git a/sysdeps/i386/fpu/e_acoshl.S b/sysdeps/i386/fpu/e_acoshl.S index 76bc0d7521d..469d551bae4 100644 --- a/sysdeps/i386/fpu/e_acoshl.S +++ b/sysdeps/i386/fpu/e_acoshl.S @@ -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 , 1996. @@ -20,11 +20,7 @@ #include -#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 diff --git a/sysdeps/i386/fpu/e_atanh.S b/sysdeps/i386/fpu/e_atanh.S index d7e53a28824..f91e36f65d0 100644 --- a/sysdeps/i386/fpu/e_atanh.S +++ b/sysdeps/i386/fpu/e_atanh.S @@ -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 , 1996. @@ -20,11 +20,7 @@ #include -#ifdef __ELF__ .section .rodata -#else - .text -#endif .align ALIGNARG(4) ASM_TYPE_DIRECTIVE(half,@object) diff --git a/sysdeps/i386/fpu/e_atanhf.S b/sysdeps/i386/fpu/e_atanhf.S index 00ad9142f29..591d81b8d55 100644 --- a/sysdeps/i386/fpu/e_atanhf.S +++ b/sysdeps/i386/fpu/e_atanhf.S @@ -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 , 1996. @@ -20,11 +20,7 @@ #include -#ifdef __ELF__ .section .rodata -#else - .text -#endif .align ALIGNARG(4) ASM_TYPE_DIRECTIVE(half,@object) diff --git a/sysdeps/i386/fpu/e_atanhl.S b/sysdeps/i386/fpu/e_atanhl.S index cc70e73f4ba..386d2373fad 100644 --- a/sysdeps/i386/fpu/e_atanhl.S +++ b/sysdeps/i386/fpu/e_atanhl.S @@ -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 , 1996. @@ -20,11 +20,7 @@ #include -#ifdef __ELF__ .section .rodata -#else - .text -#endif .align ALIGNARG(4) /* Please note that we use double values for 0.5 and 1.0. These diff --git a/sysdeps/i386/fpu/e_log.S b/sysdeps/i386/fpu/e_log.S index a2e4d89a407..e4fffb80d3b 100644 --- a/sysdeps/i386/fpu/e_log.S +++ b/sysdeps/i386/fpu/e_log.S @@ -7,11 +7,8 @@ #include -#ifdef __ELF__ .section .rodata.cst8,"aM",@progbits,8 -#else - .text -#endif + .p2align 3 ASM_TYPE_DIRECTIVE(one,@object) one: .double 1.0 diff --git a/sysdeps/i386/fpu/e_log10.S b/sysdeps/i386/fpu/e_log10.S index 9d24d74024e..b54bf0ed0e9 100644 --- a/sysdeps/i386/fpu/e_log10.S +++ b/sysdeps/i386/fpu/e_log10.S @@ -7,11 +7,8 @@ #include -#ifdef __ELF__ .section .rodata.cst8,"aM",@progbits,8 -#else - .text -#endif + .p2align 3 ASM_TYPE_DIRECTIVE(one,@object) one: .double 1.0 diff --git a/sysdeps/i386/fpu/e_log10f.S b/sysdeps/i386/fpu/e_log10f.S index 38a4833d1ad..344110c1a4e 100644 --- a/sysdeps/i386/fpu/e_log10f.S +++ b/sysdeps/i386/fpu/e_log10f.S @@ -8,11 +8,8 @@ #include -#ifdef __ELF__ .section .rodata.cst8,"aM",@progbits,8 -#else - .text -#endif + .p2align 3 ASM_TYPE_DIRECTIVE(one,@object) one: .double 1.0 diff --git a/sysdeps/i386/fpu/e_log10l.S b/sysdeps/i386/fpu/e_log10l.S index 88b309d5397..eeb49c66361 100644 --- a/sysdeps/i386/fpu/e_log10l.S +++ b/sysdeps/i386/fpu/e_log10l.S @@ -9,11 +9,8 @@ #include -#ifdef __ELF__ .section .rodata.cst8,"aM",@progbits,8 -#else - .text -#endif + .p2align 3 ASM_TYPE_DIRECTIVE(one,@object) one: .double 1.0 diff --git a/sysdeps/i386/fpu/e_log2.S b/sysdeps/i386/fpu/e_log2.S index 88aee7f3caf..cc377637f68 100644 --- a/sysdeps/i386/fpu/e_log2.S +++ b/sysdeps/i386/fpu/e_log2.S @@ -8,11 +8,8 @@ #include -#ifdef __ELF__ .section .rodata.cst8,"aM",@progbits,8 -#else - .text -#endif + .p2align 3 ASM_TYPE_DIRECTIVE(one,@object) one: .double 1.0 diff --git a/sysdeps/i386/fpu/e_log2f.S b/sysdeps/i386/fpu/e_log2f.S index 20144875fd4..59f4f212e3e 100644 --- a/sysdeps/i386/fpu/e_log2f.S +++ b/sysdeps/i386/fpu/e_log2f.S @@ -8,11 +8,8 @@ #include -#ifdef __ELF__ .section .rodata.cst8,"aM",@progbits,8 -#else - .text -#endif + .p2align 3 ASM_TYPE_DIRECTIVE(one,@object) one: .double 1.0 diff --git a/sysdeps/i386/fpu/e_log2l.S b/sysdeps/i386/fpu/e_log2l.S index bc79dea2da9..4693f6c717e 100644 --- a/sysdeps/i386/fpu/e_log2l.S +++ b/sysdeps/i386/fpu/e_log2l.S @@ -8,11 +8,8 @@ #include -#ifdef __ELF__ .section .rodata.cst8,"aM",@progbits,8 -#else - .text -#endif + .p2align 3 ASM_TYPE_DIRECTIVE(one,@object) one: .double 1.0 diff --git a/sysdeps/i386/fpu/e_logf.S b/sysdeps/i386/fpu/e_logf.S index 1992cc2f825..e277a2f5ec4 100644 --- a/sysdeps/i386/fpu/e_logf.S +++ b/sysdeps/i386/fpu/e_logf.S @@ -8,11 +8,8 @@ #include -#ifdef __ELF__ .section .rodata.cst8,"aM",@progbits,8 -#else - .text -#endif + .p2align 3 ASM_TYPE_DIRECTIVE(one,@object) one: .double 1.0 diff --git a/sysdeps/i386/fpu/e_logl.S b/sysdeps/i386/fpu/e_logl.S index bfb72a30e90..7b52b3b2d46 100644 --- a/sysdeps/i386/fpu/e_logl.S +++ b/sysdeps/i386/fpu/e_logl.S @@ -8,11 +8,8 @@ #include -#ifdef __ELF__ .section .rodata.cst8,"aM",@progbits,8 -#else - .text -#endif + .p2align 3 ASM_TYPE_DIRECTIVE(one,@object) one: .double 1.0 diff --git a/sysdeps/i386/fpu/e_pow.S b/sysdeps/i386/fpu/e_pow.S index dccc6775209..5a10082056e 100644 --- a/sysdeps/i386/fpu/e_pow.S +++ b/sysdeps/i386/fpu/e_pow.S @@ -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 , 1996. @@ -21,11 +21,8 @@ #include -#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 @@ limit: .double 0.29 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: diff --git a/sysdeps/i386/fpu/e_powf.S b/sysdeps/i386/fpu/e_powf.S index 99c95bbdf97..5c758d3a3c8 100644 --- a/sysdeps/i386/fpu/e_powf.S +++ b/sysdeps/i386/fpu/e_powf.S @@ -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 , 1996. @@ -21,11 +21,8 @@ #include -#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 @@ limit: .double 0.29 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: diff --git a/sysdeps/i386/fpu/e_powl.S b/sysdeps/i386/fpu/e_powl.S index 34ace3576b5..fcfe8f19247 100644 --- a/sysdeps/i386/fpu/e_powl.S +++ b/sysdeps/i386/fpu/e_powl.S @@ -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 , 1996. @@ -21,11 +21,8 @@ #include -#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 @@ limit: .double 0.29 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: diff --git a/sysdeps/i386/fpu/e_scalb.S b/sysdeps/i386/fpu/e_scalb.S index 0f3ec961963..1d8d2dd01fe 100644 --- a/sysdeps/i386/fpu/e_scalb.S +++ b/sysdeps/i386/fpu/e_scalb.S @@ -7,11 +7,7 @@ #include -#ifdef __ELF__ .section .rodata -#else - .text -#endif .align ALIGNARG(4) ASM_TYPE_DIRECTIVE(zero_nan,@object) diff --git a/sysdeps/i386/fpu/e_scalbf.S b/sysdeps/i386/fpu/e_scalbf.S index d11ca66d199..0967dbdc2d4 100644 --- a/sysdeps/i386/fpu/e_scalbf.S +++ b/sysdeps/i386/fpu/e_scalbf.S @@ -8,11 +8,7 @@ #include -#ifdef __ELF__ .section .rodata -#else - .text -#endif .align ALIGNARG(4) ASM_TYPE_DIRECTIVE(zero_nan,@object) diff --git a/sysdeps/i386/fpu/e_scalbl.S b/sysdeps/i386/fpu/e_scalbl.S index d8b21697144..434fce46f3d 100644 --- a/sysdeps/i386/fpu/e_scalbl.S +++ b/sysdeps/i386/fpu/e_scalbl.S @@ -9,11 +9,7 @@ #include -#ifdef __ELF__ .section .rodata -#else - .text -#endif .align ALIGNARG(4) ASM_TYPE_DIRECTIVE(zero_nan,@object) diff --git a/sysdeps/i386/fpu/s_asinh.S b/sysdeps/i386/fpu/s_asinh.S index ca042b414b3..c64fbdfd805 100644 --- a/sysdeps/i386/fpu/s_asinh.S +++ b/sysdeps/i386/fpu/s_asinh.S @@ -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 , 1996. @@ -20,11 +20,7 @@ #include -#ifdef __ELF__ .section .rodata -#else - .text -#endif .align ALIGNARG(4) ASM_TYPE_DIRECTIVE(huge,@object) diff --git a/sysdeps/i386/fpu/s_asinhf.S b/sysdeps/i386/fpu/s_asinhf.S index d0ce6afc222..4616e0d3cb4 100644 --- a/sysdeps/i386/fpu/s_asinhf.S +++ b/sysdeps/i386/fpu/s_asinhf.S @@ -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 , 1996. @@ -20,11 +20,7 @@ #include -#ifdef __ELF__ .section .rodata -#else - .text -#endif .align ALIGNARG(4) ASM_TYPE_DIRECTIVE(huge,@object) diff --git a/sysdeps/i386/fpu/s_asinhl.S b/sysdeps/i386/fpu/s_asinhl.S index 1040eead1c5..ab5d249b9e6 100644 --- a/sysdeps/i386/fpu/s_asinhl.S +++ b/sysdeps/i386/fpu/s_asinhl.S @@ -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 , 1996. @@ -20,11 +20,7 @@ #include -#ifdef __ELF__ .section .rodata -#else - .text -#endif .align ALIGNARG(4) ASM_TYPE_DIRECTIVE(huge,@object) diff --git a/sysdeps/i386/fpu/s_cbrt.S b/sysdeps/i386/fpu/s_cbrt.S index e180b154669..fcb0bd6a103 100644 --- a/sysdeps/i386/fpu/s_cbrt.S +++ b/sysdeps/i386/fpu/s_cbrt.S @@ -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 and Ulrich Drepper , 1997. @@ -21,11 +21,7 @@ #include -#ifdef __ELF__ .section .rodata -#else - .text -#endif .align ALIGNARG(4) ASM_TYPE_DIRECTIVE(f7,@object) diff --git a/sysdeps/i386/fpu/s_cbrtf.S b/sysdeps/i386/fpu/s_cbrtf.S index 2ff4f6e0884..91900438456 100644 --- a/sysdeps/i386/fpu/s_cbrtf.S +++ b/sysdeps/i386/fpu/s_cbrtf.S @@ -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 and Ulrich Drepper , 1997. @@ -21,11 +21,7 @@ #include -#ifdef __ELF__ .section .rodata -#else - .text -#endif .align ALIGNARG(4) ASM_TYPE_DIRECTIVE(f3,@object) diff --git a/sysdeps/i386/fpu/s_cbrtl.S b/sysdeps/i386/fpu/s_cbrtl.S index 637ad729c13..2a9a0f3a92b 100644 --- a/sysdeps/i386/fpu/s_cbrtl.S +++ b/sysdeps/i386/fpu/s_cbrtl.S @@ -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 and Ulrich Drepper , 1997. @@ -21,11 +21,7 @@ #include -#ifdef __ELF__ .section .rodata -#else - .text -#endif .align ALIGNARG(4) ASM_TYPE_DIRECTIVE(f8,@object) diff --git a/sysdeps/i386/fpu/s_cexp.S b/sysdeps/i386/fpu/s_cexp.S index 47e3eb66a6a..55393899bd1 100644 --- a/sysdeps/i386/fpu/s_cexp.S +++ b/sysdeps/i386/fpu/s_cexp.S @@ -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 , 1997. @@ -20,11 +20,8 @@ #include -#ifdef __ELF__ .section .rodata -#else - .text -#endif + .align ALIGNARG(4) ASM_TYPE_DIRECTIVE(huge_nan_null_null,@object) huge_nan_null_null: diff --git a/sysdeps/i386/fpu/s_cexpf.S b/sysdeps/i386/fpu/s_cexpf.S index f116854096e..680f8e5ee39 100644 --- a/sysdeps/i386/fpu/s_cexpf.S +++ b/sysdeps/i386/fpu/s_cexpf.S @@ -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 , 1997. @@ -20,11 +20,8 @@ #include -#ifdef __ELF__ .section .rodata -#else - .text -#endif + .align ALIGNARG(4) ASM_TYPE_DIRECTIVE(huge_nan_null_null,@object) huge_nan_null_null: diff --git a/sysdeps/i386/fpu/s_cexpl.S b/sysdeps/i386/fpu/s_cexpl.S index 8bb0680bcee..627ed34d73b 100644 --- a/sysdeps/i386/fpu/s_cexpl.S +++ b/sysdeps/i386/fpu/s_cexpl.S @@ -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 , 1997. @@ -20,11 +20,8 @@ #include -#ifdef __ELF__ .section .rodata -#else - .text -#endif + .align ALIGNARG(4) ASM_TYPE_DIRECTIVE(huge_nan_null_null,@object) huge_nan_null_null: diff --git a/sysdeps/i386/fpu/s_expm1.S b/sysdeps/i386/fpu/s_expm1.S index c690a458f84..16e2b302484 100644 --- a/sysdeps/i386/fpu/s_expm1.S +++ b/sysdeps/i386/fpu/s_expm1.S @@ -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 , 1996. Based on code by John C. Bowman . @@ -25,11 +25,8 @@ #include #include -#ifdef __ELF__ .section .rodata -#else - .text -#endif + .align ALIGNARG(4) ASM_TYPE_DIRECTIVE(minus1,@object) minus1: .double -1.0 diff --git a/sysdeps/i386/fpu/s_expm1f.S b/sysdeps/i386/fpu/s_expm1f.S index 8645107274d..48af651eafb 100644 --- a/sysdeps/i386/fpu/s_expm1f.S +++ b/sysdeps/i386/fpu/s_expm1f.S @@ -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 , 1996. Based on code by John C. Bowman . @@ -25,11 +25,8 @@ #include #include -#ifdef __ELF__ .section .rodata -#else - .text -#endif + .align ALIGNARG(4) ASM_TYPE_DIRECTIVE(minus1,@object) minus1: .double -1.0 diff --git a/sysdeps/i386/fpu/s_expm1l.S b/sysdeps/i386/fpu/s_expm1l.S index 60b5b82e207..093454cf500 100644 --- a/sysdeps/i386/fpu/s_expm1l.S +++ b/sysdeps/i386/fpu/s_expm1l.S @@ -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 , 1996. Based on code by John C. Bowman . @@ -25,11 +25,8 @@ #include #include -#ifdef __ELF__ .section .rodata -#else - .text -#endif + .align ALIGNARG(4) ASM_TYPE_DIRECTIVE(minus1,@object) minus1: .double -1.0 diff --git a/sysdeps/i386/fpu/s_frexp.S b/sysdeps/i386/fpu/s_frexp.S index cfc822106e4..7c2806f36d4 100644 --- a/sysdeps/i386/fpu/s_frexp.S +++ b/sysdeps/i386/fpu/s_frexp.S @@ -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 , 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) diff --git a/sysdeps/i386/fpu/s_frexpf.S b/sysdeps/i386/fpu/s_frexpf.S index 8640bbc223a..ef3fabb66cd 100644 --- a/sysdeps/i386/fpu/s_frexpf.S +++ b/sysdeps/i386/fpu/s_frexpf.S @@ -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 , 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) diff --git a/sysdeps/i386/fpu/s_frexpl.S b/sysdeps/i386/fpu/s_frexpl.S index 60ae57ee3e3..fc6729457ce 100644 --- a/sysdeps/i386/fpu/s_frexpl.S +++ b/sysdeps/i386/fpu/s_frexpl.S @@ -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 , 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) diff --git a/sysdeps/i386/fpu/s_log1p.S b/sysdeps/i386/fpu/s_log1p.S index ec777fdf933..797a2abf625 100644 --- a/sysdeps/i386/fpu/s_log1p.S +++ b/sysdeps/i386/fpu/s_log1p.S @@ -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 diff --git a/sysdeps/i386/fpu/s_log1pf.S b/sysdeps/i386/fpu/s_log1pf.S index 6919ac902ea..1e7f2e1c5f8 100644 --- a/sysdeps/i386/fpu/s_log1pf.S +++ b/sysdeps/i386/fpu/s_log1pf.S @@ -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 diff --git a/sysdeps/i386/fpu/s_log1pl.S b/sysdeps/i386/fpu/s_log1pl.S index 4bca67d6b04..93c07b637c1 100644 --- a/sysdeps/i386/fpu/s_log1pl.S +++ b/sysdeps/i386/fpu/s_log1pl.S @@ -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 diff --git a/sysdeps/i386/i686/fpu/e_logl.S b/sysdeps/i386/i686/fpu/e_logl.S index 4e79a5a4b52..be2116cb36f 100644 --- a/sysdeps/i386/i686/fpu/e_logl.S +++ b/sysdeps/i386/i686/fpu/e_logl.S @@ -9,11 +9,8 @@ #include -#ifdef __ELF__ .section .rodata.cst8,"aM",@progbits,8 -#else - .text -#endif + .p2align 3 ASM_TYPE_DIRECTIVE(one,@object) one: .double 1.0 diff --git a/sysdeps/powerpc/powerpc32/sysdep.h b/sysdeps/powerpc/powerpc32/sysdep.h index eb04afbcd62..01e27eee89e 100644 --- a/sysdeps/powerpc/powerpc32/sysdep.h +++ b/sysdeps/powerpc/powerpc32/sysdep.h @@ -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. @@ -22,8 +22,6 @@ #ifdef __ASSEMBLER__ -#ifdef __ELF__ - /* If compiled for profiling, call `_mcount' at the start of each function. */ #ifdef PROF @@ -160,6 +158,4 @@ GOT_LABEL: ; \ /* Label in text section. */ #define C_TEXT(name) name -#endif /* __ELF__ */ - #endif /* __ASSEMBLER__ */ diff --git a/sysdeps/powerpc/powerpc64/sysdep.h b/sysdeps/powerpc/powerpc64/sysdep.h index 5fc6e4f2f33..4ad45ea5c3b 100644 --- a/sysdeps/powerpc/powerpc64/sysdep.h +++ b/sysdeps/powerpc/powerpc64/sysdep.h @@ -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 @@ -19,8 +19,6 @@ #include -#ifdef __ELF__ - #ifdef __ASSEMBLER__ /* Support macros for CALL_MCOUNT. */ @@ -313,5 +311,3 @@ LT_LABELSUFFIX(name,_name_end): ; \ #endif #endif /* __ASSEMBLER__ */ - -#endif /* __ELF__ */ diff --git a/sysdeps/powerpc/sysdep.h b/sysdeps/powerpc/sysdep.h index f5c79c54efd..8a913919711 100644 --- a/sysdeps/powerpc/sysdep.h +++ b/sysdeps/powerpc/sysdep.h @@ -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__ */ - diff --git a/sysdeps/s390/asm-syntax.h b/sysdeps/s390/asm-syntax.h index 98dc6e866e4..abb46881be9 100644 --- a/sysdeps/s390/asm-syntax.h +++ b/sysdeps/s390/asm-syntax.h @@ -22,8 +22,4 @@ #define ALIGN(log) .align 1< -#ifdef __ELF__ .section .rodata.cst8,"aM",@progbits,8 -#else - .text -#endif + .p2align 3 ASM_TYPE_DIRECTIVE(one,@object) one: .double 1.0 diff --git a/sysdeps/x86_64/fpu/e_log2l.S b/sysdeps/x86_64/fpu/e_log2l.S index 78dc2d5c0e3..140b93d1012 100644 --- a/sysdeps/x86_64/fpu/e_log2l.S +++ b/sysdeps/x86_64/fpu/e_log2l.S @@ -9,11 +9,8 @@ #include -#ifdef __ELF__ .section .rodata.cst8,"aM",@progbits,8 -#else - .text -#endif + .p2align 3 ASM_TYPE_DIRECTIVE(one,@object) one: .double 1.0 diff --git a/sysdeps/x86_64/fpu/e_logl.S b/sysdeps/x86_64/fpu/e_logl.S index 2503b9a013e..8876dc2189e 100644 --- a/sysdeps/x86_64/fpu/e_logl.S +++ b/sysdeps/x86_64/fpu/e_logl.S @@ -9,11 +9,8 @@ #include -#ifdef __ELF__ .section .rodata.cst8,"aM",@progbits,8 -#else - .text -#endif + .p2align 3 ASM_TYPE_DIRECTIVE(one,@object) one: .double 1.0 diff --git a/sysdeps/x86_64/fpu/e_powl.S b/sysdeps/x86_64/fpu/e_powl.S index a65c465ec7c..c24b60c1485 100644 --- a/sysdeps/x86_64/fpu/e_powl.S +++ b/sysdeps/x86_64/fpu/e_powl.S @@ -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 , 1996. @@ -21,11 +21,8 @@ #include -#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 @@ limit: .double 0.29 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: diff --git a/sysdeps/x86_64/fpu/e_scalbl.S b/sysdeps/x86_64/fpu/e_scalbl.S index 5833321a195..8394310c977 100644 --- a/sysdeps/x86_64/fpu/e_scalbl.S +++ b/sysdeps/x86_64/fpu/e_scalbl.S @@ -10,11 +10,7 @@ #include -#ifdef __ELF__ .section .rodata -#else - .text -#endif .align ALIGNARG(4) ASM_TYPE_DIRECTIVE(zero_nan,@object) diff --git a/sysdeps/x86_64/fpu/s_copysign.S b/sysdeps/x86_64/fpu/s_copysign.S index 66c36c88ebd..9cbb6cb9946 100644 --- a/sysdeps/x86_64/fpu/s_copysign.S +++ b/sysdeps/x86_64/fpu/s_copysign.S @@ -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 , 2002. @@ -20,11 +20,7 @@ #include -#ifdef __ELF__ .section .rodata.cst16,"aM",@progbits,16 -#else - .text -#endif .align ALIGNARG(4) ASM_TYPE_DIRECTIVE(signmask,@object) diff --git a/sysdeps/x86_64/fpu/s_copysignf.S b/sysdeps/x86_64/fpu/s_copysignf.S index 0fbe1d4c960..b4778146e43 100644 --- a/sysdeps/x86_64/fpu/s_copysignf.S +++ b/sysdeps/x86_64/fpu/s_copysignf.S @@ -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 , 2002. @@ -20,11 +20,7 @@ #include -#ifdef __ELF__ .section .rodata -#else - .text -#endif .align ALIGNARG(4) ASM_TYPE_DIRECTIVE(mask,@object) diff --git a/sysdeps/x86_64/fpu/s_expm1l.S b/sysdeps/x86_64/fpu/s_expm1l.S index c0b93e94a9e..9be1c6904ac 100644 --- a/sysdeps/x86_64/fpu/s_expm1l.S +++ b/sysdeps/x86_64/fpu/s_expm1l.S @@ -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 , 1996. Based on code by John C. Bowman . @@ -24,11 +24,8 @@ #include -#ifdef __ELF__ .section .rodata -#else - .text -#endif + .align ALIGNARG(4) ASM_TYPE_DIRECTIVE(minus1,@object) minus1: .double -1.0 diff --git a/sysdeps/x86_64/fpu/s_log1pl.S b/sysdeps/x86_64/fpu/s_log1pl.S index ac2bd22a4fc..b4dbcdfa1a5 100644 --- a/sysdeps/x86_64/fpu/s_log1pl.S +++ b/sysdeps/x86_64/fpu/s_log1pl.S @@ -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 -- 2.47.2