diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2012-01-08 00:45:01 -0500 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2012-01-08 00:45:01 -0500 |
| commit | a0da5fe1e49b819b4d90b77915e21cddd397d064 (patch) | |
| tree | e1f1c0660ab131287cfcc0f64065b946715d06b1 /sysdeps/generic | |
| parent | a784e502472fb3a1afa4d01a47c66b52d23e00f6 (diff) | |
| download | glibc-a0da5fe1e49b819b4d90b77915e21cddd397d064.tar.gz glibc-a0da5fe1e49b819b4d90b77915e21cddd397d064.tar.xz glibc-a0da5fe1e49b819b4d90b77915e21cddd397d064.zip | |
More fallout from supporting only ELF
Diffstat (limited to 'sysdeps/generic')
| -rw-r--r-- | sysdeps/generic/machine-gmon.h | 8 | ||||
| -rw-r--r-- | sysdeps/generic/sysdep.h | 16 |
2 files changed, 5 insertions, 19 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 |