(JUMPTARGET): Undefine before defining it.

diff --git a/sysdeps/m68k/sysdep.h b/sysdeps/m68k/sysdep.h
index 554b92d3342f979db40d2069bf406022fb9fd65a..f492ff617c86984cca157a93c0ae59553e68fa4f 100644 (file)
--- a/sysdeps/m68k/sysdep.h
+++ b/sysdeps/m68k/sysdep.h
@@ -1,5 +1,5 @@
 /* Assembler macros for m68k.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2003 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
@@ -23,25 +23,25 @@
 
 /* Syntactic details of assembler.  */
 
-#ifdef HAVE_ELF
+# ifdef HAVE_ELF
 
 /* ELF uses byte-counts for .align, most others use log2 of count of bytes.  */
-#define ALIGNARG(log2) 1<<log2
+#  define ALIGNARG(log2) 1<<log2
 /* For ELF we need the `.type' directive to make shared libs work right.  */
-#define ASM_TYPE_DIRECTIVE(name,typearg) .type name,typearg
-#define ASM_SIZE_DIRECTIVE(name) .size name,.-name
+#  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
+#  undef NO_UNDERSCORES
+#  define NO_UNDERSCORES
 
-#else
+# else
 
-#define ALIGNARG(log2) log2
-#define ASM_TYPE_DIRECTIVE(name,type)  /* Nothing is specified.  */
-#define ASM_SIZE_DIRECTIVE(name)       /* Nothing is specified.  */
+#  define ALIGNARG(log2) log2
+#  define ASM_TYPE_DIRECTIVE(name,type)        /* Nothing is specified.  */
+#  define ASM_SIZE_DIRECTIVE(name)     /* Nothing is specified.  */
 
-#endif
+# endif
 
 
 /* Define an entry point visible from C.
@@ -49,51 +49,52 @@
    There is currently a bug in gdb which prevents us from specifying
    incomplete stabs information.  Fake some entries here which specify
    the current source file.  */
-#define        ENTRY(name)                                                           \
+# define ENTRY(name)                                                         \
   .globl C_SYMBOL_NAME(name);                                                \
   ASM_TYPE_DIRECTIVE (C_SYMBOL_NAME(name),@function);                        \
   .align ALIGNARG(2);                                                        \
   C_LABEL(name)                                                                      \
   CALL_MCOUNT
 
-#undef END
-#define END(name) ASM_SIZE_DIRECTIVE(name)
+# undef END
+# define END(name) ASM_SIZE_DIRECTIVE(name)
 
 
 /* If compiled for profiling, call `_mcount' at the start of each function.  */
-#ifdef PROF
+# ifdef        PROF
 /* The mcount code relies on a normal frame pointer being on the stack
    to locate our caller, so push one just for its benefit.  */
-#define CALL_MCOUNT \
+#  define CALL_MCOUNT \
   move.l %fp, -(%sp); move.l %sp, %fp;                                       \
   jbsr JUMPTARGET (mcount);                                                  \
   move.l (%sp)+, %fp;
-#else
-#define CALL_MCOUNT            /* Do nothing.  */
-#endif
+# else
+#  define CALL_MCOUNT          /* Do nothing.  */
+# endif
 
-#ifdef NO_UNDERSCORES
+# 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 syscall_error        __syscall_error
+#  define mcount       _mcount
+# endif
 
-#define        PSEUDO(name, syscall_name, args)                                      \
+# define PSEUDO(name, syscall_name, args)                                    \
   .globl syscall_error;                                                              \
   ENTRY (name)                                                               \
     DO_CALL (syscall_name, args);                                            \
     jcc JUMPTARGET(syscall_error)
 
-#undef PSEUDO_END
-#define PSEUDO_END(name)                                                     \
+# undef PSEUDO_END
+# define PSEUDO_END(name)                                                    \
   END (name)
 
-#ifdef PIC
-#define JUMPTARGET(name)       name##@PLTPC
-#else
-#define JUMPTARGET(name)       name
-#endif
+# undef JUMPTARGET
+# ifdef PIC
+#  define JUMPTARGET(name)     name##@PLTPC
+# else
+#  define JUMPTARGET(name)     name
+# endif
 
 #endif /* __ASSEMBLER__ */