From a0da5fe1e49b819b4d90b77915e21cddd397d064 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 8 Jan 2012 00:45:01 -0500 Subject: More fallout from supporting only ELF --- sysdeps/generic/machine-gmon.h | 8 +------- sysdeps/generic/sysdep.h | 16 ++++------------ sysdeps/i386/sysdep.h | 6 ------ sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h | 8 +------- sysdeps/mach/sysdep.h | 4 ---- sysdeps/s390/s390-32/sysdep.h | 6 ------ sysdeps/s390/s390-64/sysdep.h | 6 ------ sysdeps/sh/sysdep.h | 2 -- sysdeps/sparc/sparc32/alloca.S | 6 +----- sysdeps/unix/i386/sysdep.S | 7 +------ sysdeps/unix/sparc/start.c | 4 +--- sysdeps/unix/sparc/sysdep.S | 7 +------ sysdeps/unix/sparc/sysdep.h | 2 -- sysdeps/unix/start.c | 11 +---------- sysdeps/unix/sysv/i386/sysdep.h | 4 ---- sysdeps/unix/x86_64/sysdep.S | 7 +------ sysdeps/x86_64/sysdep.h | 6 ------ 17 files changed, 12 insertions(+), 98 deletions(-) delete mode 100644 sysdeps/unix/sysv/i386/sysdep.h (limited to 'sysdeps') diff --git a/sysdeps/generic/machine-gmon.h b/sysdeps/generic/machine-gmon.h index eb046b0..7c13fa9 100644 --- a/sysdeps/generic/machine-gmon.h +++ b/sysdeps/generic/machine-gmon.h @@ -1,5 +1,5 @@ /* Machine-dependent definitions for profiling support. Generic GCC 2 version. - Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 2000, 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 @@ -31,16 +31,10 @@ #endif #include -#ifndef NO_UNDERSCORES -/* The asm symbols for C functions are `_function'. - The canonical name for the counter function is `mcount', no _. */ -void _mcount (void) asm ("mcount"); -#else /* The canonical name for the function is `_mcount' in both C and asm, but some old asm code might assume it's `mcount'. */ void _mcount (void); weak_alias (_mcount, mcount) -#endif static void mcount_internal (u_long frompc, u_long selfpc); diff --git a/sysdeps/generic/sysdep.h b/sysdeps/generic/sysdep.h index eecbd73..d1fec54 100644 --- a/sysdeps/generic/sysdep.h +++ b/sysdeps/generic/sysdep.h @@ -1,5 +1,5 @@ /* Generic asm macros used on many machines. - Copyright (C) 1991-1993,96,98,2002,2003,2009,2011 + Copyright (C) 1991-1993,96,98,2002,2003,2009,2011,2012 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -21,18 +21,10 @@ #ifndef C_LABEL /* Define a macro we can use to construct the asm name for a C symbol. */ -# ifdef NO_UNDERSCORES -# ifdef __STDC__ -# define C_LABEL(name) name##: -# else -# define C_LABEL(name) name/**/: -# endif +# ifdef __STDC__ +# define C_LABEL(name) name##: # else -# ifdef __STDC__ -# define C_LABEL(name) _##name##: -# else -# define C_LABEL(name) _/**/name/**/: -# endif +# define C_LABEL(name) name/**/: # endif #endif diff --git a/sysdeps/i386/sysdep.h b/sysdeps/i386/sysdep.h index 5a1f693..ffa38ed 100644 --- a/sysdeps/i386/sysdep.h +++ b/sysdeps/i386/sysdep.h @@ -30,10 +30,6 @@ #define ASM_TYPE_DIRECTIVE(name,typearg) .type name,typearg; #define ASM_SIZE_DIRECTIVE(name) .size name,.-name; -/* In ELF C symbols are asm symbols. */ -#undef NO_UNDERSCORES -#define NO_UNDERSCORES - /* Define an entry point visible from C. @@ -95,13 +91,11 @@ #define CALL_MCOUNT /* Do nothing. */ #endif -#ifdef NO_UNDERSCORES /* Since C identifiers are not normally prefixed with an underscore on this system, the asm identifier `syscall_error' intrudes on the C name space. Make sure we use an innocuous name. */ #define syscall_error __syscall_error #define mcount _mcount -#endif #define PSEUDO(name, syscall_name, args) \ .globl syscall_error; \ diff --git a/sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h b/sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h index 722dcae..77ab263 100644 --- a/sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h +++ b/sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h @@ -20,7 +20,7 @@ long_double_symbol (libc, __GL_##name##_##aliasname, aliasname); # define long_double_symbol_1(lib, local, symbol, version) \ versioned_symbol (lib, local, symbol, version) -#elif defined HAVE_WEAK_SYMBOLS +#else # define ldbl_hidden_def(local, name) libc_hidden_def (name) # define ldbl_strong_alias(name, aliasname) strong_alias (name, aliasname) # define ldbl_weak_alias(name, aliasname) weak_alias (name, aliasname) @@ -33,12 +33,6 @@ # define long_double_symbol_1(lib, local, symbol, version) \ weak_alias (local, symbol) # endif -#else -# define ldbl_hidden_def(local, name) libc_hidden_def (name) -# define ldbl_strong_alias(name, aliasname) strong_alias (name, aliasname) -# define ldbl_weak_alias(name, aliasname) strong_alias (name, aliasname) -# define long_double_symbol_1(lib, local, symbol, version) \ - strong_alias (local, symbol) #endif #ifndef __ASSEMBLER__ diff --git a/sysdeps/mach/sysdep.h b/sysdeps/mach/sysdep.h index bb287a3..305bb34 100644 --- a/sysdeps/mach/sysdep.h +++ b/sysdeps/mach/sysdep.h @@ -84,8 +84,4 @@ #endif /* Used by some assembly code. */ -#ifdef NO_UNDERSCORES #define C_SYMBOL_NAME(name) name -#else -#define C_SYMBOL_NAME(name) _##name -#endif diff --git a/sysdeps/s390/s390-32/sysdep.h b/sysdeps/s390/s390-32/sysdep.h index 8cb8005..6c52caf 100644 --- a/sysdeps/s390/s390-32/sysdep.h +++ b/sysdeps/s390/s390-32/sysdep.h @@ -30,10 +30,6 @@ #define ASM_TYPE_DIRECTIVE(name,typearg) .type name,typearg; #define ASM_SIZE_DIRECTIVE(name) .size name,.-name; -/* In ELF C symbols are asm symbols. */ -#undef NO_UNDERSCORES -#define NO_UNDERSCORES - /* Define an entry point visible from C. */ #define ENTRY(name) \ @@ -66,13 +62,11 @@ #define CALL_MCOUNT /* Do nothing. */ #endif -#ifdef NO_UNDERSCORES /* Since C identifiers are not normally prefixed with an underscore on this system, the asm identifier `syscall_error' intrudes on the C name space. Make sure we use an innocuous name. */ #define syscall_error __syscall_error #define mcount _mcount -#endif #define PSEUDO(name, syscall_name, args) \ lose: SYSCALL_PIC_SETUP \ diff --git a/sysdeps/s390/s390-64/sysdep.h b/sysdeps/s390/s390-64/sysdep.h index 68903df..b1c9961 100644 --- a/sysdeps/s390/s390-64/sysdep.h +++ b/sysdeps/s390/s390-64/sysdep.h @@ -30,10 +30,6 @@ #define ASM_TYPE_DIRECTIVE(name,typearg) .type name,typearg; #define ASM_SIZE_DIRECTIVE(name) .size name,.-name; -/* In ELF C symbols are asm symbols. */ -#undef NO_UNDERSCORES -#define NO_UNDERSCORES - /* Define an entry point visible from C. */ #define ENTRY(name) \ @@ -64,13 +60,11 @@ #define CALL_MCOUNT /* Do nothing. */ #endif -#ifdef NO_UNDERSCORES /* Since C identifiers are not normally prefixed with an underscore on this system, the asm identifier `syscall_error' intrudes on the C name space. Make sure we use an innocuous name. */ #define syscall_error __syscall_error #define mcount _mcount -#endif #define PSEUDO(name, syscall_name, args) \ lose: SYSCALL_PIC_SETUP \ diff --git a/sysdeps/sh/sysdep.h b/sysdeps/sh/sysdep.h index 9f37dc9..3ecfa96 100644 --- a/sysdeps/sh/sysdep.h +++ b/sysdeps/sh/sysdep.h @@ -69,12 +69,10 @@ #define CALL_MCOUNT /* Do nothing. */ #endif -#ifdef NO_UNDERSCORES /* Since C identifiers are not normally prefixed with an underscore on this system, the asm identifier `syscall_error' intrudes on the C name space. Make sure we use an innocuous name. */ #define syscall_error __syscall_error #define mcount _mcount -#endif #endif /* __ASSEMBLER__ */ diff --git a/sysdeps/sparc/sparc32/alloca.S b/sysdeps/sparc/sparc32/alloca.S index 42a2c61..c1057c13 100644 --- a/sysdeps/sparc/sparc32/alloca.S +++ b/sysdeps/sparc/sparc32/alloca.S @@ -1,4 +1,4 @@ -/* Copyright (C) 1994, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1994, 1997, 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 @@ -22,10 +22,6 @@ arguments which it makes relocatable symbols but seem always to be the constant 96; I have no idea what they are for. */ -#ifndef NO_UNDERSCORES -#define __builtin_alloca ___builtin_alloca -#endif - ENTRY (__builtin_alloca) sub %sp, %o0, %sp /* Push some stack space. */ retl /* Return; the returned buffer leaves 96 */ diff --git a/sysdeps/unix/i386/sysdep.S b/sysdeps/unix/i386/sysdep.S index 9f279e1..fc5cd67 100644 --- a/sysdeps/unix/i386/sysdep.S +++ b/sysdeps/unix/i386/sysdep.S @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-1997,2000,2002,2004,2005,2011 +/* Copyright (C) 1991-1997,2000,2002,2004,2005,2011,2012 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -30,12 +30,7 @@ .globl C_SYMBOL_NAME(errno) .globl syscall_error -#undef syscall_error -#ifdef NO_UNDERSCORES __syscall_error: -#else -syscall_error: -#endif #if defined (EWOULDBLOCK_sys) && EWOULDBLOCK_sys != EAGAIN /* We translate the system's EWOULDBLOCK error into EAGAIN. The GNU C library always defines EWOULDBLOCK==EAGAIN. diff --git a/sysdeps/unix/sparc/start.c b/sysdeps/unix/sparc/start.c index a664189..6efe696 100644 --- a/sysdeps/unix/sparc/start.c +++ b/sysdeps/unix/sparc/start.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991,92,93,94,95,96,97,2004 Free Software Foundation, Inc. +/* Copyright (C) 1991-1997,2004,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 @@ -52,9 +52,7 @@ /* The first piece of initialized data. */ int __data_start = 0; -#ifdef HAVE_WEAK_SYMBOLS weak_alias (__data_start, data_start) -#endif extern void __libc_init (int argc, char **argv, char **envp) __THROW; extern int main (int argc, char **argv, char **envp) __THROW; diff --git a/sysdeps/unix/sparc/sysdep.S b/sysdeps/unix/sparc/sysdep.S index 7e2e4d4..5a29275 100644 --- a/sysdeps/unix/sparc/sysdep.S +++ b/sysdeps/unix/sparc/sysdep.S @@ -1,4 +1,4 @@ -/* Copyright (C) 1994, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1994, 1997, 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 @@ -25,12 +25,7 @@ .text .align 2 -#undef syscall_error -#ifdef NO_UNDERSCORES __syscall_error: -#else -syscall_error: -#endif #if defined (EWOULDBLOCK_sys) && EWOULDBLOCK_sys != EAGAIN /* We translate the system's EWOULDBLOCK error into EAGAIN. The GNU C library always defines EWOULDBLOCK==EAGAIN. diff --git a/sysdeps/unix/sparc/sysdep.h b/sysdeps/unix/sparc/sysdep.h index fbfb74c..f83b1c7 100644 --- a/sysdeps/unix/sparc/sysdep.h +++ b/sysdeps/unix/sparc/sysdep.h @@ -22,12 +22,10 @@ #ifdef __ASSEMBLER__ -#ifdef NO_UNDERSCORES /* Since C identifiers are not normally prefixed with an underscore on this system, the asm identifier `syscall_error' intrudes on the C name space. Make sure we use an innocuous name. */ #define syscall_error C_SYMBOL_NAME(__syscall_error) -#endif #ifdef PIC #define SETUP_PIC_REG(reg, tmp) \ diff --git a/sysdeps/unix/start.c b/sysdeps/unix/start.c index 2474fc2..e5c5e91 100644 --- a/sysdeps/unix/start.c +++ b/sysdeps/unix/start.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 93, 1995-1998, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1991, 93, 1995-1998, 2000, 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 @@ -40,9 +40,7 @@ /* The first piece of initialized data. */ int __data_start = 0; -#ifdef HAVE_WEAK_SYMBOLS weak_alias (__data_start, data_start) -#endif #ifdef DUMMIES #define ARG_DUMMIES DUMMIES, @@ -69,13 +67,6 @@ _start () start1 (); } -#ifndef NO_UNDERSCORES -/* Make an alias called `start' (no leading underscore, so it can't - conflict with C symbols) for `_start'. This is the name vendor crt0.o's - tend to use, and thus the name most linkers expect. */ -asm (".set start, __start"); -#endif - #endif /* ARGSUSED */ diff --git a/sysdeps/unix/sysv/i386/sysdep.h b/sysdeps/unix/sysv/i386/sysdep.h deleted file mode 100644 index fedd5ea..0000000 --- a/sysdeps/unix/sysv/i386/sysdep.h +++ /dev/null @@ -1,4 +0,0 @@ -/* System V does not precede the asm names of C symbols with a `_'. */ -#define NO_UNDERSCORES - -#include diff --git a/sysdeps/unix/x86_64/sysdep.S b/sysdeps/unix/x86_64/sysdep.S index 908da3c..5239ab1 100644 --- a/sysdeps/unix/x86_64/sysdep.S +++ b/sysdeps/unix/x86_64/sysdep.S @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2002, 2004, 2005, 2011 Free Software Foundation, Inc. +/* Copyright (C) 2001,2002,2004,2005,2011,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 @@ -30,12 +30,7 @@ .globl C_SYMBOL_NAME(errno) .globl syscall_error -#undef syscall_error -#ifdef NO_UNDERSCORES __syscall_error: -#else -syscall_error: -#endif #if defined (EWOULDBLOCK_sys) && EWOULDBLOCK_sys != EAGAIN /* We translate the system's EWOULDBLOCK error into EAGAIN. The GNU C library always defines EWOULDBLOCK==EAGAIN. diff --git a/sysdeps/x86_64/sysdep.h b/sysdeps/x86_64/sysdep.h index cb8dced..60c02ed 100644 --- a/sysdeps/x86_64/sysdep.h +++ b/sysdeps/x86_64/sysdep.h @@ -29,10 +29,6 @@ #define ASM_TYPE_DIRECTIVE(name,typearg) .type name,typearg; #define ASM_SIZE_DIRECTIVE(name) .size name,.-name; -/* In ELF C symbols are asm symbols. */ -#undef NO_UNDERSCORES -#define NO_UNDERSCORES - /* Define an entry point visible from C. */ #define ENTRY(name) \ @@ -67,13 +63,11 @@ #define CALL_MCOUNT /* Do nothing. */ #endif -#ifdef NO_UNDERSCORES /* Since C identifiers are not normally prefixed with an underscore on this system, the asm identifier `syscall_error' intrudes on the C name space. Make sure we use an innocuous name. */ #define syscall_error __syscall_error #define mcount _mcount -#endif #define PSEUDO(name, syscall_name, args) \ lose: \ -- cgit v1.1