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/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 +------ 7 files changed, 5 insertions(+), 37 deletions(-) delete mode 100644 sysdeps/unix/sysv/i386/sysdep.h (limited to 'sysdeps/unix') diff --git a/sysdeps/unix/i386/sysdep.S b/sysdeps/unix/i386/sysdep.S index 9f279e15b1..fc5cd67ec0 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 a664189bb4..6efe69662b 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 7e2e4d4e81..5a29275ccc 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 fbfb74c8d9..f83b1c78f8 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 2474fc2e7f..e5c5e91335 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 fedd5ea825..0000000000 --- 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 908da3c3d5..5239ab1d40 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. -- cgit 1.4.1