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]

K&R fixes for bootstrap of gcc with HP bundled compiler on hppa64-hpux


This fixes two issues noted building with the HP bundled compiler.
The expr.h change is obvious.  The change to gengtype-lex.l is to
prevent the defines for malloc and realloc from redefining system
declarations for malloc and realloc.  This results in inconsistent
declarations for xmalloc and xrealloc.

The change to gengtype-lex.l should also be applied to the 3.3
branch.

Ok for main?  Ok for gengtype-lex.l change to 3.3 branch?

Tested with bootstrap and check of C language using HP bundled compiler
on hppa64-hp-hpux11.11.  Full bootstap with gcc is in progress.

Dave
-- 
J. David Anglin                                  dave.anglin@nrc-cnrc.gc.ca
National Research Council of Canada              (613) 990-0752 (FAX: 952-6605)

2003-01-10  John David Anglin  <dave.anglin@nrc.gc.ca>

	* expr.h (emit_conditional_add): Add PARAMS to declaration.
	* gengtype-lex.l (malloc, realloc): Move defines after include of
	system.h.  Remove duplicate include of system.h.

Index: expr.h
===================================================================
RCS file: /cvsroot/gcc/gcc/gcc/expr.h,v
retrieving revision 1.125
diff -u -3 -p -r1.125 expr.h
--- expr.h	8 Jan 2003 11:20:18 -0000	1.125
+++ expr.h	10 Jan 2003 07:56:03 -0000
@@ -307,9 +307,9 @@ rtx emit_conditional_move PARAMS ((rtx, 
 int can_conditionally_move_p PARAMS ((enum machine_mode mode));
 
 #endif
-rtx emit_conditional_add (rtx, enum rtx_code, rtx, rtx,
-			  enum machine_mode, rtx, rtx,
-			  enum machine_mode, int);
+rtx emit_conditional_add PARAMS ((rtx, enum rtx_code, rtx, rtx,
+				  enum machine_mode, rtx, rtx,
+				  enum machine_mode, int));
 
 
 /* Functions from expmed.c:  */
Index: gengtype-lex.l
===================================================================
RCS file: /cvsroot/gcc/gcc/gcc/gengtype-lex.l,v
retrieving revision 1.10
diff -u -3 -p -r1.10 gengtype-lex.l
--- gengtype-lex.l	16 Dec 2002 18:19:33 -0000	1.10
+++ gengtype-lex.l	10 Jan 2003 07:56:03 -0000
@@ -20,13 +20,13 @@ Software Foundation, 59 Temple Place - S
 02111-1307, USA.  */
 
 %{
-#define malloc xmalloc
-#define realloc xrealloc
-
 #include "bconfig.h"
 #include "coretypes.h"
 #include "system.h"
-#include "system.h"
+
+#define malloc xmalloc
+#define realloc xrealloc
+
 #include "gengtype.h"
 #include "gengtype-yacc.h"
 


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