From: H.J. Lu <hongjiu.lu@intel.com>
Date: Wed, 2 Jul 2008 19:31:53 +0000 (+0000)
Subject: re PR bootstrap/36702 (Bootstrap fails at revision 137369 on i686-apple-darwin9)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c174f11c1b17eaebe8e8ffe4f10c197258e76bf9;p=gcc.git

re PR bootstrap/36702 (Bootstrap fails at revision 137369 on i686-apple-darwin9)

2008-07-02  H.J. Lu  <hongjiu.lu@intel.com>

	PR boostrap/36702
	* config.host: Only include 32bit t-fprules-softfp for Darwin/x86
	and Linux/x86.  Include 64bit t-softfp-compat for Linux/x86.

	* config/i386/64/t-fprules-softfp: Moved to ...
	* config/i386/64/t-softfp-compat: This.  New.

From-SVN: r137380
---

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index d8bfd54eed3..6779c0f7732 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,12 @@
+2008-07-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR boostrap/36702
+	* config.host: Only include 32bit t-fprules-softfp for Darwin/x86
+	and Linux/x86.  Include 64bit t-softfp-compat for Linux/x86.
+
+	* config/i386/64/t-fprules-softfp: Moved to ...
+	* config/i386/64/t-softfp-compat: This.  New.
+
 2008-07-02  Uros Bizjak  <ubizjak@gmail.com>
 
 	* config/i386/32/sfp-machine.h (FP_HANDLE_EXCEPTIONS) [FP_EX_INVALID]:
diff --git a/libgcc/config.host b/libgcc/config.host
index ca07a07fadc..93d1dbfacbb 100644
--- a/libgcc/config.host
+++ b/libgcc/config.host
@@ -582,6 +582,17 @@ esac
 case ${host} in
 i[34567]86-*-darwin* | x86_64-*-darwin* | \
   i[34567]86-*-linux* | x86_64-*-linux*)
-	tmake_file="${tmake_file} i386/${host_address}/t-fprules-softfp"
+	if test "${host_address}" = 32; then
+		tmake_file="${tmake_file} i386/${host_address}/t-fprules-softfp"
+	fi
+	;;
+esac
+
+case ${host} in
+i[34567]86-*-linux* | x86_64-*-linux*)
+	# Provide backward binary compatibility for 64bit Linux/x86.
+	if test "${host_address}" = 64; then
+		tmake_file="${tmake_file} i386/${host_address}/t-softfp-compat"
+	fi
 	;;
 esac
diff --git a/libgcc/config/i386/64/t-fprules-softfp b/libgcc/config/i386/64/t-fprules-softfp
deleted file mode 100644
index e8cda296cbd..00000000000
--- a/libgcc/config/i386/64/t-fprules-softfp
+++ /dev/null
@@ -1,12 +0,0 @@
-# Filter out the following TImode functions and provide backward binary
-# compatibility.
-tf-compats = getf2.c letf2.c eqtf2.c
-tf-functions := $(addprefix $(gcc_srcdir)/config/soft-fp/, $(tf-compats))
-LIB2ADD := $(filter-out $(tf-functions), $(LIB2ADD))
-LIB2ADD += $(addprefix $(srcdir)/config/i386/64/, $(tf-compats))
-
-# Replace _divtc3, _multc3 and _powitf2.
-libgcc2-tf-functions = _divtc3 _multc3 _powitf2
-LIB2FUNCS_EXCLUDE += $(libgcc2-tf-functions)
-libgcc2-tf-compats = $(addsuffix -compat.c, $(libgcc2-tf-functions))
-LIB2ADD += $(addprefix $(srcdir)/config/i386/64/, $(libgcc2-tf-compats))
diff --git a/libgcc/config/i386/64/t-softfp-compat b/libgcc/config/i386/64/t-softfp-compat
new file mode 100644
index 00000000000..e8cda296cbd
--- /dev/null
+++ b/libgcc/config/i386/64/t-softfp-compat
@@ -0,0 +1,12 @@
+# Filter out the following TImode functions and provide backward binary
+# compatibility.
+tf-compats = getf2.c letf2.c eqtf2.c
+tf-functions := $(addprefix $(gcc_srcdir)/config/soft-fp/, $(tf-compats))
+LIB2ADD := $(filter-out $(tf-functions), $(LIB2ADD))
+LIB2ADD += $(addprefix $(srcdir)/config/i386/64/, $(tf-compats))
+
+# Replace _divtc3, _multc3 and _powitf2.
+libgcc2-tf-functions = _divtc3 _multc3 _powitf2
+LIB2FUNCS_EXCLUDE += $(libgcc2-tf-functions)
+libgcc2-tf-compats = $(addsuffix -compat.c, $(libgcc2-tf-functions))
+LIB2ADD += $(addprefix $(srcdir)/config/i386/64/, $(libgcc2-tf-compats))