aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Polacek <polacek@redhat.com>2012-02-07 00:41:11 +0100
committerMarek Polacek <polacek@redhat.com>2012-02-07 00:41:11 +0100
commit622c86f48086403c889a2a16f2f09badde0eac7d (patch)
tree52a39629345270d5b4f4777cdf548f3ddd5314fc
parentd4a54ac6494dd47a9c3d490e02897c69c0432341 (diff)
downloadglibc-622c86f48086403c889a2a16f2f09badde0eac7d.tar.xz
glibc-622c86f48086403c889a2a16f2f09badde0eac7d.zip
Remove __ELF__ conditionals
-rw-r--r--ChangeLog57
-rw-r--r--sysdeps/i386/asm-syntax.h6
-rw-r--r--sysdeps/i386/fpu/e_acosh.S6
-rw-r--r--sysdeps/i386/fpu/e_acoshf.S6
-rw-r--r--sysdeps/i386/fpu/e_acoshl.S6
-rw-r--r--sysdeps/i386/fpu/e_atanh.S6
-rw-r--r--sysdeps/i386/fpu/e_atanhf.S6
-rw-r--r--sysdeps/i386/fpu/e_atanhl.S6
-rw-r--r--sysdeps/i386/fpu/e_log.S5
-rw-r--r--sysdeps/i386/fpu/e_log10.S5
-rw-r--r--sysdeps/i386/fpu/e_log10f.S5
-rw-r--r--sysdeps/i386/fpu/e_log10l.S5
-rw-r--r--sysdeps/i386/fpu/e_log2.S5
-rw-r--r--sysdeps/i386/fpu/e_log2f.S5
-rw-r--r--sysdeps/i386/fpu/e_log2l.S5
-rw-r--r--sysdeps/i386/fpu/e_logf.S5
-rw-r--r--sysdeps/i386/fpu/e_logl.S5
-rw-r--r--sysdeps/i386/fpu/e_pow.S12
-rw-r--r--sysdeps/i386/fpu/e_powf.S12
-rw-r--r--sysdeps/i386/fpu/e_powl.S12
-rw-r--r--sysdeps/i386/fpu/e_scalb.S4
-rw-r--r--sysdeps/i386/fpu/e_scalbf.S4
-rw-r--r--sysdeps/i386/fpu/e_scalbl.S4
-rw-r--r--sysdeps/i386/fpu/s_asinh.S6
-rw-r--r--sysdeps/i386/fpu/s_asinhf.S6
-rw-r--r--sysdeps/i386/fpu/s_asinhl.S6
-rw-r--r--sysdeps/i386/fpu/s_cbrt.S6
-rw-r--r--sysdeps/i386/fpu/s_cbrtf.S6
-rw-r--r--sysdeps/i386/fpu/s_cbrtl.S6
-rw-r--r--sysdeps/i386/fpu/s_cexp.S7
-rw-r--r--sysdeps/i386/fpu/s_cexpf.S7
-rw-r--r--sysdeps/i386/fpu/s_cexpl.S7
-rw-r--r--sysdeps/i386/fpu/s_expm1.S7
-rw-r--r--sysdeps/i386/fpu/s_expm1f.S7
-rw-r--r--sysdeps/i386/fpu/s_expm1l.S7
-rw-r--r--sysdeps/i386/fpu/s_frexp.S6
-rw-r--r--sysdeps/i386/fpu/s_frexpf.S6
-rw-r--r--sysdeps/i386/fpu/s_frexpl.S6
-rw-r--r--sysdeps/i386/fpu/s_log1p.S5
-rw-r--r--sysdeps/i386/fpu/s_log1pf.S5
-rw-r--r--sysdeps/i386/fpu/s_log1pl.S5
-rw-r--r--sysdeps/i386/i686/fpu/e_logl.S5
-rw-r--r--sysdeps/powerpc/powerpc32/sysdep.h6
-rw-r--r--sysdeps/powerpc/powerpc64/sysdep.h6
-rw-r--r--sysdeps/powerpc/sysdep.h6
-rw-r--r--sysdeps/s390/asm-syntax.h6
-rw-r--r--sysdeps/x86_64/fpu/e_log10l.S5
-rw-r--r--sysdeps/x86_64/fpu/e_log2l.S5
-rw-r--r--sysdeps/x86_64/fpu/e_logl.S5
-rw-r--r--sysdeps/x86_64/fpu/e_powl.S12
-rw-r--r--sysdeps/x86_64/fpu/e_scalbl.S4
-rw-r--r--sysdeps/x86_64/fpu/s_copysign.S6
-rw-r--r--sysdeps/x86_64/fpu/s_copysignf.S6
-rw-r--r--sysdeps/x86_64/fpu/s_expm1l.S7
-rw-r--r--sysdeps/x86_64/fpu/s_log1pl.S5
55 files changed, 122 insertions, 265 deletions
diff --git a/ChangeLog b/ChangeLog
index 0f743112ca..cb83d86f55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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