Hallo! On Wed, 29 Jun 2011 10:40:10 +0200, Paolo Bonzini <bonz...@gnu.org> wrote: > On 06/21/2011 12:04 PM, Rainer Orth wrote: > > For md_unwind_header on the other hand, you'd have almost as many cases > > as in the general case. I fear it's hard to have the configuration > > split over too many places. So I'd suggest to split the affected cases > > into Linux and non-Linux ones, with the slight duplication necessary for > > extra_parts and tmake_file. > > I agree. Thomas, are you going to do that?
Like this?
libgcc/
config.host: Use i386/linux-unwind.h only for *-*-linux*.
---
libgcc/config.host | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/libgcc/config.host b/libgcc/config.host
index 326ce91..1d5b887 100644
--- a/libgcc/config.host
+++ b/libgcc/config.host
@@ -354,12 +354,18 @@ 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)
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
+ case $host in
+ *-*-linux*)
+ md_unwind_header=i386/linux-unwind.h;;
+ esac
;;
x86_64-*-linux* | 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"
- md_unwind_header=i386/linux-unwind.h
+ case $host in
+ *-*-linux*)
+ md_unwind_header=i386/linux-unwind.h;;
+ esac
;;
i[34567]86-pc-msdosdjgpp*)
;;
--
tg: (1677490..) linux-unwind.h (depends on: master)
Manually tested as follows -- is that enough?
$ (host=i686-pc-linux-gnu && . libgcc/config.host && echo
"$md_unwind_header")
i386/linux-unwind.h
$ (host=i686-pc-kfreebsd-gnu && . libgcc/config.host && echo
"$md_unwind_header")
no-unwind.h
$ (host=i686-pc-gnu && . libgcc/config.host && echo "$md_unwind_header")
no-unwind.h
$ (host=x86_64-pc-linux-gnu && . libgcc/config.host && echo
"$md_unwind_header")
i386/linux-unwind.h
$ (host=x86_64-pc-kfreebsd-gnu && . libgcc/config.host && echo
"$md_unwind_header")
no-unwind.h
Grüße,
Thomas
pgpMovGGfxHVZ.pgp
Description: PGP signature
