This is the mail archive of the 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]

3.4 PATCH: Fix Solaris 8 Ada bootstrap failure

This patch originally submitted in

is necessary after the recent Ada merge to allow bootstrap on
sparc-sun-solaris2.8.  Bootstrap is into stage2 now, where it failed
previously as described in the message above.

Ok for mainline?


Rainer Orth, Faculty of Technology, Bielefeld University

Thu Jul 17 22:23:43 2003  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>

	* tracebak.c (MAX): Avoid redefinition warning.

	* init.c (__gnat_error_handler): Change msg to const char *.

Index: gcc/ada/init.c
RCS file: /cvs/gcc/gcc/gcc/ada/init.c,v
retrieving revision 1.16
diff -u -p -r1.16 init.c
--- gcc/ada/init.c	21 Oct 2003 13:42:09 -0000	1.16
+++ gcc/ada/init.c	21 Oct 2003 18:05:11 -0000
@@ -1194,7 +1194,7 @@ __gnat_error_handler (sig, sip)
   struct Exception_Data *exception;
   static int recurse = 0;
-  char *msg;
+  const char *msg;
   /* If this was an explicit signal from a "kill", just resignal it.  */
   if (SI_FROMUSER (sip))
Index: gcc/ada/tracebak.c
RCS file: /cvs/gcc/gcc/gcc/ada/tracebak.c,v
retrieving revision 1.6
diff -u -p -r1.6 tracebak.c
--- gcc/ada/tracebak.c	21 Oct 2003 13:42:23 -0000	1.6
+++ gcc/ada/tracebak.c	21 Oct 2003 18:05:11 -0000
@@ -327,7 +327,9 @@ extern unsigned int _image_base__;
 #define VALID_STACK_FRAME(ptr) 1
+#ifndef MAX
 #define MAX(x,y) ((x) > (y) ? (x) : (y))
 /* Define a dummy function to call if FORCE_CALL is defined.  Don't
    define it otherwise, as this could lead to "defined but not used"

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