* dwarf2out.c (lookup_filename): Fix printf format warning.

        * system.h (fread_unlocked, fwrite_unlocked): Undef.

        * fixinc/Makefile.in (FL_LIST): Add $($@-warn) hook.
        (fixincl.o-warn, gnu-regex.o-warn): New.
        * fixinc/fixfixes.c (FIX_PROC_HEAD): Mark parameters unused.
        * fixinc/fixtests.c (TEST_FOR_FIX_PROC_HEAD): Likewise.
        * fixinc/fixincl.c (process): Fix printf format warning.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@61584 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0ff1f44..c4d450d 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2003-01-21  Richard Henderson  <rth@redhat.com>
+
+       * dwarf2out.c (lookup_filename): Fix printf format warning.
+       * system.h (fread_unlocked, fwrite_unlocked): Undef.
+
+       * fixinc/Makefile.in (FL_LIST): Add $($@-warn) hook.
+       (fixincl.o-warn, gnu-regex.o-warn): New.
+       * fixinc/fixfixes.c (FIX_PROC_HEAD): Mark parameters unused.
+       * fixinc/fixtests.c (TEST_FOR_FIX_PROC_HEAD): Likewise.
+       * fixinc/fixincl.c (process): Fix printf format warning.
+
 2003-01-21  Ulrich Weigand  <uweigand@de.ibm.com>
 
        * dwarf2out (output_file_names): Don't crash if called

diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 4502a29..1cd511d 100644 (file)
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -12354,7 +12354,7 @@ lookup_filename (file_name)
 
   if (DWARF2_ASM_LINE_DEBUG_INFO)
     {
-      fprintf (asm_out_file, "\t.file %u ", i);
+      fprintf (asm_out_file, "\t.file %lu ", (unsigned long) i);
       output_quoted_string (asm_out_file, file_name);
       fputc ('\n', asm_out_file);
     }

diff --git a/gcc/fixinc/Makefile.in b/gcc/fixinc/Makefile.in
index ca29592..cd4092f 100644 (file)
--- a/gcc/fixinc/Makefile.in
+++ b/gcc/fixinc/Makefile.in
@@ -29,7 +29,7 @@ SHELL=@SHELL@
 # in the kernel.  So, we use `echo' instead. 
 STAMP = echo timestamp >
 
-FL_LIST = $(CFLAGS) $(CPPFLAGS) $(WARN_CFLAGS)
+FL_LIST = $(CFLAGS) $(CPPFLAGS) $(WARN_CFLAGS) $($@-warn)
 FIXINC_DEFS = -DIN_GCC -DHAVE_CONFIG_H $(FL_LIST) $(INCLUDES)
 
 # Directory where sources are, from where we are.
@@ -94,6 +94,11 @@ test-stamp : $(TESTOBJ) $(LIBERTY)
 $(AF): $(FIXOBJ) $(LIBERTY)
        $(CC) $(FIXINC_DEFS) $(LDFLAGS) -o $@ $(FIXOBJ) $(LIBERTY)
 
+# String length warnings
+fixincl.o-warn = -Wno-error
+# Signed/Unsigned warnings, but in code pulled from upstream.
+gnu-regex.o-warn = -Wno-error
+
 $(ALLOBJ)   : $(HDR)
 fixincl.o   : fixincl.c  $(srcdir)/fixincl.x
 fixtests.o  : fixtests.c

diff --git a/gcc/fixinc/fixfixes.c b/gcc/fixinc/fixfixes.c
index 9c775b5..30466bb 100644 (file)
--- a/gcc/fixinc/fixfixes.c
+++ b/gcc/fixinc/fixfixes.c
@@ -73,12 +73,12 @@ typedef struct {
   _FT_( "gnu_type",         gnu_type_fix )
 
 
-#define FIX_PROC_HEAD( fix )                    \
-static void fix PARAMS ((const char *, const char *, tFixDesc *)); /* avoid warning */      \
-static void fix ( filname, text, p_fixd )       \
-    const char* filname;                        \
-    const char* text;                           \
-    tFixDesc* p_fixd;
+#define FIX_PROC_HEAD( fix )                                           \
+static void fix PARAMS ((const char *, const char *, tFixDesc *));     \
+static void fix ( filname, text, p_fixd )                              \
+    const char* filname ATTRIBUTE_UNUSED;                              \
+    const char* text ATTRIBUTE_UNUSED;                                 \
+    tFixDesc* p_fixd ATTRIBUTE_UNUSED;
 
 #ifdef NEED_PRINT_QUOTE
 /*

diff --git a/gcc/fixinc/fixincl.c b/gcc/fixinc/fixincl.c
index 36be7c7..7c38637 100644 (file)
--- a/gcc/fixinc/fixincl.c
+++ b/gcc/fixinc/fixincl.c
@@ -1355,7 +1355,8 @@ process ()
   process_ct++;
 #endif
   if (VLEVEL( VERB_PROGRESS ) && have_tty)
-    fprintf (stderr, "%6d %-50s   \r", data_map_size, pz_curr_file );
+    fprintf (stderr, "%6lu %-50s   \r",
+            (unsigned long) data_map_size, pz_curr_file);
 
 # ifndef SEPARATE_FIX_PROC
   process_chain_head = NOPROCESS;

diff --git a/gcc/fixinc/fixtests.c b/gcc/fixinc/fixtests.c
index 40687cf..982fe33 100644 (file)
--- a/gcc/fixinc/fixtests.c
+++ b/gcc/fixinc/fixtests.c
@@ -58,15 +58,15 @@ typedef struct {
     t_test_proc* test_proc;
 } test_entry_t;
 
-#define FIX_TEST_TABLE \
-  _FT_( "machine_name",     machine_name_test )        \
+#define FIX_TEST_TABLE                                                 \
+  _FT_( "machine_name",     machine_name_test )                                \
   _FT_( "stdc_0_in_system_headers",    stdc_0_in_system_headers_test )
 
-#define TEST_FOR_FIX_PROC_HEAD( test )          \
-static apply_fix_p_t test PARAMS(( tCC* file, tCC* text ));  \
-static apply_fix_p_t test ( fname, text )       \
-    tCC* fname;                                 \
-    tCC* text;
+#define TEST_FOR_FIX_PROC_HEAD( test )                         \
+static apply_fix_p_t test PARAMS(( tCC* file, tCC* text ));    \
+static apply_fix_p_t test ( fname, text )                      \
+    tCC* fname ATTRIBUTE_UNUSED;                               \
+    tCC* text ATTRIBUTE_UNUSED;
 
 
 TEST_FOR_FIX_PROC_HEAD( machine_name_test )

diff --git a/gcc/system.h b/gcc/system.h
index 27f6f41..da78a59 100644 (file)
--- a/gcc/system.h
+++ b/gcc/system.h
@@ -99,6 +99,11 @@ extern int fprintf_unlocked PARAMS ((FILE *, const char *, ...));
 
 #endif
 
+/* ??? Glibc's fwrite/fread_unlocked macros cause 
+   "warning: signed and unsigned type in conditional expression".  */
+#undef fread_unlocked
+#undef fwrite_unlocked
+
 /* There are an extraordinary number of issues with <ctype.h>.
    The last straw is that it varies with the locale.  Use libiberty's
    replacement instead.  */