2009-06-29 Basile Starynkevitch <basile@starynkevitch.net>

	MELT branch merged with trunk r149060



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@149081 138bc75d-0d04-0410-961f-82ee72b054a4

9 files changed, 50 insertions, 4 deletions

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 8ce2a104cce..01c35fc5366 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,26 @@
+2009-06-23  DJ Delorie  <dj@redhat.com>
+
+	Add MeP port.
+	* config.host: Add mep support.
+
+2009-06-22  Kai Tietz  <kai.tietz@onevision.com>
+
+	* config.host: Add i386/${host_address}/t-fprules-softfp and
+	t-softfp to tmake_file for i[34567]86-*-mingw*, x86_64-*-mingw*.	
+
+	* config/i386/64/_divtc3.c: Disable usage of .symver assembly symbol
+	for mingw targets.
+	* config/i386/64/_multc3.c: Likewise.
+	* config/i386/64/_powitf2.c: Likewise.
+	* config/i386/64/eqtf2.c: Likewise.
+	* config/i386/64/getf2.c: Likewise.
+	* config/i386/64/letf2.c: Likewise.
+	* config/i386/64/letf2.c: Likewise.
+	* config/i386/64/sfp-machine.h (_FP_W_TYPE): Define as
+	unsigned long long for x64 mingw targets.
+	(_FP_WS_TYPE): Define as signed long long for x64 mingw target.
+	(_FP_I_TYPE): Define as long long for x64 mingw target.
+
 2009-06-10  Maciej W. Rozycki  <macro@linux-mips.org>
 
 	* config.host (vax-*-linux*): New.
diff --git a/libgcc/config.host b/libgcc/config.host
index 25879b1bc68..7d70f772aea 100644
--- a/libgcc/config.host
+++ b/libgcc/config.host
@@ -102,6 +102,8 @@ m32r*-*-*)
         ;;
 m68k-*-*)
 	;;
+mep*-*-*)
+	;;
 mips*-*-*)
 	cpu_type=mips
 	;;
@@ -553,6 +555,8 @@ am33_2.0-*-linux*)
 	;;
 m32c-*-elf*|m32c-*-rtems*)
  	;;
+mep*-*-*)
+	;;
 *)
 	echo "*** Configuration ${host} not supported" 1>&2
 	exit 1
@@ -571,7 +575,7 @@ case ${host} in
 i[34567]86-*-darwin* | x86_64-*-darwin* | \
   i[34567]86-*-kfreebsd*-gnu | x86_64-*-kfreebsd*-gnu | \
   i[34567]86-*-linux* | x86_64-*-linux* | \
-  i[34567]86-*-cygwin*)
+  i[34567]86-*-cygwin* | i[34567]86-*-mingw* | x86_64-*-mingw*)
 	if test "${host_address}" = 32; then
 		tmake_file="${tmake_file} t-softfp i386/${host_address}/t-fprules-softfp"
 	fi
diff --git a/libgcc/config/i386/64/_divtc3.c b/libgcc/config/i386/64/_divtc3.c
index 57ee350b7cd..0095d245ede 100644
--- a/libgcc/config/i386/64/_divtc3.c
+++ b/libgcc/config/i386/64/_divtc3.c
@@ -9,6 +9,8 @@
 #undef __divtc3
 extern __typeof__ (__divtc3_shared) __divtc3_compat __attribute__((alias ("__divtc3_shared")));
 
+#ifndef _WIN32
 asm (".symver __divtc3_compat,__divtc3@GCC_4.0.0");
 asm (".symver __divtc3_shared,__divtc3@@GCC_4.3.0");
 #endif
+#endif
diff --git a/libgcc/config/i386/64/_multc3.c b/libgcc/config/i386/64/_multc3.c
index 49141a9384f..08b5ee451d0 100644
--- a/libgcc/config/i386/64/_multc3.c
+++ b/libgcc/config/i386/64/_multc3.c
@@ -9,6 +9,8 @@
 #undef __multc3
 extern __typeof__ (__multc3_shared) __multc3_compat __attribute__((alias ("__multc3_shared")));
 
