2009-06-25 Kai Tietz <kai.tietz@onevision.com>

	* ld-pe/aligncomm-1.c (size_t): Add typedef.
	(main): Use it for casting pointer to scalar.
	* ld-pe/aligncomm-2.c: Likewise.
	* ld-pe/aligncomm-3.c: Likewise.
	* ld-pe/aligncomm-4.c: Likewise.
	* ld-scripts/empty-address.exp: Make sure that for x86_64-*-mingw*
	target imagebase is set to zero.
	* ld-scripts/weak.exp: Don't fail for x86_64-*-mingw* target.

7 files changed, 24 insertions, 5 deletions

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 0c3ad41d95..1119e4651c 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+2009-06-25  Kai Tietz  <kai.tietz@onevision.com>
+
+	* ld-pe/aligncomm-1.c (size_t): Add typedef.
+	(main): Use it for casting pointer to scalar.
+	* ld-pe/aligncomm-2.c: Likewise.
+	* ld-pe/aligncomm-3.c: Likewise.
+	* ld-pe/aligncomm-4.c: Likewise.
+	* ld-scripts/empty-address.exp: Make sure that for x86_64-*-mingw*
+	target imagebase is set to zero.
+	* ld-scripts/weak.exp: Don't fail for x86_64-*-mingw* target.
+
 2009-06-22  Christophe Lyon  <christophe.lyon@st.com>
 
 	ld/testsuite:
diff --git a/ld/testsuite/ld-pe/aligncomm-1.c b/ld/testsuite/ld-pe/aligncomm-1.c
index bff42b8855..fc6cb034e3 100755
--- a/ld/testsuite/ld-pe/aligncomm-1.c
+++ b/ld/testsuite/ld-pe/aligncomm-1.c
@@ -1,5 +1,6 @@
 
 typedef float __m128 __attribute__ ((__vector_size__ (16), __may_alias__));
+typedef __SIZE_TYPE__ size_t;
 
 long s1 = 0;
 __m128 r;
@@ -7,7 +8,7 @@ __m128 * volatile raddr = &r;
 
 int main (int argc, const char **argv)
 {
-  return 15 & (int)raddr;
+  return 15 & (int)(size_t)raddr;
 }
 
 void __main (void)
diff --git a/ld/testsuite/ld-pe/aligncomm-2.c b/ld/testsuite/ld-pe/aligncomm-2.c
index 61adc69f9e..5e042b8df4 100755
--- a/ld/testsuite/ld-pe/aligncomm-2.c
+++ b/ld/testsuite/ld-pe/aligncomm-2.c
@@ -1,5 +1,6 @@
 
 typedef float __m128 __attribute__ ((__vector_size__ (16), __may_alias__));
+typedef __SIZE_TYPE__ size_t;
 
 long s1 = 0;
 long s2 = 0;
@@ -8,7 +9,7 @@ __m128 * volatile raddr = &r;
 
 int main (int argc, const char **argv)
 {
-  return 15 & (int)raddr;
+  return 15 & (int)(size_t)raddr;
 }
 
 void __main (void)
diff --git a/ld/testsuite/ld-pe/aligncomm-3.c b/ld/testsuite/ld-pe/aligncomm-3.c
index ae0dbfb391..69184f9ab3 100755
--- a/ld/testsuite/ld-pe/aligncomm-3.c
+++ b/ld/testsuite/ld-pe/aligncomm-3.c
@@ -1,5 +1,6 @@
 
 typedef float __m128 __attribute__ ((__vector_size__ (16), __may_alias__));
+typedef __SIZE_TYPE__ size_t;
 
 long s1 = 0;
 long s2 = 0;
@@ -9,7 +10,7 @@ __m128 * volatile raddr = &r;
 
 int main (int argc, const char **argv)
 {
-  return 15 & (int)raddr;
+  return 15 & (int)(size_t)raddr;
 }
 
 void __main (void)
diff --git a/ld/testsuite/ld-pe/aligncomm-4.c b/ld/testsuite/ld-pe/aligncomm-4.c
index 0c9e65d296..085335a5e4 100755
--- a/ld/testsuite/ld-pe/aligncomm-4.c
+++ b/ld/testsuite/ld-pe/aligncomm-4.c
@@ -1,5 +1,6 @@
 
 typedef float __m128 __attribute__ ((__vector_size__ (16), __may_alias__));
+typedef __SIZE_TYPE__ size_t;
 
 long s1 = 0;
 long s2 = 0;
@@ -10,7 +11,7 @@ __m128 * volatile raddr = &r;
 
 int main (int argc, const char **argv)
 {
-  return 15 & (int)raddr;
+  return 15 & (int)(size_t)raddr;
 }
 
 void __main (void)
diff --git a/ld/testsuite/ld-scripts/empty-address.exp b/ld/testsuite/ld-scripts/empty-address.exp
index e333ec1b78..8feb4ff599 100644
--- a/ld/testsuite/ld-scripts/empty-address.exp
+++ b/ld/testsuite/ld-scripts/empty-address.exp
@@ -20,6 +20,10 @@
 # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
 # MA 02110-1301, USA.
 
+if [istarget "x86_64-*-mingw*"] then {
+  set LDFLAGS "$LDFLAGS --image-base 0"
+}
+
 run_dump_test empty-address-1
 run_dump_test empty-address-2a
 run_dump_test empty-address-2b
diff --git a/ld/testsuite/ld-scripts/weak.exp b/ld/testsuite/ld-scripts/weak.exp
index 5b5c00c368..9abe80733c 100644
--- a/ld/testsuite/ld-scripts/weak.exp
+++ b/ld/testsuite/ld-scripts/weak.exp
@@ -32,7 +32,7 @@ if {! [is_elf_format] && ! [is_pecoff_format]} {
 # Weak symbols are broken for non-i386 PE targets.
 if {! [istarget i?86-*-*]} {
     setup_xfail *-*-pe*
-    setup_xfail x86_64-*-mingw*
+    setup_xfail x86_64-*-pe*
 }
 
 # hppa64 and or32 are incredibly broken