This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: [PATCH] Remove __ELF__ conditionals
- From: "Carlos O'Donell" <carlos at systemhalted dot org>
- To: Marek Polacek <polacek at redhat dot com>, Roland McGrath <roland at frob dot com>
- Cc: GNU C Library <libc-alpha at sourceware dot org>
- Date: Sat, 28 Jan 2012 15:52:22 -0500
- Subject: Re: [PATCH] Remove __ELF__ conditionals
- References: <4F2327F2.9060402@redhat.com>
Marek,
This patch looks good to me modulo three comments I have summarized
at the bottom.
Roland,
Do you see anything wrong with this patch, aside from my comments?
> This patch removes the __ELF__ conditionals from sysdeps/ directory.
> Comments?
Please correct me if I'm wrong but the cleanup is part of the general
"remove things we don't use" philosophy we want to adopt? In this case
we only support ELF output, so your patch removes anything conditional
on __ELF__. Is that correct?
Missing copyright year update.
We now support ranged notion for copyright years per README.
> @@ -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-01-27 22:09:42.210188529 +0100
> +++ libc/sysdeps/i386/fpu/e_powf.S 2012-01-27 23:11:34.627922897 +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
Use range notation please.
> 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
> +
You added a space here, that's probably a good idea since it
points out visually that the setting of the section applies until another
directive changes the section and not just to the next block of
assembly.
> .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-01-27 22:09:42.179188470 +0100
> +++ libc/sysdeps/i386/fpu/e_atanhf.S 2012-01-27 22:55:29.723235581 +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.
Use range notation please.
> 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-01-27 22:09:42.180188472 +0100
> +++ libc/sysdeps/i386/fpu/s_cexpl.S 2012-01-27 22:56:17.466323964 +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-01-27 22:09:42.178188468 +0100
> +++ libc/sysdeps/i386/fpu/e_acosh.S 2012-01-27 22:55:15.411209085 +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.
Use range notation please.
> 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-01-27 22:09:42.183188478 +0100
> +++ libc/sysdeps/i386/fpu/e_pow.S 2012-01-27 22:57:23.923446994 +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, 1997, 1998, 1999, 2001, 2004, 2005, 2007, 2011, 2012
Use range notation please.
> 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-01-27 22:09:42.182188476 +0100
> +++ libc/sysdeps/i386/fpu/s_asinhl.S 2012-01-27 22:56:43.253371702 +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-01-27 22:09:42.214188537 +0100
> +++ libc/sysdeps/i386/fpu/e_acoshl.S 2012-01-27 23:13:22.632122125 +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.
Use range notation please.
> 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-01-27 22:09:42.189188490 +0100
> +++ libc/sysdeps/i386/fpu/s_expm1.S 2012-01-27 23:05:44.523277085 +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-01-27 22:09:42.222188553 +0100
> +++ libc/sysdeps/i386/fpu/s_frexpf.S 2012-01-27 23:15:01.450304408 +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-01-27 22:09:42.193188498 +0100
> +++ libc/sysdeps/i386/fpu/e_log2.S 2012-01-27 23:06:36.519372999 +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-01-27 22:09:42.212188533 +0100
> +++ libc/sysdeps/i386/fpu/e_log2l.S 2012-01-27 23:12:33.608031694 +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-01-27 22:09:42.199188510 +0100
> +++ libc/sysdeps/i386/fpu/e_scalb.S 2012-01-27 23:08:06.780539497 +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-01-27 22:09:42.195188502 +0100
> +++ libc/sysdeps/i386/fpu/e_powl.S 2012-01-27 23:07:20.352453854 +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, 1997, 1998, 1999, 2001, 2004, 2005, 2007, 2011, 2012
Use range notation please.
> 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-01-27 22:09:42.223188555 +0100
> +++ libc/sysdeps/i386/fpu/s_log1p.S 2012-01-27 23:15:13.005325721 +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-01-27 22:09:42.204188520 +0100
> +++ libc/sysdeps/i386/fpu/e_log10f.S 2012-01-27 23:10:10.183767129 +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-01-27 22:09:42.198188508 +0100
> +++ libc/sysdeps/i386/fpu/s_cbrtf.S 2012-01-27 23:07:43.417496402 +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-01-27 22:09:42.176188464 +0100
> +++ libc/sysdeps/i386/fpu/e_logl.S 2012-01-27 22:51:17.349768370 +0100
> @@ -8,11 +8,7 @@
> #include <machine/asm.h>
>
>
> -#ifdef __ELF__
> .section .rodata.cst8,"aM",@progbits,8
> -#else
> - .text
> -#endif
This is inconsistent. Please add an empty line here to match the way you've
already been formatting.
> .p2align 3
> ASM_TYPE_DIRECTIVE(one,@object)
> one: .double 1.0
> --- libc/sysdeps/i386/fpu/s_cbrt.S.mp 2012-01-27 22:09:42.207188526 +0100
> +++ libc/sysdeps/i386/fpu/s_cbrt.S 2012-01-27 23:11:04.077866545 +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-01-27 22:09:42.208188527 +0100
> +++ libc/sysdeps/i386/fpu/s_expm1l.S 2012-01-27 23:11:17.557891410 +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-01-27 22:09:42.186188484 +0100
> +++ libc/sysdeps/i386/fpu/s_frexpl.S 2012-01-27 23:05:07.715209190 +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-01-27 22:09:42.206188524 +0100
> +++ libc/sysdeps/i386/fpu/s_expm1f.S 2012-01-27 23:10:51.789843876 +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-01-27 22:09:42.187188486 +0100
> +++ libc/sysdeps/i386/fpu/e_log2f.S 2012-01-27 23:05:22.803237020 +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-01-27 22:09:42.184188480 +0100
> +++ libc/sysdeps/i386/fpu/e_acoshf.S 2012-01-27 22:58:39.099586166 +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.
Use range notation please.
> 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-01-27 22:09:42.201188514 +0100
> +++ libc/sysdeps/i386/fpu/e_log.S 2012-01-27 23:08:13.199551338 +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-01-27 22:09:42.216188541 +0100
> +++ libc/sysdeps/i386/fpu/s_cexp.S 2012-01-27 23:13:48.123169147 +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-01-27 22:09:42.202188516 +0100
> +++ libc/sysdeps/i386/fpu/e_scalbf.S 2012-01-27 23:10:03.322754473 +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-01-27 22:09:42.177188466 +0100
> +++ libc/sysdeps/i386/fpu/s_log1pl.S 2012-01-27 22:51:30.194792151 +0100
> @@ -9,11 +9,7 @@
>
> RCSID("$NetBSD: s_log1p.S,v 1.7 1995/05/09 00:10:58 jtc Exp $")
>
> -#ifdef __ELF__
> .section .rodata
> -#else
> - .text
> -#endif
Add an empty line please.
> .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-01-27 22:09:42.218188545 +0100
> +++ libc/sysdeps/i386/fpu/e_logf.S 2012-01-27 23:13:56.583184751 +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-01-27 22:09:42.192188496 +0100
> +++ libc/sysdeps/i386/fpu/e_log10l.S 2012-01-27 23:06:26.290354130 +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-01-27 22:09:42.205188522 +0100
> +++ libc/sysdeps/i386/fpu/e_atanh.S 2012-01-27 23:10:30.908805360 +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.
Use range notation please.
> 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-01-27 22:09:42.211188531 +0100
> +++ libc/sysdeps/i386/fpu/s_log1pf.S 2012-01-27 23:11:55.448961305 +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-01-27 22:09:42.190188492 +0100
> +++ libc/sysdeps/i386/fpu/s_asinhf.S 2012-01-27 23:05:59.809305284 +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-01-27 22:09:42.221188551 +0100
> +++ libc/sysdeps/i386/fpu/s_cexpf.S 2012-01-27 23:14:48.705280898 +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-01-27 22:09:42.196188504 +0100
> +++ libc/sysdeps/i386/fpu/e_log10.S 2012-01-27 23:07:29.696471090 +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-01-27 22:09:42.185188482 +0100
> +++ libc/sysdeps/i386/fpu/s_frexp.S 2012-01-27 23:01:41.611924043 +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-01-27 22:09:42.215188539 +0100
> +++ libc/sysdeps/i386/fpu/e_atanhl.S 2012-01-27 23:13:32.076139545 +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-01-27 22:09:42.213188535 +0100
> +++ libc/sysdeps/i386/fpu/s_asinh.S 2012-01-27 23:13:07.827094815 +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-01-27 22:09:42.191188494 +0100
> +++ libc/sysdeps/i386/fpu/s_cbrtl.S 2012-01-27 23:06:15.563334344 +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-01-27 22:09:42.219188547 +0100
> +++ libc/sysdeps/i386/fpu/e_scalbl.S 2012-01-27 23:14:31.532249220 +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-01-27 22:09:42.225188559 +0100
> +++ libc/sysdeps/i386/i686/fpu/e_logl.S 2012-01-27 23:15:32.818362268 +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-01-27 22:09:42.227188563 +0100
> +++ libc/sysdeps/i386/asm-syntax.h 2012-01-27 23:15:44.765384306 +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-01-27 22:09:42.240188589 +0100
> +++ libc/sysdeps/x86_64/fpu/e_log2l.S 2012-01-27 23:19:02.456748973 +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-01-27 22:09:42.232188573 +0100
> +++ libc/sysdeps/x86_64/fpu/e_powl.S 2012-01-27 23:17:09.701540982 +0100
> @@ -1,5 +1,5 @@
> /* ix87 specific implementation of pow function.
> - Copyright (C) 1996, 1997, 1998, 1999, 2001, 2004, 2007, 2011
> + Copyright (C) 1996, 1997, 1998, 1999, 2001, 2004, 2007, 2011, 2012
Use range notation please.
> 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-01-27 22:09:42.228188565 +0100
> +++ libc/sysdeps/x86_64/fpu/e_logl.S 2012-01-27 23:16:23.797456306 +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-01-27 22:09:42.238188585 +0100
> +++ libc/sysdeps/x86_64/fpu/s_expm1l.S 2012-01-27 23:18:49.753725542 +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-01-27 22:09:42.229188567 +0100
> +++ libc/sysdeps/x86_64/fpu/s_log1pl.S 2012-01-27 23:16:36.250479278 +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-01-27 22:09:42.231188571 +0100
> +++ libc/sysdeps/x86_64/fpu/e_log10l.S 2012-01-27 23:16:45.135495667 +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-01-27 22:09:42.236188581 +0100
> +++ libc/sysdeps/x86_64/fpu/s_copysignf.S 2012-01-27 23:18:34.349697127 +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-01-27 22:09:42.235188579 +0100
> +++ libc/sysdeps/x86_64/fpu/s_copysign.S 2012-01-27 23:17:24.797568828 +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.
Use range notation please.
> 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-01-27 22:09:42.242188593 +0100
> +++ libc/sysdeps/x86_64/fpu/e_scalbl.S 2012-01-27 23:20:29.259933176 +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-01-27 22:09:42.244188597 +0100
> +++ libc/sysdeps/powerpc/sysdep.h 2012-01-27 23:20:47.898967565 +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-01-27 22:09:42.246188601 +0100
> +++ libc/sysdeps/powerpc/powerpc64/sysdep.h 2012-01-27 23:21:07.669004041 +0100
> @@ -1,5 +1,5 @@
> /* Assembly macros for 64-bit PowerPC.
> - Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
> + Copyright (C) 2002, 2003, 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-01-27 22:09:42.248188605 +0100
> +++ libc/sysdeps/powerpc/powerpc32/sysdep.h 2012-01-27 23:21:23.839033874 +0100
> @@ -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__ */
In summary:
* request to use range notation.
* one or two inconsistent use of a new empty line
* one missing copyright year update.
The patch looks great with those changes and I think it should get checked in.
Cheers,
Carlos.