This commit was manufactured by cvs2svn to create tagcarlton_dictionary-20030805-merge

'carlton_dictionary-20030805-merge'.

Sprout from cagney_x86i386-20030821-branch 2003-08-21 14:03:24 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch'
Cherrypick from master 2003-08-02 02:00:38 UTC Nathanael Nerode <neroden@gcc.gnu.org> '':
    ChangeLog
    MAINTAINERS
    config-ml.in
    config.sub
    configure
    configure.in
    include/ChangeLog
    include/bfdlink.h
    include/coff/ChangeLog
    include/coff/ti.h
    include/dis-asm.h
    include/elf/ChangeLog
    include/elf/dwarf2.h
    include/elf/msp430.h
    include/elf/reloc-macros.h
    include/nlm/ChangeLog
    include/nlm/internal.h
    include/opcode/ChangeLog
    include/opcode/alpha.h
    include/opcode/arc.h
    include/opcode/cgen.h
    include/opcode/d10v.h
    include/opcode/d30v.h
    include/opcode/i370.h
    include/opcode/i860.h
    include/opcode/or32.h
    include/opcode/pj.h
    include/opcode/ppc.h
    include/opcode/sparc.h
    include/opcode/tic80.h
    include/opcode/v850.h
    src-release
    symlink-tree

1 files changed, 14 insertions, 9 deletions

diff --git a/include/elf/reloc-macros.h b/include/elf/reloc-macros.h
index 4a3a60f7e..9ad346c9f 100644
--- a/include/elf/reloc-macros.h
+++ b/include/elf/reloc-macros.h
@@ -1,5 +1,5 @@
 /* Generic relocation support for BFD.
-   Copyright 1998, 1999, 2000, 2003 Free Software Foundation, Inc.
+   Copyright 1998, 1999, 2000 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -46,9 +46,10 @@
    If RELOC_MACROS_GEN_FUNC *is* defined, then instead the
    following function will be generated:
 
-   	static const char *foo (unsigned long rtype);
+   	static const char * foo PARAMS ((unsigned long rtype));
    	static const char *
-   	foo (unsigned long rtype)
+   	foo (rtype)
+   	    unsigned long rtype;
    	{
    	   switch (rtype)
    	   {
@@ -69,22 +70,26 @@
    the relocation is not recognised, NULL is returned.  */
 
 #define START_RELOC_NUMBERS(name)   				\
-static const char *name (unsigned long rtype);			\
+static const char * name    PARAMS ((unsigned long rtype)); 	\
 static const char *						\
-name (unsigned long rtype)					\
+name (rtype)							\
+	unsigned long rtype;					\
 {								\
   switch (rtype)						\
-    {
+  {
 
-#define RELOC_NUMBER(name, number) \
-    case number: return #name;
+#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 EMPTY_RELOC(name)
 
 #define END_RELOC_NUMBERS(name)	\
     default: return NULL;	\
-    }				\
+  }				\
 }