From 23a7453bbd725b826f9589c2e1c17002a548f0de Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Wed, 8 Feb 2012 15:55:41 -0800 Subject: [PATCH] alpha: Remove HAVE_ELF tests. --- ChangeLog.alpha | 9 +++++++++ sysdeps/unix/sysv/linux/alpha/getitimer.S | 6 +++--- sysdeps/unix/sysv/linux/alpha/getrusage.S | 6 +++--- sysdeps/unix/sysv/linux/alpha/gettimeofday.S | 6 +++--- sysdeps/unix/sysv/linux/alpha/select.S | 6 +++--- sysdeps/unix/sysv/linux/alpha/setitimer.S | 6 +++--- sysdeps/unix/sysv/linux/alpha/settimeofday.S | 6 +++--- sysdeps/unix/sysv/linux/alpha/utimes.S | 6 +++--- sysdeps/unix/sysv/linux/alpha/wait4.S | 6 +++--- 9 files changed, 33 insertions(+), 24 deletions(-) diff --git a/ChangeLog.alpha b/ChangeLog.alpha index e76205d..8ade582 100644 --- a/ChangeLog.alpha +++ b/ChangeLog.alpha @@ -1,5 +1,14 @@ 2012-02-08 Richard Henderson + * sysdeps/unix/sysv/linux/alpha/getitimer.S: Don't check HAVE_ELF. + * sysdeps/unix/sysv/linux/alpha/getrusage.S: Likewise. + * sysdeps/unix/sysv/linux/alpha/gettimeofday.S: Likewise. + * sysdeps/unix/sysv/linux/alpha/select.S: Likewise. + * sysdeps/unix/sysv/linux/alpha/setitimer.S: Likewise. + * sysdeps/unix/sysv/linux/alpha/settimeofday.S: Likewise. + * sysdeps/unix/sysv/linux/alpha/utimes.S: Likewise. + * sysdeps/unix/sysv/linux/alpha/wait4.S: Likewise. + * sysdeps/alpha/elf/crti.S, sysdeps/alpha/elf/crtn.S: New files... * sysdeps/alpha/elf/initfini.c: ... split from here. Remove file. * sysdeps/alpha/nptl/elf/pt-initfini.c: Remove file. diff --git a/sysdeps/unix/sysv/linux/alpha/getitimer.S b/sysdeps/unix/sysv/linux/alpha/getitimer.S index 6644a5c..c29b3bd 100644 --- a/sysdeps/unix/sysv/linux/alpha/getitimer.S +++ b/sysdeps/unix/sysv/linux/alpha/getitimer.S @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 2003, 2006 Free Software Foundation, Inc. +/* Copyright (C) 1998, 2003, 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 @@ -23,7 +23,7 @@ .text -#if defined HAVE_ELF && defined PIC && defined DO_VERSIONING +#if defined PIC && defined DO_VERSIONING #define GETITIMER __getitimer_tv64 #else #define GETITIMER getitimer @@ -108,6 +108,6 @@ $error: END(GETITIMER) #endif /* __ASSUME_TIMEVAL64 */ -#if defined HAVE_ELF && defined PIC && defined DO_VERSIONING +#if defined PIC && defined DO_VERSIONING default_symbol_version (__getitimer_tv64, getitimer, GLIBC_2.1) #endif diff --git a/sysdeps/unix/sysv/linux/alpha/getrusage.S b/sysdeps/unix/sysv/linux/alpha/getrusage.S index 0bca4b5..2516ab0 100644 --- a/sysdeps/unix/sysv/linux/alpha/getrusage.S +++ b/sysdeps/unix/sysv/linux/alpha/getrusage.S @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 2003, 2006 Free Software Foundation, Inc. +/* Copyright (C) 1998, 2003, 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 @@ -23,7 +23,7 @@ .text -#if defined HAVE_ELF && defined PIC && defined DO_VERSIONING +#if defined PIC && defined DO_VERSIONING #define GETRUSAGE __getrusage_tv64 #else #define GETRUSAGE __getrusage @@ -140,7 +140,7 @@ $error: END(GETRUSAGE) #endif /* __ASSUME_TIMEVAL64 */ -#if defined HAVE_ELF && defined PIC && defined DO_VERSIONING +#if defined PIC && defined DO_VERSIONING strong_alias(__getrusage_tv64, ____getrusage_tv64) default_symbol_version (____getrusage_tv64, __getrusage, GLIBC_2.1) default_symbol_version (__getrusage_tv64, getrusage, GLIBC_2.1) diff --git a/sysdeps/unix/sysv/linux/alpha/gettimeofday.S b/sysdeps/unix/sysv/linux/alpha/gettimeofday.S index 7c9183a..2910830 100644 --- a/sysdeps/unix/sysv/linux/alpha/gettimeofday.S +++ b/sysdeps/unix/sysv/linux/alpha/gettimeofday.S @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 2002, 2003, 2006 Free Software Foundation, Inc. +/* Copyright (C) 1998, 2002, 2003, 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 @@ -23,7 +23,7 @@ .text -#if defined HAVE_ELF && defined PIC && defined DO_VERSIONING +#if defined PIC && defined DO_VERSIONING #define GETTIMEOFDAY __gettimeofday_tv64 #else #define GETTIMEOFDAY __gettimeofday @@ -106,7 +106,7 @@ $error: END(GETTIMEOFDAY) #endif /* __ASSUME_TIMEVAL64 */ -#if defined HAVE_ELF && defined PIC && defined DO_VERSIONING +#if defined PIC && defined DO_VERSIONING default_symbol_version (__gettimeofday_tv64, __gettimeofday, GLIBC_2.1) /* It seems to me to be a misfeature of the assembler that we can only diff --git a/sysdeps/unix/sysv/linux/alpha/select.S b/sysdeps/unix/sysv/linux/alpha/select.S index 35a81e9..94f209b 100644 --- a/sysdeps/unix/sysv/linux/alpha/select.S +++ b/sysdeps/unix/sysv/linux/alpha/select.S @@ -1,4 +1,4 @@ -/* Copyright (C) 1998,2002,2003,2006 Free Software Foundation, Inc. +/* Copyright (C) 1998,2002,2003,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 @@ -23,7 +23,7 @@ .text -#if defined HAVE_ELF && defined PIC && defined DO_VERSIONING +#if defined PIC && defined DO_VERSIONING #define SELECT __select_tv64 #else #define SELECT __select @@ -224,7 +224,7 @@ $error: END(SELECT) #endif /* __ASSUME_TIMEVAL64 */ -#if defined HAVE_ELF && defined PIC && defined DO_VERSIONING +#if defined PIC && defined DO_VERSIONING default_symbol_version (__select_tv64, __select, GLIBC_2.1) /* It seems to me to be a misfeature of the assembler that we can only diff --git a/sysdeps/unix/sysv/linux/alpha/setitimer.S b/sysdeps/unix/sysv/linux/alpha/setitimer.S index 59caeac..59f97f7 100644 --- a/sysdeps/unix/sysv/linux/alpha/setitimer.S +++ b/sysdeps/unix/sysv/linux/alpha/setitimer.S @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 2003, 2006 Free Software Foundation, Inc. +/* Copyright (C) 1998, 2003, 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 @@ -23,7 +23,7 @@ .text -#if defined HAVE_ELF && defined PIC && defined DO_VERSIONING +#if defined PIC && defined DO_VERSIONING #define SETITIMER __setitimer_tv64 #else #define SETITIMER __setitimer @@ -124,7 +124,7 @@ $error: END(SETITIMER) #endif /* __ASSUME_TIMEVAL64 */ -#if defined HAVE_ELF && defined PIC && defined DO_VERSIONING +#if defined PIC && defined DO_VERSIONING default_symbol_version (__setitimer_tv64, __setitimer, GLIBC_2.1) /* It seems to me to be a misfeature of the assembler that we can only diff --git a/sysdeps/unix/sysv/linux/alpha/settimeofday.S b/sysdeps/unix/sysv/linux/alpha/settimeofday.S index e39eadc..e80d054 100644 --- a/sysdeps/unix/sysv/linux/alpha/settimeofday.S +++ b/sysdeps/unix/sysv/linux/alpha/settimeofday.S @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 2003, 2006 Free Software Foundation, Inc. +/* Copyright (C) 1998, 2003, 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 @@ -23,7 +23,7 @@ .text -#if defined HAVE_ELF && defined PIC && defined DO_VERSIONING +#if defined PIC && defined DO_VERSIONING #define SETTIMEOFDAY __settimeofday_tv64 #else #define SETTIMEOFDAY __settimeofday @@ -105,7 +105,7 @@ $error: END(SETTIMEOFDAY) #endif /* __ASSUME_TIMEVAL64 */ -#if defined HAVE_ELF && defined PIC && defined DO_VERSIONING +#if defined PIC && defined DO_VERSIONING default_symbol_version (__settimeofday_tv64, __settimeofday, GLIBC_2.1) /* It seems to me to be a misfeature of the assembler that we can only diff --git a/sysdeps/unix/sysv/linux/alpha/utimes.S b/sysdeps/unix/sysv/linux/alpha/utimes.S index 0dd0a93..2ab2b19 100644 --- a/sysdeps/unix/sysv/linux/alpha/utimes.S +++ b/sysdeps/unix/sysv/linux/alpha/utimes.S @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 2003, 2006 Free Software Foundation, Inc. +/* Copyright (C) 1998, 2003, 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 @@ -23,7 +23,7 @@ .text -#if defined HAVE_ELF && defined PIC && defined DO_VERSIONING +#if defined PIC && defined DO_VERSIONING #define UTIMES __utimes_tv64 #else #define UTIMES __utimes @@ -110,7 +110,7 @@ $error: END(UTIMES) #endif /* __ASSUME_TIMEVAL64 */ -#if defined HAVE_ELF && defined PIC && defined DO_VERSIONING +#if defined PIC && defined DO_VERSIONING default_symbol_version (__utimes_tv64, __utimes, GLIBC_2.1) /* It seems to me to be a misfeature of the assembler that we can only diff --git a/sysdeps/unix/sysv/linux/alpha/wait4.S b/sysdeps/unix/sysv/linux/alpha/wait4.S index 634993d..5e1e5d4 100644 --- a/sysdeps/unix/sysv/linux/alpha/wait4.S +++ b/sysdeps/unix/sysv/linux/alpha/wait4.S @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 2003, 2006 Free Software Foundation, Inc. +/* Copyright (C) 1998, 2003, 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 @@ -23,7 +23,7 @@ .text -#if defined HAVE_ELF && defined PIC && defined DO_VERSIONING +#if defined PIC && defined DO_VERSIONING #define WAIT4 __wait4_tv64 #else #define WAIT4 __wait4 @@ -143,7 +143,7 @@ $error: END(WAIT4) #endif /* __ASSUME_TIMEVAL64 */ -#if defined HAVE_ELF && defined PIC && defined DO_VERSIONING +#if defined PIC && defined DO_VERSIONING default_symbol_version (__wait4_tv64, __wait4, GLIBC_2.1) /* It seems to me to be a misfeature of the assembler that we can only -- 2.7.4