Patchwork Fix Solaris Ada bootstrap

login
register
mail settings
Submitter Rainer Orth
Date Aug. 3, 2011, 10:39 a.m.
Message ID <ydd62mepyme.fsf@manam.CeBiTec.Uni-Bielefeld.DE>
Download mbox | patch
Permalink /patch/108104/
State New
Headers show

Comments

Rainer Orth - Aug. 3, 2011, 10:39 a.m.
Two of the latest Ada patches broke bootstrap on Solaris:

In file included from /vol/gcc/src/hg/trunk/local/gcc/ada/link.c:42:0:
./auto-host.h:1829:0: error: "_FILE_OFFSET_BITS" redefined [-Werror]
/var/gcc/regression/trunk/10-gcc/build/./prev-gcc/include-fixed/sys/feature_tests.h:197:0: note: this is the location of the previous definition
cc1plus: all warnings being treated as errors

auto-host.h has

/* Number of bits in a file offset, on hosts where this is settable. */
#ifndef USED_FOR_TARGET
#define _FILE_OFFSET_BITS 64
#endif

while <sys/feature_tests.h> defaults to 32 if undefined.  This can
easily be fixed by including auto-host.h before any system header.

i386-pc-solaris2.10 bootstrap is just in progress, but already past the
point of the previous failure.

Ok for mainline?

Thanks.
	Rainer


2011-08-03  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>

	* link.c: Include "auto-host.h" before system headers.
Arnaud Charlet - Aug. 3, 2011, 1:50 p.m.
> Ok for mainline?
> 
> Thanks.
> 	Rainer
> 
> 
> 2011-08-03  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
> 
> 	* link.c: Include "auto-host.h" before system headers.

OK, thanks.

Patch

diff --git a/gcc/ada/link.c b/gcc/ada/link.c
--- a/gcc/ada/link.c
+++ b/gcc/ada/link.c
@@ -36,12 +36,12 @@ 
 extern "C" {
 #endif
 
-#include <string.h>
-
 #ifdef IN_GCC
 #include "auto-host.h"
 #endif
 
+#include <string.h>
+
 /*  objlist_file_supported is set to 1 when the system linker allows        */
 /*  response file, that is a file that contains the list of object files.   */
 /*  This is useful on systems where the command line length is limited,     */