diff mbox

[build] Move unwinder to toplevel libgcc (v2)

Message ID 87hb5upekj.fsf@firetop.home
State New
Headers show

Commit Message

Richard Sandiford Aug. 6, 2011, 6:42 p.m. UTC
Thanks again for doing this.

Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> writes:
> 	* config.host (unwind_header): New variable.
> 	(*-*-freebsd*): Set tmake_file to t-eh-dw2-dip.
> 	(*-*-linux*, frv-*-*linux*, *-*-kfreebsd*-gnu, *-*-knetbsd*-gnu,
> 	*-*-gnu*): Likewise, also for *-*-kopensolaris*-gnu.
> 	(*-*-solaris2*): Add t-eh-dw2-dip to tmake_file.

The combination of this and the soft-fp patch meant that t-mips
wasn't included by mips*-linux-gnu.  The fix below seemed obvious,
especially given the solaris case, so I applied it after testing
on mips64-linux-gnu.

Richard


libgcc/
	* config.host (*-*-darwin*, *-*-freebsd*, *-*-linux*, frv-*-*linux*)
	(*-*-kfreebsd*-gnu, *-*-knetbsd*-gnu, *-*-gnu*, *-*-kopensolaris*-gnu):
	Add to tmake_file rather than overriding it.

Comments

Rainer Orth Aug. 9, 2011, 12:34 p.m. UTC | #1
Richard Sandiford <rdsandiford@googlemail.com> writes:

> Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> writes:
>> 	* config.host (unwind_header): New variable.
>> 	(*-*-freebsd*): Set tmake_file to t-eh-dw2-dip.
>> 	(*-*-linux*, frv-*-*linux*, *-*-kfreebsd*-gnu, *-*-knetbsd*-gnu,
>> 	*-*-gnu*): Likewise, also for *-*-kopensolaris*-gnu.
>> 	(*-*-solaris2*): Add t-eh-dw2-dip to tmake_file.
>
> The combination of this and the soft-fp patch meant that t-mips
> wasn't included by mips*-linux-gnu.  The fix below seemed obvious,
> especially given the solaris case, so I applied it after testing
> on mips64-linux-gnu.

Indeed.  I think the default should be to append to variables, with
every exception requiring a comment explaining what's going on.  I'm
trying to do so in the rest of the patch series.  config.host (and
config.gcc) will probably require a final pass checking for such cases.

Thanks for fixing this.

	Rainer

> libgcc/
> 	* config.host (*-*-darwin*, *-*-freebsd*, *-*-linux*, frv-*-*linux*)
> 	(*-*-kfreebsd*-gnu, *-*-knetbsd*-gnu, *-*-gnu*, *-*-kopensolaris*-gnu):
> 	Add to tmake_file rather than overriding it.
>
> Index: libgcc/config.host
> ===================================================================
> --- libgcc/config.host	2011-08-06 15:36:16.000000000 +0100
> +++ libgcc/config.host	2011-08-06 15:36:52.000000000 +0100
> @@ -163,7 +163,7 @@ esac
>  case ${host} in
>  *-*-darwin*)
>    asm_hidden_op=.private_extern
> -  tmake_file="t-darwin ${cpu_type}/t-darwin t-slibgcc-darwin"
> +  tmake_file="$tmake_file t-darwin ${cpu_type}/t-darwin t-slibgcc-darwin"
>    extra_parts=crt3.o
>    ;;
>  *-*-freebsd[12] | *-*-freebsd[12].* | *-*-freebsd*aout*)
> @@ -179,10 +179,10 @@ case ${host} in
>    # This is the generic ELF configuration of FreeBSD.  Later
>    # machine-specific sections may refine and add to this
>    # configuration.
> -  tmake_file=t-eh-dw2-dip
> +  tmake_file="$tmake_file t-eh-dw2-dip"
>    ;;
>  *-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu | *-*-gnu* | *-*-kopensolaris*-gnu)
> -  tmake_file=t-eh-dw2-dip
> +  tmake_file="$tmake_file t-eh-dw2-dip"
>    extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
>    ;;
>  *-*-netbsd*)
diff mbox

Patch

Index: libgcc/config.host
===================================================================
--- libgcc/config.host	2011-08-06 15:36:16.000000000 +0100
+++ libgcc/config.host	2011-08-06 15:36:52.000000000 +0100
@@ -163,7 +163,7 @@  esac
 case ${host} in
 *-*-darwin*)
   asm_hidden_op=.private_extern
-  tmake_file="t-darwin ${cpu_type}/t-darwin t-slibgcc-darwin"
+  tmake_file="$tmake_file t-darwin ${cpu_type}/t-darwin t-slibgcc-darwin"
   extra_parts=crt3.o
   ;;
 *-*-freebsd[12] | *-*-freebsd[12].* | *-*-freebsd*aout*)
@@ -179,10 +179,10 @@  case ${host} in
   # This is the generic ELF configuration of FreeBSD.  Later
   # machine-specific sections may refine and add to this
   # configuration.
-  tmake_file=t-eh-dw2-dip
+  tmake_file="$tmake_file t-eh-dw2-dip"
   ;;
 *-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu | *-*-gnu* | *-*-kopensolaris*-gnu)
-  tmake_file=t-eh-dw2-dip
+  tmake_file="$tmake_file t-eh-dw2-dip"
   extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
   ;;
 *-*-netbsd*)