Patchwork libada: fix multilib bug

login
register
mail settings
Submitter Andreas Schwab
Date Jan. 14, 2012, 7:45 p.m.
Message ID <m2d3amnk4e.fsf@igel.home>
Download mbox | patch
Permalink /patch/136102/
State New
Headers show

Comments

Andreas Schwab - Jan. 14, 2012, 7:45 p.m.
s-oscons-tmplt.i must be compiled with the right MULTIFLAGS.  Tested on
powerpc-linux.

Andreas.

2012-01-14  Andreas Schwab <schwab@linux-m68k.org>

	* gcc-interface/Makefile.in (OSCONS_EXTRACT): Add $(GNATLIBCFLAGS).
Arnaud Charlet - Jan. 14, 2012, 8:31 p.m.
> s-oscons-tmplt.i must be compiled with the right MULTIFLAGS.  Tested on
> powerpc-linux.
> 
> Andreas.
> 
> 2012-01-14  Andreas Schwab <schwab@linux-m68k.org>
> 
> 	* gcc-interface/Makefile.in (OSCONS_EXTRACT): Add $(GNATLIBCFLAGS).

OK

> diff --git a/gcc/ada/gcc-interface/Makefile.in
> b/gcc/ada/gcc-interface/Makefile.in
> index 6a7da6c..520e618 100644
> --- a/gcc/ada/gcc-interface/Makefile.in
> +++ b/gcc/ada/gcc-interface/Makefile.in
> @@ -1,5 +1,5 @@
>  # Makefile for GNU Ada Compiler (GNAT).
> -#   Copyright (C) 1994-2011 Free Software Foundation, Inc.
> +#   Copyright (C) 1994-2012 Free Software Foundation, Inc.
>  
>  #This file is part of GCC.
>  
> @@ -2575,7 +2575,7 @@ OSCONS_CC=`echo "$(GCC_FOR_TARGET)" \
>    | sed -e 's^\./xgcc^../../xgcc^' -e 's^-B./^-B../../^'`
>  OSCONS_CPP=$(OSCONS_CC) $(GNATLIBCFLAGS) -E -C \
>    -DTARGET=\"$(target)\" $(fsrcpfx)ada/s-oscons-tmplt.c >
>    s-oscons-tmplt.i
> -OSCONS_EXTRACT=$(OSCONS_CC) -S s-oscons-tmplt.i
> +OSCONS_EXTRACT=$(OSCONS_CC) $(GNATLIBCFLAGS) -S s-oscons-tmplt.i
>  endif
>  
>  ./bldtools/oscons/xoscons: xoscons.adb xutil.ads xutil.adb

Patch

diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
index 6a7da6c..520e618 100644
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -1,5 +1,5 @@ 
 # Makefile for GNU Ada Compiler (GNAT).
-#   Copyright (C) 1994-2011 Free Software Foundation, Inc.
+#   Copyright (C) 1994-2012 Free Software Foundation, Inc.
 
 #This file is part of GCC.
 
@@ -2575,7 +2575,7 @@  OSCONS_CC=`echo "$(GCC_FOR_TARGET)" \
   | sed -e 's^\./xgcc^../../xgcc^' -e 's^-B./^-B../../^'`
 OSCONS_CPP=$(OSCONS_CC) $(GNATLIBCFLAGS) -E -C \
   -DTARGET=\"$(target)\" $(fsrcpfx)ada/s-oscons-tmplt.c > s-oscons-tmplt.i
-OSCONS_EXTRACT=$(OSCONS_CC) -S s-oscons-tmplt.i
+OSCONS_EXTRACT=$(OSCONS_CC) $(GNATLIBCFLAGS) -S s-oscons-tmplt.i
 endif
 
 ./bldtools/oscons/xoscons: xoscons.adb xutil.ads xutil.adb