aboutsummaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2012-01-08 00:45:01 -0500
committerUlrich Drepper <drepper@gmail.com>2012-01-08 00:45:01 -0500
commita0da5fe1e49b819b4d90b77915e21cddd397d064 (patch)
treee1f1c0660ab131287cfcc0f64065b946715d06b1 /sysdeps
parenta784e502472fb3a1afa4d01a47c66b52d23e00f6 (diff)
downloadglibc-a0da5fe1e49b819b4d90b77915e21cddd397d064.tar
glibc-a0da5fe1e49b819b4d90b77915e21cddd397d064.tar.gz
glibc-a0da5fe1e49b819b4d90b77915e21cddd397d064.tar.bz2
glibc-a0da5fe1e49b819b4d90b77915e21cddd397d064.zip
More fallout from supporting only ELF
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/generic/machine-gmon.h8
-rw-r--r--sysdeps/generic/sysdep.h16
-rw-r--r--sysdeps/i386/sysdep.h6
-rw-r--r--sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h8
-rw-r--r--sysdeps/mach/sysdep.h4
-rw-r--r--sysdeps/s390/s390-32/sysdep.h6
-rw-r--r--sysdeps/s390/s390-64/sysdep.h6
-rw-r--r--sysdeps/sh/sysdep.h2
-rw-r--r--sysdeps/sparc/sparc32/alloca.S6
-rw-r--r--sysdeps/unix/i386/sysdep.S7
-rw-r--r--sysdeps/unix/sparc/start.c4
-rw-r--r--sysdeps/unix/sparc/sysdep.S7
-rw-r--r--sysdeps/unix/sparc/sysdep.h2
-rw-r--r--sysdeps/unix/start.c11
-rw-r--r--sysdeps/unix/sysv/i386/sysdep.h4
-rw-r--r--sysdeps/unix/x86_64/sysdep.S7
-rw-r--r--sysdeps/x86_64/sysdep.h6
17 files changed, 12 insertions, 98 deletions
diff --git a/sysdeps/generic/machine-gmon.h b/sysdeps/generic/machine-gmon.h
index eb046b068d..7c13fa992e 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 <sysdep.h>
-#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 eecbd731f6..d1fec5456e 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 5a1f6938b0..ffa38edd42 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 722dcae745..77ab26370d 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 bb287a32f4..305bb347ee 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 8cb8005a58..6c52caff4f 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 68903df64e..b1c9961f15 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 9f37dc9bac..3ecfa96f0e 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 42a2c61b46..c1057c13dd 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 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 <sysdeps/unix/i386/sysdep.h>
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.
diff --git a/sysdeps/x86_64/sysdep.h b/sysdeps/x86_64/sysdep.h
index cb8dced8e6..60c02ed576 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: \