* gas/config/tc-tic4x.c: Fixed proper commandline

[deliverable/binutils-gdb.git] / include / elf / reloc-macros.h

diff --git a/include/elf/reloc-macros.h b/include/elf/reloc-macros.h
index 976229129c09c660a90798a030fc2acd84153b27..9ad346c9f3db538f4a85f0fc7280a02cc453419c 100644 (file)
--- a/include/elf/reloc-macros.h
+++ b/include/elf/reloc-macros.h
@@ -1,5 +1,5 @@
 /* Generic relocation support for BFD.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright 1998, 1999, 2000 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -27,27 +27,27 @@
        START_RELOC_NUMBERS (foo)
            RELOC_NUMBER (R_foo_NONE,    0)
            RELOC_NUMBER (R_foo_32,      1)
-           FAKE_RELOC   (R_foo_illegal, 2)
-           EMPTY_RELOC  (R_foo_max)
-       END_RELOC_NUMBERS
+           EMPTY_RELOC  (R_foo_good)
+           FAKE_RELOC   (R_foo_illegal, 9)
+       END_RELOC_NUMBERS (R_foo_count)
 
    Then the following will be produced by default (ie if
    RELOC_MACROS_GEN_FUNC is *not* defined).
 
        enum foo
        {
-         foo = -1,
          R_foo_NONE = 0,
          R_foo_32 = 1,
-         R_foo_illegal = 2,
-         R_foo_max
+         R_foo_good,
+         R_foo_illegal = 9,
+         R_foo_count
        };
 
    If RELOC_MACROS_GEN_FUNC *is* defined, then instead the
    following function will be generated:
 
-       static char * foo PARAMS ((unsigned long rtype));
-       static char *
+       static const char * foo PARAMS ((unsigned long rtype));
+       static const char *
        foo (rtype)
            unsigned long rtype;
        {
@@ -59,7 +59,7 @@
           }
        }
    */
-   
+
 #ifndef _RELOC_MACROS_H
 #define _RELOC_MACROS_H
 
@@ -78,16 +78,16 @@ name (rtype)                                                        \
   switch (rtype)                                               \
   {
 
-#ifdef __STDC__                                          
+#if defined (__STDC__) || defined (ALMOST_STDC)
 #define RELOC_NUMBER(name, number)  case number : return #name ;
 #else
 #define RELOC_NUMBER(name, number)  case number : return "name" ;
 #endif
 
-#define FAKE_RELOC(name, number)    
+#define FAKE_RELOC(name, number)
 #define EMPTY_RELOC(name)
-                                         
-#define END_RELOC_NUMBERS      \
+
+#define END_RELOC_NUMBERS(name)        \
     default: return NULL;      \
   }                            \
 }
@@ -95,21 +95,11 @@ name (rtype)                                                        \
 
 #else /* Default to generating enum.  */
 
-/* Some compilers cannot cope with an enum that ends with a trailing
-   comma, so START_RELOC_NUMBERS creates a fake reloc entry, (initialised
-   to -1 so that the first real entry will still default to 0).  Further
-   entries then prepend a comma to their definitions, creating a list
-   of enumerator entries that will satisfy these compilers.  */
-#ifdef __STDC__
-#define START_RELOC_NUMBERS(name)   enum name { _##name = -1
-#else
-#define START_RELOC_NUMBERS(name)   enum name { name = -1
-#endif
-                                               
-#define RELOC_NUMBER(name, number)  , name = number
-#define FAKE_RELOC(name, number)    , name = number 
-#define EMPTY_RELOC(name)           , name 
-#define END_RELOC_NUMBERS           };
+#define START_RELOC_NUMBERS(name)   enum name {
+#define RELOC_NUMBER(name, number)  name = number,
+#define FAKE_RELOC(name, number)    name = number,
+#define EMPTY_RELOC(name)           name,
+#define END_RELOC_NUMBERS(name)     name };
 
 #endif