config.host: Include t-floattodi also for s390x.

2014-02-05  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>

	* config.host: Include t-floattodi also for s390x.
	* config/s390/32/_fixdfdi.c: Omit in 64 bit mode.
	* config/s390/32/_fixsfdi.c: Likewise.
	* config/s390/32/_fixtfdi.c: Likewise.
	* config/s390/32/_fixunsdfdi.c: Likewise.
	* config/s390/32/_fixunssfdi.c: Likewise.
	* config/s390/32/_fixunstfdi.c: Likewise.

From-SVN: r207507

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index f561edd227470ee40257045e21f2380ac7cbf916..68b7eaf23cf2b7a1a6869b51fda76ec09df884ba 100644 (file)
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,13 @@
+2014-02-05  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+       * config.host: Include t-floattodi also for s390x.
+       * config/s390/32/_fixdfdi.c: Omit in 64 bit mode.
+       * config/s390/32/_fixsfdi.c: Likewise.
+       * config/s390/32/_fixtfdi.c: Likewise.
+       * config/s390/32/_fixunsdfdi.c: Likewise.
+       * config/s390/32/_fixunssfdi.c: Likewise.
+       * config/s390/32/_fixunstfdi.c: Likewise.
+
 2014-02-04  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
        PR target/59788

diff --git a/libgcc/config.host b/libgcc/config.host
index cc7becf15efa2551dc072b2bf69b4672bad239aa..902a5827a1b50afbc221ce5de2943e320e745742 100644 (file)
--- a/libgcc/config.host
+++ b/libgcc/config.host
@@ -1013,7 +1013,7 @@ s390-*-linux*)
        md_unwind_header=s390/linux-unwind.h
        ;;
 s390x-*-linux*)
-       tmake_file="${tmake_file} s390/t-crtstuff s390/t-linux"
+       tmake_file="${tmake_file} s390/t-crtstuff s390/t-linux s390/32/t-floattodi"
        md_unwind_header=s390/linux-unwind.h
        ;;
 s390x-ibm-tpf*)

diff --git a/libgcc/config/s390/32/_fixdfdi.c b/libgcc/config/s390/32/_fixdfdi.c
index 1c6954c706754d2c5ced74cb53b5b4ba75113e41..b1ba06d7335433a28d174ecf9c913777ea912d4a 100644 (file)
--- a/libgcc/config/s390/32/_fixdfdi.c
+++ b/libgcc/config/s390/32/_fixdfdi.c
@@ -24,6 +24,8 @@ 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/>.  */
 
+#ifndef __s390x__
+
 #define EXPD(fp)       (((fp.l.upper) >> 20) & 0x7FF)
 #define EXCESSD                1022
 #define SIGNBIT                0x80000000
@@ -94,3 +96,4 @@ __fixdfdi (double a1)
 
     return (SIGND (dl1) ? -l : l);
 }
+#endif /* !__s390x__ */

diff --git a/libgcc/config/s390/32/_fixsfdi.c b/libgcc/config/s390/32/_fixsfdi.c
index eaabd18d0e0ccae57df82c2b78211c7f450672d7..dbf40b43a723094a19c3a0060ed1f5526dd87aca 100644 (file)
--- a/libgcc/config/s390/32/_fixsfdi.c
+++ b/libgcc/config/s390/32/_fixsfdi.c
@@ -24,6 +24,8 @@ 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/>.  */
 
+#ifndef __s390x__
+
 #define EXP(fp)         (((fp.l) >> 23) & 0xFF)
 #define EXCESS          126
 #define SIGNBIT         0x80000000
@@ -90,3 +92,4 @@ __fixsfdi (float a1)
 
     return (SIGN (fl1) ? -l : l);
 }
+#endif /* !__s390x__ */

diff --git a/libgcc/config/s390/32/_fixtfdi.c b/libgcc/config/s390/32/_fixtfdi.c
index 51807d19d0f83ea40ca0c18ae5a54e379f3dfe6c..50b6c9b46ac4eb92bf4225676f9cd934f4f9051f 100644 (file)
--- a/libgcc/config/s390/32/_fixtfdi.c
+++ b/libgcc/config/s390/32/_fixtfdi.c
@@ -24,6 +24,8 @@ 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/>.  */
 
+#ifndef __s390x__
+
 #define EXPD(fp)          (((fp.l.i[0]) >> 16) & 0x7FFF)
 #define EXPONENT_BIAS     16383
 #define MANTISSA_BITS      112
@@ -99,3 +101,4 @@ __fixtfdi (long double a1)
 
     return SIGND (dl1) ? -(l >> -exp) : l >> -exp;
 }
+#endif /* !__s390x__ */

diff --git a/libgcc/config/s390/32/_fixunsdfdi.c b/libgcc/config/s390/32/_fixunsdfdi.c
index 7786bdc3458577a07ef5a63ca98d942b014490cd..84cc8bc1a38e33741db583b240f738d14e6b1ad1 100644 (file)
--- a/libgcc/config/s390/32/_fixunsdfdi.c
+++ b/libgcc/config/s390/32/_fixunsdfdi.c
@@ -24,6 +24,8 @@ 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/>.  */
 
+#ifndef __s390x__
+
 #define EXPD(fp)       (((fp.l.upper) >> 20) & 0x7FF)
 #define EXCESSD                1022
 #define SIGNBIT                0x80000000
@@ -91,3 +93,4 @@ __fixunsdfdi (double a1)
 
     return l;
 }
+#endif /* !__s390x__ */

diff --git a/libgcc/config/s390/32/_fixunssfdi.c b/libgcc/config/s390/32/_fixunssfdi.c
index b007cf644cef44257442ed5b01744566ee244b83..aeb477a4ee84a0487b965234af3bf1b30adc6454 100644 (file)
--- a/libgcc/config/s390/32/_fixunssfdi.c
+++ b/libgcc/config/s390/32/_fixunssfdi.c
@@ -24,6 +24,8 @@ 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/>.  */
 
+#ifndef __s390x__
+
 #define EXP(fp)         (((fp.l) >> 23) & 0xFF)
 #define EXCESS          126
 #define SIGNBIT         0x80000000
@@ -87,3 +89,4 @@ __fixunssfdi (float a1)
 
     return l;
 }
+#endif /* !__s390x__ */

diff --git a/libgcc/config/s390/32/_fixunstfdi.c b/libgcc/config/s390/32/_fixunstfdi.c
index cf4fbdb9ba78a39e55f3f5b377340e9862e9a9ee..0e2c61fb270dd1ece3bbbae5cd4ef535bc0a09b9 100644 (file)
--- a/libgcc/config/s390/32/_fixunstfdi.c
+++ b/libgcc/config/s390/32/_fixunstfdi.c
@@ -24,6 +24,8 @@ 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/>.  */
 
+#ifndef __s390x__
+
 #define EXPD(fp)          (((fp.l.i[0]) >> 16) & 0x7FFF)
 #define EXPONENT_BIAS     16383
 #define MANTISSA_BITS      112
@@ -94,3 +96,5 @@ __fixunstfdi (long double a1)
 
     return l >> -exp;
 }
+
+#endif /* !__s390x__ */