diff options
author | Marek Polacek <polacek@redhat.com> | 2012-02-07 00:41:11 +0100 |
---|---|---|
committer | Marek Polacek <polacek@redhat.com> | 2012-02-07 00:41:11 +0100 |
commit | 622c86f48086403c889a2a16f2f09badde0eac7d (patch) | |
tree | 52a39629345270d5b4f4777cdf548f3ddd5314fc | |
parent | d4a54ac6494dd47a9c3d490e02897c69c0432341 (diff) | |
download | glibc-622c86f48086403c889a2a16f2f09badde0eac7d.tar.gz |
Remove __ELF__ conditionals
55 files changed, 122 insertions, 265 deletions
@@ -1,3 +1,60 @@ +2012-02-06 Marek Polacek <polacek@redhat.com> + + * 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@codesourcery.com> [BZ #411] diff --git a/sysdeps/i386/asm-syntax.h b/sysdeps/i386/asm-syntax.h index 4b9fd20d0d..d7315ceabe 100644 --- a/sysdeps/i386/asm-syntax.h +++ b/sysdeps/i386/asm-syntax.h @@ -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 diff --git a/sysdeps/i386/fpu/e_acosh.S b/sysdeps/i386/fpu/e_acosh.S index fc65c295c5..9f0984a244 100644 --- a/sysdeps/i386/fpu/e_acosh.S +++ b/sysdeps/i386/fpu/e_acosh.S @@ -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@cygnus.com>, 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) diff --git a/sysdeps/i386/fpu/e_acoshf.S b/sysdeps/i386/fpu/e_acoshf.S index b55004b62d..0719bdf21c 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 <drepper@cygnus.com>, 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) diff --git a/sysdeps/i386/fpu/e_acoshl.S b/sysdeps/i386/fpu/e_acoshl.S index 76bc0d7521..469d551bae 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 <drepper@cygnus.com>, 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 diff --git a/sysdeps/i386/fpu/e_atanh.S b/sysdeps/i386/fpu/e_atanh.S index d7e53a2882..f91e36f65d 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 <drepper@cygnus.com>, 1996. @@ -20,11 +20,7 @@ #include <machine/asm.h> -#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 00ad9142f2..591d81b8d5 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 <drepper@cygnus.com>, 1996. @@ -20,11 +20,7 @@ #include <machine/asm.h> -#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 cc70e73f4b..386d2373fa 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 <drepper@cygnus.com>, 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 diff --git a/sysdeps/i386/fpu/e_log.S b/sysdeps/i386/fpu/e_log.S index a2e4d89a40..e4fffb80d3 100644 --- a/sysdeps/i386/fpu/e_log.S +++ b/sysdeps/i386/fpu/e_log.S @@ -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 diff --git a/sysdeps/i386/fpu/e_log10.S b/sysdeps/i386/fpu/e_log10.S index 9d24d74024..b54bf0ed0e 100644 --- a/sysdeps/i386/fpu/e_log10.S +++ b/sysdeps/i386/fpu/e_log10.S @@ -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 diff --git a/sysdeps/i386/fpu/e_log10f.S b/sysdeps/i386/fpu/e_log10f.S index 38a4833d1a..344110c1a4 100644 --- a/sysdeps/i386/fpu/e_log10f.S +++ b/sysdeps/i386/fpu/e_log10f.S @@ -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 diff --git a/sysdeps/i386/fpu/e_log10l.S b/sysdeps/i386/fpu/e_log10l.S index 88b309d539..eeb49c6636 100644 --- a/sysdeps/i386/fpu/e_log10l.S +++ b/sysdeps/i386/fpu/e_log10l.S @@ -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 diff --git a/sysdeps/i386/fpu/e_log2.S b/sysdeps/i386/fpu/e_log2.S index 88aee7f3ca..cc377637f6 100644 --- a/sysdeps/i386/fpu/e_log2.S +++ b/sysdeps/i386/fpu/e_log2.S @@ -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 diff --git a/sysdeps/i386/fpu/e_log2f.S b/sysdeps/i386/fpu/e_log2f.S index 20144875fd..59f4f212e3 100644 --- a/sysdeps/i386/fpu/e_log2f.S +++ b/sysdeps/i386/fpu/e_log2f.S @@ -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 diff --git a/sysdeps/i386/fpu/e_log2l.S b/sysdeps/i386/fpu/e_log2l.S index bc79dea2da..4693f6c717 100644 --- a/sysdeps/i386/fpu/e_log2l.S +++ b/sysdeps/i386/fpu/e_log2l.S @@ -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 diff --git a/sysdeps/i386/fpu/e_logf.S b/sysdeps/i386/fpu/e_logf.S index 1992cc2f82..e277a2f5ec 100644 --- a/sysdeps/i386/fpu/e_logf.S +++ b/sysdeps/i386/fpu/e_logf.S @@ -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 diff --git a/sysdeps/i386/fpu/e_logl.S b/sysdeps/i386/fpu/e_logl.S index bfb72a30e9..7b52b3b2d4 100644 --- a/sysdeps/i386/fpu/e_logl.S +++ b/sysdeps/i386/fpu/e_logl.S @@ -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 diff --git a/sysdeps/i386/fpu/e_pow.S b/sysdeps/i386/fpu/e_pow.S index dccc677520..5a10082056 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 <drepper@cygnus.com>, 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 @@ 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 99c95bbdf9..5c758d3a3c 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 <drepper@cygnus.com>, 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 @@ 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 34ace3576b..fcfe8f1924 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 <drepper@cygnus.com>, 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 @@ 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 0f3ec96196..1d8d2dd01f 100644 --- a/sysdeps/i386/fpu/e_scalb.S +++ b/sysdeps/i386/fpu/e_scalb.S @@ -7,11 +7,7 @@ #include <machine/asm.h> -#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 d11ca66d19..0967dbdc2d 100644 --- a/sysdeps/i386/fpu/e_scalbf.S +++ b/sysdeps/i386/fpu/e_scalbf.S @@ -8,11 +8,7 @@ #include <machine/asm.h> -#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 d8b2169714..434fce46f3 100644 --- a/sysdeps/i386/fpu/e_scalbl.S +++ b/sysdeps/i386/fpu/e_scalbl.S @@ -9,11 +9,7 @@ #include <machine/asm.h> -#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 ca042b414b..c64fbdfd80 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 <drepper@cygnus.com>, 1996. @@ -20,11 +20,7 @@ #include <machine/asm.h> -#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 d0ce6afc22..4616e0d3cb 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 <drepper@cygnus.com>, 1996. @@ -20,11 +20,7 @@ #include <machine/asm.h> -#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 1040eead1c..ab5d249b9e 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 <drepper@cygnus.com>, 1996. @@ -20,11 +20,7 @@ #include <machine/asm.h> -#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 e180b15466..fcb0bd6a10 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 <dirka@uni-paderborn.de> and Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -21,11 +21,7 @@ #include <machine/asm.h> -#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 2ff4f6e088..9190043845 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 <dirka@uni-paderborn.de> and Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -21,11 +21,7 @@ #include <machine/asm.h> -#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 637ad729c1..2a9a0f3a92 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 <dirka@uni-paderborn.de> and Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -21,11 +21,7 @@ #include <machine/asm.h> -#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 47e3eb66a6..55393899bd 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 <drepper@cygnus.com>, 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: diff --git a/sysdeps/i386/fpu/s_cexpf.S b/sysdeps/i386/fpu/s_cexpf.S index f116854096..680f8e5ee3 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 <drepper@cygnus.com>, 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: diff --git a/sysdeps/i386/fpu/s_cexpl.S b/sysdeps/i386/fpu/s_cexpl.S index 8bb0680bce..627ed34d73 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 <drepper@cygnus.com>, 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: diff --git a/sysdeps/i386/fpu/s_expm1.S b/sysdeps/i386/fpu/s_expm1.S index c690a458f8..16e2b30248 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 <drepper@cygnus.com>, 1996. Based on code by John C. Bowman <bowman@ipp-garching.mpg.de>. @@ -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 diff --git a/sysdeps/i386/fpu/s_expm1f.S b/sysdeps/i386/fpu/s_expm1f.S index 8645107274..48af651eaf 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 <drepper@cygnus.com>, 1996. Based on code by John C. Bowman <bowman@ipp-garching.mpg.de>. @@ -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 diff --git a/sysdeps/i386/fpu/s_expm1l.S b/sysdeps/i386/fpu/s_expm1l.S index 60b5b82e20..093454cf50 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 <drepper@cygnus.com>, 1996. Based on code by John C. Bowman <bowman@ipp-garching.mpg.de>. @@ -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 diff --git a/sysdeps/i386/fpu/s_frexp.S b/sysdeps/i386/fpu/s_frexp.S index cfc822106e..7c2806f36d 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 <drepper@cygnus.com>, 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 8640bbc223..ef3fabb66c 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 <drepper@cygnus.com>, 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 60ae57ee3e..fc6729457c 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 <drepper@cygnus.com>, 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 ec777fdf93..797a2abf62 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 6919ac902e..1e7f2e1c5f 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 4bca67d6b0..93c07b637c 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 4e79a5a4b5..be2116cb36 100644 --- a/sysdeps/i386/i686/fpu/e_logl.S +++ b/sysdeps/i386/i686/fpu/e_logl.S @@ -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 diff --git a/sysdeps/powerpc/powerpc32/sysdep.h b/sysdeps/powerpc/powerpc32/sysdep.h index eb04afbcd6..01e27eee89 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 5fc6e4f2f3..4ad45ea5c3 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 <sysdeps/powerpc/sysdep.h> -#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 f5c79c54ef..8a91391971 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 98dc6e866e..abb46881be 100644 --- a/sysdeps/s390/asm-syntax.h +++ b/sysdeps/s390/asm-syntax.h @@ -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 diff --git a/sysdeps/x86_64/fpu/e_log10l.S b/sysdeps/x86_64/fpu/e_log10l.S index 50c58757af..ebc809e831 100644 --- a/sysdeps/x86_64/fpu/e_log10l.S +++ b/sysdeps/x86_64/fpu/e_log10l.S @@ -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 diff --git a/sysdeps/x86_64/fpu/e_log2l.S b/sysdeps/x86_64/fpu/e_log2l.S index 78dc2d5c0e..140b93d101 100644 --- a/sysdeps/x86_64/fpu/e_log2l.S +++ b/sysdeps/x86_64/fpu/e_log2l.S @@ -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 diff --git a/sysdeps/x86_64/fpu/e_logl.S b/sysdeps/x86_64/fpu/e_logl.S index 2503b9a013..8876dc2189 100644 --- a/sysdeps/x86_64/fpu/e_logl.S +++ b/sysdeps/x86_64/fpu/e_logl.S @@ -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 diff --git a/sysdeps/x86_64/fpu/e_powl.S b/sysdeps/x86_64/fpu/e_powl.S index a65c465ec7..c24b60c148 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 <drepper@cygnus.com>, 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 @@ 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 5833321a19..8394310c97 100644 --- a/sysdeps/x86_64/fpu/e_scalbl.S +++ b/sysdeps/x86_64/fpu/e_scalbl.S @@ -10,11 +10,7 @@ #include <machine/asm.h> -#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 66c36c88eb..9cbb6cb994 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 <aj@suse.de>, 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) diff --git a/sysdeps/x86_64/fpu/s_copysignf.S b/sysdeps/x86_64/fpu/s_copysignf.S index 0fbe1d4c96..b4778146e4 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 <aj@suse.de>, 2002. @@ -20,11 +20,7 @@ #include <machine/asm.h> -#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 c0b93e94a9..9be1c6904a 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 <drepper@cygnus.com>, 1996. Based on code by John C. Bowman <bowman@ipp-garching.mpg.de>. @@ -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 diff --git a/sysdeps/x86_64/fpu/s_log1pl.S b/sysdeps/x86_64/fpu/s_log1pl.S index ac2bd22a4f..b4dbcdfa1a 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 |