This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Update a use of register_include_chains in fix-header.c


Hi,

An extra parameter is added to c-incpath.c:register_include_chains
at revision 110037 but fix-header.c:read_scan_file calls it without
this new parameter.  It causes a build failure on sh-elf:

gcc -c   -g -O2 -DIN_GCC -DCROSS_COMPILE  -W -Wall -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition -Wmissing-format-attribute -fno-common   -DHAVE_CONFIG_H -DGENERATOR_FILE -I. -Ibuild -I../../ORIG/trunk/gcc -I../../ORIG/trunk/gcc/build -I../../ORIG/trunk/gcc/../include -I../../ORIG/trunk/gcc/../libcpp/include  -I../../ORIG/trunk/gcc/../libdecnumber -I../libdecnumber    -o build/fix-header.o ../../ORIG/trunk/gcc/fix-header.c
../../ORIG/trunk/gcc/fix-header.c: In function `read_scan_file':
../../ORIG/trunk/gcc/fix-header.c:670: warning: passing arg 4 of `register_include_chains' makes pointer from integer without a cast
../../ORIG/trunk/gcc/fix-header.c:670: error: too few arguments to function `register_include_chains'

The attached patch is to fix it.  Bootstrapped and regtested
with the toplevel "make -k check" on i686-pc-linux-gnu and
sh4-unknown-linux-gnu.
Ok for the trunk?

Regards,
	kaz
--
:ADDPATCH other:

2006-01-23  Kaz Kojima  <kkojima@gcc.gnu.org>

	* fix-header.c: (read_scan_file): Add the imultilib argument.

diff -uprN ORIG/trunk/gcc/fix-header.c LOCAL/trunk/gcc/fix-header.c
--- ORIG/trunk/gcc/fix-header.c	2005-10-29 06:52:10.000000000 +0900
+++ LOCAL/trunk/gcc/fix-header.c	2006-01-23 12:25:23.000000000 +0900
@@ -665,7 +665,8 @@ read_scan_file (char *in_fname, int argc
   if (cpp_errors (scan_in))
     exit (FATAL_EXIT_CODE);
 
-  register_include_chains (scan_in, NULL /* sysroot */, NULL /* iprefix */,
+  register_include_chains (scan_in, NULL /* sysroot */,
+			   NULL /* iprefix */, NULL /* imultilib */,
 			   true /* stdinc */, false /* cxx_stdinc */,
 			   false /* verbose */);
 


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]