aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@linux-m68k.org>2012-01-08 13:47:30 +0100
committerAndreas Schwab <schwab@linux-m68k.org>2012-01-08 14:23:09 +0100
commit30cfd5f601428d5ec27ded3d75245d463cc1b8b8 (patch)
treedec58ca2b85b041289efcb4d434dbf4ac0a16f00
parent7b966fcb4841623f3c35722e92eb8ac7517ea5b8 (diff)
downloadglibc-30cfd5f601428d5ec27ded3d75245d463cc1b8b8.tar.xz
glibc-30cfd5f601428d5ec27ded3d75245d463cc1b8b8.zip
m68k: remove NO_UNDERSCORES
-rw-r--r--ChangeLog.m68k5
-rw-r--r--sysdeps/m68k/sysdep.h18
2 files changed, 6 insertions, 17 deletions
diff --git a/ChangeLog.m68k b/ChangeLog.m68k
index 3190368104..459f9bc1e5 100644
--- a/ChangeLog.m68k
+++ b/ChangeLog.m68k
@@ -1,7 +1,8 @@
2012-01-08 Andreas Schwab <schwab@linux-m68k.org>
- * sysdeps/m68k/sysdep.h: Remove non-ELF support.
- * sysdeps/m68k/asm-syntax.h: Likewise.
+ * sysdeps/m68k/asm-syntax.h: Remove non-ELF support.
+ * sysdeps/m68k/sysdep.h: Likewise.
+ (NO_UNDERSCORES): Don't define.
2012-01-07 Andreas Schwab <schwab@linux-m68k.org>
diff --git a/sysdeps/m68k/sysdep.h b/sysdeps/m68k/sysdep.h
index 2888781287..f36b584ee7 100644
--- a/sysdeps/m68k/sysdep.h
+++ b/sysdeps/m68k/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.
There is currently a bug in gdb which prevents us from specifying
@@ -60,26 +56,18 @@
move.l %fp, -(%sp); \
cfi_adjust_cfa_offset (4); cfi_rel_offset (%fp, 0); \
move.l %sp, %fp; \
- jbsr JUMPTARGET (mcount); \
+ jbsr JUMPTARGET (_mcount); \
move.l (%sp)+, %fp; \
cfi_adjust_cfa_offset (-4); cfi_restore (%fp);
# else
# 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; \
+ .globl __syscall_error; \
ENTRY (name) \
DO_CALL (syscall_name, args); \
- jcc JUMPTARGET(syscall_error)
+ jcc JUMPTARGET(__syscall_error)
# undef PSEUDO_END
# define PSEUDO_END(name) \