From d4b4b54263c81a0fbebc54580ab3ebb279d14d54 Mon Sep 17 00:00:00 2001
From: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
Date: Mon, 21 Nov 2011 16:13:13 +0000
Subject: [PATCH] Fix LIB2ADD overrides in libgcc
* config.host (iq2000*-*-elf*): Add iq2000/t-iq2000 to tmake_file.
(powerpc-*-netbsd*): Add rs6000/t-netbsd to tmake_file.
(powerpc-wrs-vxworks, powerpc-wrs-vxworksae): Add to tmake_file.
(powerpc-*-lynxos*): Add rs6000/t-lynx to tmake_file.
* config/i386/t-darwin64: Remove.
* config/sh/t-netbsd (LIB2ADD): Remove.
From-SVN: r181587
---
libgcc/ChangeLog | 9 +++++++++
libgcc/config.host | 8 ++++----
libgcc/config/i386/t-darwin64 | 2 --
libgcc/config/sh/t-netbsd | 2 --
4 files changed, 13 insertions(+), 8 deletions(-)
delete mode 100644 libgcc/config/i386/t-darwin64
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index b3c8d66b072a..13881d810531 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,12 @@
+2011-11-21 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+
+ * config.host (iq2000*-*-elf*): Add iq2000/t-iq2000 to tmake_file.
+ (powerpc-*-netbsd*): Add rs6000/t-netbsd to tmake_file.
+ (powerpc-wrs-vxworks, powerpc-wrs-vxworksae): Add to tmake_file.
+ (powerpc-*-lynxos*): Add rs6000/t-lynx to tmake_file.
+ * config/i386/t-darwin64: Remove.
+ * config/sh/t-netbsd (LIB2ADD): Remove.
+
2011-11-21 Georg-Johann Lay <avr@gjlay.de>
PR target/49313
diff --git a/libgcc/config.host b/libgcc/config.host
index ef591becd9b9..caf5cbcf2104 100644
--- a/libgcc/config.host
+++ b/libgcc/config.host
@@ -663,7 +663,7 @@ ia64-hp-*vms*)
md_unwind_header=ia64/vms-unwind.h
;;
iq2000*-*-elf*)
- tmake_file=t-fdpbit
+ tmake_file="iq2000/t-iq2000 t-fdpbit"
# Don't use default.
extra_parts=
;;
@@ -847,7 +847,7 @@ powerpc-*-freebsd*)
extra_parts="$extra_parts crtbeginT.o ecrti.o ecrtn.o ncrti.o ncrtn.o"
;;
powerpc-*-netbsd*)
- tmake_file="$tmake_file rs6000/t-crtstuff"
+ tmake_file="$tmake_file rs6000/t-netbsd rs6000/t-crtstuff"
;;
powerpc-*-eabispe*)
tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-crtstuff t-crtstuff-pic"
@@ -887,10 +887,10 @@ powerpc-*-linux* | powerpc64-*-linux*)
md_unwind_header=rs6000/linux-unwind.h
;;
powerpc-wrs-vxworks|powerpc-wrs-vxworksae)
- tmake_file="rs6000/t-ppccomm-ldbl t-fdpbit"
+ tmake_file="$tmake_file rs6000/t-ppccomm-ldbl t-fdpbit"
;;
powerpc-*-lynxos*)
- tmake_file="$tmake_file t-fdpbit"
+ tmake_file="$tmake_file rs6000/t-lynx t-fdpbit"
;;
powerpcle-*-elf*)
tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-ppccomm-ldbl rs6000/t-crtstuff t-crtstuff-pic t-fdpbit"
diff --git a/libgcc/config/i386/t-darwin64 b/libgcc/config/i386/t-darwin64
deleted file mode 100644
index 30cf58b38f9a..000000000000
--- a/libgcc/config/i386/t-darwin64
+++ /dev/null
@@ -1,2 +0,0 @@
-LIB2_SIDITI_CONV_FUNCS = yes
-LIB2ADD = $(srcdir)/config/darwin-64.c
diff --git a/libgcc/config/sh/t-netbsd b/libgcc/config/sh/t-netbsd
index d4df407fa165..3c5739e2ffc1 100644
--- a/libgcc/config/sh/t-netbsd
+++ b/libgcc/config/sh/t-netbsd
@@ -1,5 +1,3 @@
LIB1ASMFUNCS_CACHE = _ic_invalidate
-LIB2ADD =
-
HOST_LIBGCC2_CFLAGS += -mieee
--
GitLab