From 5ea695edcd4b9a6c1a6bc975bfdb1becffb267bf Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Fri, 17 Dec 1999 18:38:37 +0000
Subject: [PATCH] Fix compile time warnings

---
 binutils/ChangeLog | 13 +++++++++++++
 binutils/dlltool.c | 27 ++++++++++++++++-----------
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 07548ef3ba2..9835e661847 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,16 @@
+1999-12-17  Nick Clifton  <nickc@cygnus.com>
+
+	* dlltool.c (mtable): Stop compile time warnings about missing
+	initialisers.
+	(yyerror): Stop compile time warnings about unused paramater.
+	(INIT_SEC_DATA): New macro: initialise an entry in the secdata
+	array.
+	(secdata): Stop ccompile time warnings about uninitialised
+	fields.
+	(dtab): Stop compile time warnings about unused parameter.
+	(long_options): Stop compile time warning about missing
+	initialiser. 
+
 1999-12-10  Nick Clifton  <nickc@cygnus.com>
 
 	* readelf.c (print_vma): Support native 64bit ELF systems.
diff --git a/binutils/dlltool.c b/binutils/dlltool.c
index cfed2c6f237..e852f098e14 100644
--- a/binutils/dlltool.c
+++ b/binutils/dlltool.c
@@ -596,7 +596,7 @@ mtable[] =
     arm_jtab, sizeof (arm_jtab), 8
   }
   ,
-  { 0 }
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 };
 
 typedef struct dlist
@@ -868,7 +868,7 @@ static int d_is_exe;
 
 int
 yyerror (err)
-     const char *err;
+     const char * err ATTRIBUTE_UNUSED;
 {
   /* xgettext:c-format */
   warn (_("Syntax error in def file %s:%d\n"), def_file, linenumber);
@@ -2066,15 +2066,16 @@ typedef struct
 
 #define NSECS 7
 
+#define INIT_SEC_DATA(id, name, flags, align) { id, name, flags, align, NULL, NULL, NULL, 0, NULL }
 static sinfo secdata[NSECS] =
 {
-  { TEXT,   ".text",    SEC_CODE | SEC_HAS_CONTENTS, 2},
-  { DATA,   ".data",    SEC_DATA,                    2},
-  { BSS,    ".bss",     0,                           2},
-  { IDATA7, ".idata$7", SEC_HAS_CONTENTS,            2},
-  { IDATA5, ".idata$5", SEC_HAS_CONTENTS,            2},
-  { IDATA4, ".idata$4", SEC_HAS_CONTENTS,            2},
-  { IDATA6, ".idata$6", SEC_HAS_CONTENTS,            1}
+  INIT_SEC_DATA (TEXT,   ".text",    SEC_CODE | SEC_HAS_CONTENTS, 2),
+  INIT_SEC_DATA (DATA,   ".data",    SEC_DATA,                    2),
+  INIT_SEC_DATA (BSS,    ".bss",     0,                           2),
+  INIT_SEC_DATA (IDATA7, ".idata$7", SEC_HAS_CONTENTS,            2),
+  INIT_SEC_DATA (IDATA5, ".idata$5", SEC_HAS_CONTENTS,            2),
+  INIT_SEC_DATA (IDATA4, ".idata$4", SEC_HAS_CONTENTS,            2),
+  INIT_SEC_DATA (IDATA6, ".idata$6", SEC_HAS_CONTENTS,            1)
 };
 
 #else
@@ -2876,7 +2877,11 @@ remove_null_names (ptr)
 
 static void
 dtab (ptr)
-     export_type **ptr;
+     export_type ** ptr
+#ifndef SACDEBUG
+ATTRIBUTE_UNUSED
+#endif
+     ;
 {
 #ifdef SACDEBUG
   int i;
@@ -3170,7 +3175,7 @@ static const struct option long_options[] =
   {"as", required_argument, NULL, 'S'},
   {"as-flags", required_argument, NULL, 'f'},
   {"mcore-elf", required_argument, NULL, 'M'},
-  {0}
+  {NULL,0,NULL,0}
 };
 
 int
-- 
2.30.2