summaryrefslogtreecommitdiff
path: root/libgcc
diff options
context:
space:
mode:
authorsje <sje@138bc75d-0d04-0410-961f-82ee72b054a4>2014-08-12 15:28:41 +0000
committersje <sje@138bc75d-0d04-0410-961f-82ee72b054a4>2014-08-12 15:28:41 +0000
commit0898fffa076c93b41d7d19ecfc55602680a69766 (patch)
tree8307451936d0cfa3a29cc416fae6c9c721199f27 /libgcc
parentffd885164180a07f25cd00608ef6ea6b9a14eabd (diff)
downloadgcc-0898fffa076c93b41d7d19ecfc55602680a69766.tar.gz
2014-08-12 Steve Ellcey <sellcey@mips.com>
* config/mips/mips16.S: Skip when __mips_soft_float is defined. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@213870 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgcc')
-rw-r--r--libgcc/ChangeLog4
-rw-r--r--libgcc/config/mips/mips16.S10
2 files changed, 11 insertions, 3 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 911c16d3e3e..441ec93b329 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,7 @@
+2014-08-12 Steve Ellcey <sellcey@mips.com>
+
+ * config/mips/mips16.S: Skip when __mips_soft_float is defined.
+
2014-08-07 Nathan Sidwell <nathan@acm.org>
* Makefile.in (LIBGCOV_INTERFACE): Move _gcov_dump ...
diff --git a/libgcc/config/mips/mips16.S b/libgcc/config/mips/mips16.S
index 6a43a9839e7..dde8939b4a3 100644
--- a/libgcc/config/mips/mips16.S
+++ b/libgcc/config/mips/mips16.S
@@ -21,8 +21,12 @@ a copy of the GCC Runtime Library Exception along with this program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#ifdef __mips_micromips
- /* DO NOTHING */
+#if defined(__mips_micromips) || defined(__mips_soft_float)
+ /* Do nothing because this code is only needed when linking
+ against mips16 hard-float objects. Neither micromips code
+ nor soft-float code can be linked against mips16 hard-float
+ objects so we do not need these routines when building libgcc
+ for those cases. */
#else
/* This file contains mips16 floating point support functions. These
@@ -749,4 +753,4 @@ CALL_STUB_RET (__mips16_call_stub_dc_10, 10, DC)
#endif /* !__mips_single_float */
#endif
-#endif /* __mips_micromips */
+#endif /* defined(__mips_micromips) || defined(__mips_soft_float) */