This patch restores arm-none-eabi bootstrap, which had been broken by my
libgcc patches.  They accidentally removed arm/t-bpabi in gcc/config.gcc
while the file is still needed for its addition to EXTRA_HEADERS.

Matt confirmed in the PR that it restored bootstrap for him.

Ok for mainline?

        Rainer


2011-11-03  Rainer Orth  <r...@cebitec.uni-bielefeld.de>

        PR target/50978
        * config/arm/t-bpabi: New file.
        * config.gcc (arm*-*-linux*): Add arm/t-bpabi to tmake_file for
        arm*-*-linux-*eabi.
        (arm*-*-uclinux*): Add arm/t-bpabi to tmake_file for
        arm*-*-uclinux*eabi.
        (arm*-*-eabi*, arm*-*-symbianelf*): Add arm/t-bpabi to tmake_file
        for arm*-*-eabi*.

# HG changeset patch
# Parent 842d03d7a925718952de26cdcec4f361e68b956e
Restore arm-eabi bootstrap (PR target/50978)

diff --git a/gcc/config.gcc b/gcc/config.gcc
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -824,7 +824,7 @@ arm*-*-linux*)			# ARM GNU/Linux with EL
 	case ${target} in
 	arm*-*-linux-*eabi)
 	    tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h"
-	    tmake_file="$tmake_file arm/t-arm-elf arm/t-linux-eabi"
+	    tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi"
 	    # Define multilib configuration for arm-linux-androideabi.
 	    case ${target} in
 	    *-androideabi)
@@ -851,6 +851,7 @@ arm*-*-uclinux*)		# ARM ucLinux
 	case ${target} in
 	arm*-*-uclinux*eabi)
 	    tm_file="$tm_file arm/bpabi.h arm/uclinux-eabi.h"
+	    tmake_file="$tmake_file arm/t-bpabi"
   	    # The BPABI long long divmod functions return a 128-bit value in
 	    # registers r0-r3.  Correctly modeling that requires the use of
 	    # TImode.
@@ -875,6 +876,7 @@ arm*-*-eabi* | arm*-*-symbianelf* )
 	case ${target} in
 	arm*-*-eabi*)
 	  tm_file="$tm_file newlib-stdint.h"
+	  tmake_file="${tmake_file} arm/t-bpabi"
 	  use_gcc_stdint=wrap
 	  ;;
 	arm*-*-symbianelf*)
diff --git a/gcc/config/arm/t-bpabi b/gcc/config/arm/t-bpabi
new file mode 100644
--- /dev/null
+++ b/gcc/config/arm/t-bpabi
@@ -0,0 +1,1 @@
+EXTRA_HEADERS += $(srcdir)/ginclude/unwind-arm-common.h
-- 
-----------------------------------------------------------------------------
Rainer Orth, Center for Biotechnology, Bielefeld University

Reply via email to