Patchwork [build] Move MD_UNWIND_SUPPORT to toplevel libgcc

login
register
mail settings
Submitter Thomas Schwinge
Date July 5, 2011, 12:13 p.m.
Message ID <87iprhgc32.fsf@kepler.schwinge.homeip.net>
Download mbox | patch
Permalink /patch/103267/
State Accepted, archived
Headers show

Comments

Thomas Schwinge - July 5, 2011, 12:13 p.m.
Hallo!

On Tue, 05 Jul 2011 13:52:08 +0200, Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> wrote:
> > Like this?  [...]
> 
> Instead of nested cases, I'd rather use one i[34567]86-*-linux* case and
> another for the rest, duplicating extra_parts and tmake_file.  Same for
> x86_64-*-linux* vs. the rest.
> 
> But that's just me.

My idea was to keep the GNU systems' extra_parts and tmake_file stanzas
together.  But it's a bit wishi washi anyway in all these configuration
files, so we might as well use the following patch.

Manually tested as before -- more testing required?

	libgcc/
	config.host: Use i386/linux-unwind.h only for *-*-linux*.

---
 libgcc/config.host |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
Paolo Bonzini - July 5, 2011, 2:08 p.m.
On 07/05/2011 02:13 PM, Thomas Schwinge wrote:
> Hallo!
>
> On Tue, 05 Jul 2011 13:52:08 +0200, Rainer Orth<ro@CeBiTec.Uni-Bielefeld.DE>  wrote:
>>> Like this?  [...]
>>
>> Instead of nested cases, I'd rather use one i[34567]86-*-linux* case and
>> another for the rest, duplicating extra_parts and tmake_file.  Same for
>> x86_64-*-linux* vs. the rest.
>>
>> But that's just me.
>
> My idea was to keep the GNU systems' extra_parts and tmake_file stanzas
> together.  But it's a bit wishi washi anyway in all these configuration
> files, so we might as well use the following patch.
>
> Manually tested as before -- more testing required?
>
> 	libgcc/
> 	config.host: Use i386/linux-unwind.h only for *-*-linux*.

Ok, with changelog entry like

	* config.host (i[34567]86-*-kfreebsd*-gnu,
	i[34567]86-*-knetbsd*-gnu, i[34567]86-*-gnu*,
	i[34567]86-*-kopensolaris*-gnu): Remove md_unwind_header
	by splitting out of...
	(i[34567]86-*-linux*): ... this.
	* config.host (x86_64-*-kfreebsd*-gnu, x86_64-*-knetbsd*-gnu):
	Remove md_unwind_header by splitting out of...
	(x86_64-*-linux*): ... this.

Paolo

Patch

diff --git a/libgcc/config.host b/libgcc/config.host
index 326ce91..c89155f 100644
--- a/libgcc/config.host
+++ b/libgcc/config.host
@@ -351,16 +351,24 @@  i[34567]86-*-openbsd2.*|i[34567]86-*openbsd3.[0123])
 	;;
 i[34567]86-*-openbsd*)
 	;;
-i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu | i[34567]86-*-gnu* | i[34567]86-*-kopensolaris*-gnu)
+i[34567]86-*-linux*)
 	extra_parts="$extra_parts crtprec32.o crtprec64.o crtprec80.o crtfastmath.o"
 	tmake_file="${tmake_file} i386/t-crtpc i386/t-crtfm"
 	md_unwind_header=i386/linux-unwind.h
 	;;
-x86_64-*-linux* | x86_64-*-kfreebsd*-gnu | x86_64-*-knetbsd*-gnu)
+i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu | i[34567]86-*-gnu* | i[34567]86-*-kopensolaris*-gnu)
+	extra_parts="$extra_parts crtprec32.o crtprec64.o crtprec80.o crtfastmath.o"
+	tmake_file="${tmake_file} i386/t-crtpc i386/t-crtfm"
+	;;
+x86_64-*-linux*)
 	extra_parts="$extra_parts crtprec32.o crtprec64.o crtprec80.o crtfastmath.o"
 	tmake_file="${tmake_file} i386/t-crtpc i386/t-crtfm"
 	md_unwind_header=i386/linux-unwind.h
 	;;
+x86_64-*-kfreebsd*-gnu | x86_64-*-knetbsd*-gnu)
+	extra_parts="$extra_parts crtprec32.o crtprec64.o crtprec80.o crtfastmath.o"
+	tmake_file="${tmake_file} i386/t-crtpc i386/t-crtfm"
+	;;
 i[34567]86-pc-msdosdjgpp*)
 	;;
 i[34567]86-*-lynxos*)