This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: [PATCH] Remove __ELF__ conditionals
- From: Marek Polacek <polacek at redhat dot com>
- To: "Carlos O'Donell" <carlos at systemhalted dot org>
- Cc: libc-alpha <libc-alpha at sourceware dot org>, Roland McGrath <roland at hack dot frob dot com>
- Date: Tue, 07 Feb 2012 00:47:18 +0100
- Subject: Re: [PATCH] Remove __ELF__ conditionals
- References: <4F2327F2.9060402@redhat.com> <CADZpyiyWkCEpT=sCdp0qAMs3aX7ZJTR2LtgG208uCA2cOdCk6Q@mail.gmail.com> <4F24689F.7040809@redhat.com> <CADZpyiyNTP-njsiBZxvbnVX6-yuCe6+Jrqif9q2VhQrb+XVg+A@mail.gmail.com>
On 02/03/2012 04:32 PM, Carlos O'Donell wrote:
> Given that Roland finds nothing wrong with the patch and I've done a
> thorough review *twice*, please check this in after adjusting the
> inconsistent use of dateranges for old years.
This is what I committed after all. Thanks,
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.
--- libc/sysdeps/s390/asm-syntax.h.mp 2012-02-06 23:41:36.559417419 +0100
+++ libc/sysdeps/s390/asm-syntax.h 2012-02-06 23:41:50.707425862 +0100
@@ -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
--- libc/sysdeps/i386/fpu/e_powf.S.mp 2012-02-06 23:41:36.516417395 +0100
+++ libc/sysdeps/i386/fpu/e_powf.S 2012-02-07 00:03:04.082593005 +0100
@@ -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:
--- libc/sysdeps/i386/fpu/e_atanhf.S.mp 2012-02-06 23:41:36.496417381 +0100
+++ libc/sysdeps/i386/fpu/e_atanhf.S 2012-02-06 23:41:50.709425862 +0100
@@ -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)
--- libc/sysdeps/i386/fpu/s_cexpl.S.mp 2012-02-06 23:41:36.533417405 +0100
+++ libc/sysdeps/i386/fpu/s_cexpl.S 2012-02-06 23:41:50.711425862 +0100
@@ -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:
--- libc/sysdeps/i386/fpu/e_acosh.S.mp 2012-02-06 23:41:36.475417370 +0100
+++ libc/sysdeps/i386/fpu/e_acosh.S 2012-02-06 23:41:50.712425863 +0100
@@ -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)
--- libc/sysdeps/i386/fpu/e_pow.S.mp 2012-02-06 23:41:36.515417394 +0100
+++ libc/sysdeps/i386/fpu/e_pow.S 2012-02-07 00:17:34.295151343 +0100
@@ -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:
--- libc/sysdeps/i386/fpu/s_asinhl.S.mp 2012-02-06 23:41:36.526417400 +0100
+++ libc/sysdeps/i386/fpu/s_asinhl.S 2012-02-07 00:08:46.284812566 +0100
@@ -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)
--- libc/sysdeps/i386/fpu/e_acoshl.S.mp 2012-02-06 23:41:36.483417375 +0100
+++ libc/sysdeps/i386/fpu/e_acoshl.S 2012-02-07 00:09:05.128824656 +0100
@@ -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
--- libc/sysdeps/i386/fpu/s_expm1.S.mp 2012-02-06 23:41:36.535417407 +0100
+++ libc/sysdeps/i386/fpu/s_expm1.S 2012-02-07 00:09:20.137834287 +0100
@@ -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
--- libc/sysdeps/i386/fpu/s_frexpf.S.mp 2012-02-06 23:41:36.541417408 +0100
+++ libc/sysdeps/i386/fpu/s_frexpf.S 2012-02-06 23:41:50.715425866 +0100
@@ -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)
--- libc/sysdeps/i386/fpu/e_log2.S.mp 2012-02-06 23:41:36.509417389 +0100
+++ libc/sysdeps/i386/fpu/e_log2.S 2012-02-06 23:41:50.716425867 +0100
@@ -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
--- libc/sysdeps/i386/fpu/e_log2l.S.mp 2012-02-06 23:41:36.511417390 +0100
+++ libc/sysdeps/i386/fpu/e_log2l.S 2012-02-06 23:41:50.717425868 +0100
@@ -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
--- libc/sysdeps/i386/fpu/e_scalb.S.mp 2012-02-06 23:41:36.519417395 +0100
+++ libc/sysdeps/i386/fpu/e_scalb.S 2012-02-06 23:41:50.717425868 +0100
@@ -7,11 +7,7 @@
#include <machine/asm.h>
-#ifdef __ELF__
.section .rodata
-#else
- .text
-#endif
.align ALIGNARG(4)
ASM_TYPE_DIRECTIVE(zero_nan,@object)
--- libc/sysdeps/i386/fpu/e_powl.S.mp 2012-02-06 23:41:36.517417395 +0100
+++ libc/sysdeps/i386/fpu/e_powl.S 2012-02-07 00:18:22.263252653 +0100
@@ -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:
--- libc/sysdeps/i386/fpu/s_log1p.S.mp 2012-02-06 23:41:36.544417411 +0100
+++ libc/sysdeps/i386/fpu/s_log1p.S 2012-02-06 23:41:50.719425868 +0100
@@ -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
--- libc/sysdeps/i386/fpu/e_log10f.S.mp 2012-02-06 23:41:36.506417389 +0100
+++ libc/sysdeps/i386/fpu/e_log10f.S 2012-02-06 23:41:50.719425868 +0100
@@ -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
--- libc/sysdeps/i386/fpu/s_cbrtf.S.mp 2012-02-06 23:41:36.528417400 +0100
+++ libc/sysdeps/i386/fpu/s_cbrtf.S 2012-02-06 23:41:50.719425868 +0100
@@ -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)
--- libc/sysdeps/i386/fpu/e_logl.S.mp 2012-02-06 23:41:36.514417393 +0100
+++ libc/sysdeps/i386/fpu/e_logl.S 2012-02-06 23:41:50.720425868 +0100
@@ -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
--- libc/sysdeps/i386/fpu/s_cbrt.S.mp 2012-02-06 23:41:36.527417400 +0100
+++ libc/sysdeps/i386/fpu/s_cbrt.S 2012-02-06 23:41:50.721425869 +0100
@@ -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)
--- libc/sysdeps/i386/fpu/s_expm1l.S.mp 2012-02-06 23:41:36.538417407 +0100
+++ libc/sysdeps/i386/fpu/s_expm1l.S 2012-02-07 00:11:18.452910198 +0100
@@ -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
--- libc/sysdeps/i386/fpu/s_frexpl.S.mp 2012-02-06 23:41:36.542417409 +0100
+++ libc/sysdeps/i386/fpu/s_frexpl.S 2012-02-07 00:11:35.982921445 +0100
@@ -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)
--- libc/sysdeps/i386/fpu/s_expm1f.S.mp 2012-02-06 23:41:36.536417407 +0100
+++ libc/sysdeps/i386/fpu/s_expm1f.S 2012-02-07 00:11:52.866932278 +0100
@@ -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
--- libc/sysdeps/i386/fpu/e_log2f.S.mp 2012-02-06 23:41:36.510417389 +0100
+++ libc/sysdeps/i386/fpu/e_log2f.S 2012-02-06 23:41:50.723425871 +0100
@@ -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
--- libc/sysdeps/i386/fpu/e_acoshf.S.mp 2012-02-06 23:41:36.479417371 +0100
+++ libc/sysdeps/i386/fpu/e_acoshf.S 2012-02-07 00:12:11.523944249 +0100
@@ -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)
--- libc/sysdeps/i386/fpu/e_log.S.mp 2012-02-06 23:41:36.504417388 +0100
+++ libc/sysdeps/i386/fpu/e_log.S 2012-02-06 23:41:50.724425872 +0100
@@ -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
--- libc/sysdeps/i386/fpu/s_cexp.S.mp 2012-02-06 23:41:36.531417403 +0100
+++ libc/sysdeps/i386/fpu/s_cexp.S 2012-02-06 23:41:50.725425873 +0100
@@ -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:
--- libc/sysdeps/i386/fpu/e_scalbf.S.mp 2012-02-06 23:41:36.520417396 +0100
+++ libc/sysdeps/i386/fpu/e_scalbf.S 2012-02-06 23:41:50.725425873 +0100
@@ -8,11 +8,7 @@
#include <machine/asm.h>
-#ifdef __ELF__
.section .rodata
-#else
- .text
-#endif
.align ALIGNARG(4)
ASM_TYPE_DIRECTIVE(zero_nan,@object)
--- libc/sysdeps/i386/fpu/s_log1pl.S.mp 2012-02-06 23:41:36.548417413 +0100
+++ libc/sysdeps/i386/fpu/s_log1pl.S 2012-02-06 23:41:50.726425873 +0100
@@ -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
--- libc/sysdeps/i386/fpu/e_logf.S.mp 2012-02-06 23:41:36.512417391 +0100
+++ libc/sysdeps/i386/fpu/e_logf.S 2012-02-06 23:41:50.726425873 +0100
@@ -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
--- libc/sysdeps/i386/fpu/e_log10l.S.mp 2012-02-06 23:41:36.508417389 +0100
+++ libc/sysdeps/i386/fpu/e_log10l.S 2012-02-06 23:41:50.727425873 +0100
@@ -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
--- libc/sysdeps/i386/fpu/e_atanh.S.mp 2012-02-06 23:41:36.490417379 +0100
+++ libc/sysdeps/i386/fpu/e_atanh.S 2012-02-06 23:41:50.727425873 +0100
@@ -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)
--- libc/sysdeps/i386/fpu/s_log1pf.S.mp 2012-02-06 23:41:36.546417413 +0100
+++ libc/sysdeps/i386/fpu/s_log1pf.S 2012-02-06 23:41:50.728425873 +0100
@@ -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
--- libc/sysdeps/i386/fpu/s_asinhf.S.mp 2012-02-06 23:41:36.525417400 +0100
+++ libc/sysdeps/i386/fpu/s_asinhf.S 2012-02-07 00:13:22.091989526 +0100
@@ -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)
--- libc/sysdeps/i386/fpu/s_cexpf.S.mp 2012-02-06 23:41:36.532417404 +0100
+++ libc/sysdeps/i386/fpu/s_cexpf.S 2012-02-06 23:41:50.729425873 +0100
@@ -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:
--- libc/sysdeps/i386/fpu/e_log10.S.mp 2012-02-06 23:41:36.505417389 +0100
+++ libc/sysdeps/i386/fpu/e_log10.S 2012-02-06 23:41:50.730425873 +0100
@@ -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
--- libc/sysdeps/i386/fpu/s_frexp.S.mp 2012-02-06 23:41:36.539417407 +0100
+++ libc/sysdeps/i386/fpu/s_frexp.S 2012-02-06 23:41:50.732425875 +0100
@@ -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)
--- libc/sysdeps/i386/fpu/e_atanhl.S.mp 2012-02-06 23:41:36.502417386 +0100
+++ libc/sysdeps/i386/fpu/e_atanhl.S 2012-02-06 23:41:50.732425875 +0100
@@ -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
--- libc/sysdeps/i386/fpu/s_asinh.S.mp 2012-02-06 23:41:36.523417399 +0100
+++ libc/sysdeps/i386/fpu/s_asinh.S 2012-02-07 00:14:09.934020222 +0100
@@ -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)
--- libc/sysdeps/i386/fpu/s_cbrtl.S.mp 2012-02-06 23:41:36.529417401 +0100
+++ libc/sysdeps/i386/fpu/s_cbrtl.S 2012-02-06 23:41:50.733425876 +0100
@@ -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)
--- libc/sysdeps/i386/fpu/e_scalbl.S.mp 2012-02-06 23:41:36.522417398 +0100
+++ libc/sysdeps/i386/fpu/e_scalbl.S 2012-02-06 23:41:50.733425876 +0100
@@ -9,11 +9,7 @@
#include <machine/asm.h>
-#ifdef __ELF__
.section .rodata
-#else
- .text
-#endif
.align ALIGNARG(4)
ASM_TYPE_DIRECTIVE(zero_nan,@object)
--- libc/sysdeps/i386/i686/fpu/e_logl.S.mp 2012-02-06 23:41:36.550417414 +0100
+++ libc/sysdeps/i386/i686/fpu/e_logl.S 2012-02-06 23:41:50.734425877 +0100
@@ -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
--- libc/sysdeps/i386/asm-syntax.h.mp 2012-02-06 23:41:36.471417368 +0100
+++ libc/sysdeps/i386/asm-syntax.h 2012-02-06 23:41:50.734425877 +0100
@@ -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
--- libc/sysdeps/x86_64/fpu/e_log2l.S.mp 2012-02-06 23:41:36.563417423 +0100
+++ libc/sysdeps/x86_64/fpu/e_log2l.S 2012-02-06 23:41:50.734425877 +0100
@@ -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
--- libc/sysdeps/x86_64/fpu/e_powl.S.mp 2012-02-06 23:41:36.567417424 +0100
+++ libc/sysdeps/x86_64/fpu/e_powl.S 2012-02-06 23:41:50.735425878 +0100
@@ -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:
--- libc/sysdeps/x86_64/fpu/e_logl.S.mp 2012-02-06 23:41:36.565417424 +0100
+++ libc/sysdeps/x86_64/fpu/e_logl.S 2012-02-06 23:41:50.735425878 +0100
@@ -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
--- libc/sysdeps/x86_64/fpu/s_expm1l.S.mp 2012-02-06 23:41:36.575417429 +0100
+++ libc/sysdeps/x86_64/fpu/s_expm1l.S 2012-02-06 23:41:50.736425879 +0100
@@ -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
--- libc/sysdeps/x86_64/fpu/s_log1pl.S.mp 2012-02-06 23:41:36.577417430 +0100
+++ libc/sysdeps/x86_64/fpu/s_log1pl.S 2012-02-06 23:41:50.736425879 +0100
@@ -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
--- libc/sysdeps/x86_64/fpu/e_log10l.S.mp 2012-02-06 23:41:36.561417421 +0100
+++ libc/sysdeps/x86_64/fpu/e_log10l.S 2012-02-06 23:41:50.737425880 +0100
@@ -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
--- libc/sysdeps/x86_64/fpu/s_copysignf.S.mp 2012-02-06 23:41:36.573417429 +0100
+++ libc/sysdeps/x86_64/fpu/s_copysignf.S 2012-02-06 23:41:50.737425880 +0100
@@ -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)
--- libc/sysdeps/x86_64/fpu/s_copysign.S.mp 2012-02-06 23:41:36.571417427 +0100
+++ libc/sysdeps/x86_64/fpu/s_copysign.S 2012-02-06 23:41:50.737425880 +0100
@@ -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)
--- libc/sysdeps/x86_64/fpu/e_scalbl.S.mp 2012-02-06 23:41:36.569417425 +0100
+++ libc/sysdeps/x86_64/fpu/e_scalbl.S 2012-02-06 23:41:50.738425881 +0100
@@ -10,11 +10,7 @@
#include <machine/asm.h>
-#ifdef __ELF__
.section .rodata
-#else
- .text
-#endif
.align ALIGNARG(4)
ASM_TYPE_DIRECTIVE(zero_nan,@object)
--- libc/sysdeps/powerpc/sysdep.h.mp 2012-02-06 23:41:36.557417418 +0100
+++ libc/sysdeps/powerpc/sysdep.h 2012-02-07 00:15:58.139089645 +0100
@@ -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__ */
-
--- libc/sysdeps/powerpc/powerpc64/sysdep.h.mp 2012-02-06 23:41:36.555417418 +0100
+++ libc/sysdeps/powerpc/powerpc64/sysdep.h 2012-02-06 23:41:50.739425881 +0100
@@ -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__ */
--- libc/sysdeps/powerpc/powerpc32/sysdep.h.mp 2012-02-06 23:41:36.553417417 +0100
+++ libc/sysdeps/powerpc/powerpc32/sysdep.h 2012-02-07 00:21:35.410380036 +0100
@@ -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__ */
Marek