aboutsummaryrefslogtreecommitdiff
path: root/libgcc
diff options
context:
space:
mode:
authorYvan Roux <yvan.roux@linaro.org>2016-06-15 10:42:05 +0200
committerYvan Roux <yvan.roux@linaro.org>2016-06-15 10:42:05 +0200
commit336d434c49ee9e0c0ea775026ca98f1906cf80e3 (patch)
tree2174a9491fbaab919df3d9092c23aac341d2220f /libgcc
parent4df3f0b0fea4f3fca1837070c27ec872f4500931 (diff)
Merge branches/gcc-6-branch rev 237469.
Change-Id: I4891542fc1d8fd3bb75e92a8805a8d069022b522
Diffstat (limited to 'libgcc')
-rw-r--r--libgcc/ChangeLog10
-rw-r--r--libgcc/config.host9
2 files changed, 12 insertions, 7 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 65595641566..f1ae9fef698 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,13 @@
+2016-05-17 Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+ Backport from mainline
+ 2016-05-10 Joel Sherrill <joel@rtems.org>
+
+ PR libgcc/70720
+ * config.host (moxie-*-rtems*): Merge this stanza with other moxie
+ targets so the same extra_parts are built. Also have tmake_file add
+ on to its value rather than override.
+
2016-04-27 Release Manager
* GCC 6.1.0 released.
diff --git a/libgcc/config.host b/libgcc/config.host
index b61a579bea0..16a45c81b8f 100644
--- a/libgcc/config.host
+++ b/libgcc/config.host
@@ -931,14 +931,9 @@ mmix-knuth-mmixware)
mn10300-*-*)
tmake_file=t-fdpbit
;;
-moxie-*-elf | moxie-*-moxiebox* | moxie-*-uclinux*)
- tmake_file="moxie/t-moxie t-softfp-sfdf t-softfp-excl t-softfp"
- extra_parts="$extra_parts crti.o crtn.o crtbegin.o crtend.o"
- ;;
-moxie-*-rtems*)
+moxie-*-elf | moxie-*-moxiebox* | moxie-*-uclinux* | moxie-*-rtems*)
tmake_file="$tmake_file moxie/t-moxie t-softfp-sfdf t-softfp-excl t-softfp"
- # Don't use default.
- extra_parts=
+ extra_parts="$extra_parts crti.o crtn.o crtbegin.o crtend.o"
;;
msp430*-*-elf)
tmake_file="$tm_file t-crtstuff t-fdpbit msp430/t-msp430"