+#ifndef _WIN32
 asm (".symver __multc3_compat,__multc3@GCC_4.0.0");
 asm (".symver __multc3_shared,__multc3@@GCC_4.3.0");
 #endif
+#endif
diff --git a/libgcc/config/i386/64/_powitf2.c b/libgcc/config/i386/64/_powitf2.c
index 3bc3c904de7..e8360156b5b 100644
--- a/libgcc/config/i386/64/_powitf2.c
+++ b/libgcc/config/i386/64/_powitf2.c
@@ -9,6 +9,8 @@
 #undef __powitf2
 extern __typeof__ (__powitf2_shared) __powitf2_compat __attribute__((alias ("__powitf2_shared")));
 
+#ifndef _WIN32
 asm (".symver __powitf2_compat,__powitf2@GCC_4.0.0");
 asm (".symver __powitf2_shared,__powitf2@@GCC_4.3.0");
 #endif
+#endif
diff --git a/libgcc/config/i386/64/eqtf2.c b/libgcc/config/i386/64/eqtf2.c
index d9baba689be..785c42ad5c6 100644
--- a/libgcc/config/i386/64/eqtf2.c
+++ b/libgcc/config/i386/64/eqtf2.c
@@ -8,6 +8,8 @@
 #undef __netf2
 strong_alias (__netf2_shared, __netf2_compat);
 
+#ifndef _WIN32
 asm (".symver __netf2_compat,__netf2@GCC_3.0");
 asm (".symver __netf2_shared,__netf2@@GCC_4.3.0");
 #endif
+#endif
diff --git a/libgcc/config/i386/64/getf2.c b/libgcc/config/i386/64/getf2.c
index 30885cc0caf..280447c1e83 100644
--- a/libgcc/config/i386/64/getf2.c
+++ b/libgcc/config/i386/64/getf2.c
@@ -8,6 +8,8 @@
 #undef __gttf2
 strong_alias (__gttf2_shared, __gttf2_compat);
 
+#ifndef _WIN32
 asm (".symver __gttf2_compat,__gttf2@GCC_3.0");
 asm (".symver __gttf2_shared,__gttf2@@GCC_4.3.0");
 #endif
+#endif
diff --git a/libgcc/config/i386/64/letf2.c b/libgcc/config/i386/64/letf2.c
index 231f981c84c..81e0881c844 100644
--- a/libgcc/config/i386/64/letf2.c
+++ b/libgcc/config/i386/64/letf2.c
@@ -8,6 +8,8 @@
 #undef __lttf2
 strong_alias (__lttf2_shared, __lttf2_compat);
 
+#ifndef _WIN32
 asm (".symver __lttf2_compat,__lttf2@GCC_3.0");
 asm (".symver __lttf2_shared,__lttf2@@GCC_4.3.0");
 #endif
+#endif
diff --git a/libgcc/config/i386/64/sfp-machine.h b/libgcc/config/i386/64/sfp-machine.h
index 190e3cb0e81..5adf6dbbaa4 100644
--- a/libgcc/config/i386/64/sfp-machine.h
+++ b/libgcc/config/i386/64/sfp-machine.h
@@ -1,7 +1,14 @@
 #define _FP_W_TYPE_SIZE		64
-#define _FP_W_TYPE		unsigned long
-#define _FP_WS_TYPE		signed long
-#define _FP_I_TYPE		long
+
+#ifdef _WIN64
+ #define _FP_W_TYPE		unsigned long long
+ #define _FP_WS_TYPE		signed long long
+ #define _FP_I_TYPE		long long
+#else
+ #define _FP_W_TYPE		unsigned long
+ #define _FP_WS_TYPE		signed long
+ #define _FP_I_TYPE		long
+#endif
 
 typedef int TItype __attribute__ ((mode (TI)));
 typedef unsigned int UTItype __attribute__ ((mode (TI)));