From 22fe6da0f9e70167b759d4fe941beb2cf3f7a702 Mon Sep 17 00:00:00 2001
From: Kaz Kojima <kkojima@rr.iij4u.or.jp>
Date: Tue, 15 Sep 2009 02:02:48 +0000
Subject: [PATCH] 	* ld-elfcomm/elfcomm.exp: Add appropriate emulation
 option 	for sh64*-*-*. 	* ld-gc/gc.exp (test_gc): Likewise.

---
 ld/testsuite/ChangeLog              |  6 ++++++
 ld/testsuite/ld-elfcomm/elfcomm.exp | 29 ++++++++++++++++++++++++++---
 ld/testsuite/ld-gc/gc.exp           | 14 ++++++++++++--
 3 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 1047c103317..9a0333d38bc 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-15  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* ld-elfcomm/elfcomm.exp: Add appropriate emulation option
+	for sh64*-*-*.
+	* ld-gc/gc.exp (test_gc): Likewise.
+
 2009-09-14  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* ld-undefined/entry-7.d: New.
diff --git a/ld/testsuite/ld-elfcomm/elfcomm.exp b/ld/testsuite/ld-elfcomm/elfcomm.exp
index 18aff55bec0..213a821bc35 100644
--- a/ld/testsuite/ld-elfcomm/elfcomm.exp
+++ b/ld/testsuite/ld-elfcomm/elfcomm.exp
@@ -1,5 +1,6 @@
 # Expect script for common symbol tests
-#   Copyright 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+#   Copyright 2003, 2005, 2006, 2007, 2008, 2009
+#   Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
 #
@@ -185,7 +186,18 @@ if {   ![ld_compile "$CC $CFLAGS" $srcdir/$subdir/common1a.c tmpdir/common1a.o]
 global ld
 global link_output
 
-if { [ld_simple_link $ld tmpdir/common1.o "-r tmpdir/common1a.o tmpdir/common1b.o"] } {
+set options "-r tmpdir/common1a.o tmpdir/common1b.o"
+
+# SH64 targets needs an extra ld option for this test.
+if [istarget sh64*-*-*] {
+    if [istarget sh64*l*-*-*] {
+	set options "-mshlelf32 $options"
+    } else {
+	set options "-mshelf32 $options"
+    }
+}
+
+if { [ld_simple_link $ld tmpdir/common1.o $options] } {
     unresolved $test1w1
     return
 }
@@ -211,7 +223,18 @@ if { [dump_common1 $test1c1] } {
     pass $test1c1
 }
 
-if { [ld_simple_link $ld tmpdir/common1.o "-r tmpdir/common1b.o tmpdir/common1a.o"] } {
+set options "-r tmpdir/common1b.o tmpdir/common1a.o"
+
+# SH64 targets needs an extra ld option for this test.
+if [istarget sh64*-*-*] {
+    if [istarget sh64*l*-*-*] {
+	set options "-mshlelf32 $options"
+    } else {
+	set options "-mshelf32 $options"
+    }
+}
+
+if { [ld_simple_link $ld tmpdir/common1.o $options] } {
     unresolved $test1w2
     return
 }
diff --git a/ld/testsuite/ld-gc/gc.exp b/ld/testsuite/ld-gc/gc.exp
index 400e989606c..648f7327131 100644
--- a/ld/testsuite/ld-gc/gc.exp
+++ b/ld/testsuite/ld-gc/gc.exp
@@ -1,5 +1,5 @@
 # Expect script for ld-gc tests
-#   Copyright 2008
+#   Copyright 2008, 2009
 #   Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
@@ -44,8 +44,18 @@ proc test_gc { testname filename linker ldflags} {
     }
 
     set outfile "tmpdir/$filename"
+    set options "-L$srcdir/$subdir $ldflags $objfile"
 
-    if ![ld_simple_link $linker $outfile "-L$srcdir/$subdir $ldflags $objfile"] {
+    # SH64 targets needs an extra ld option for this test.
+    if [istarget sh64*-*-*] {
+	if [istarget sh64*l*-*-*] {
+	    set options "-mshlelf32 $options"
+	} else {
+	    set options "-mshelf32 $options"
+	}
+    }
+
+    if ![ld_simple_link $linker $outfile $options] {
 	fail $testname
 	return
     }
-- 
2.30.2