From 98f61f572fa3d6a3efe1f971908560ecd399d131 Mon Sep 17 00:00:00 2001
From: Geoffrey Keating <geoffk@apple.com>
Date: Thu, 28 Oct 2004 00:16:57 +0000
Subject: [PATCH] typeof-2.c: Needs aliases as well as weak.

	* gcc.dg/weak/typeof-2.c: Needs aliases as well as weak.
	* gcc.dg/weak/weak-3.c: Likewise.
	* gcc.dg/weak/weak-5.c: Likewise.
	* gcc.dg/weak/weak-9.c: Likewise.
	* lib/file-format.exp (gcc_target_object_format): Darwin has Mach-O.
	* lib/target-supports.exp (check_weak_available): Mach-O does weak.

From-SVN: r89723
---
 gcc/testsuite/ChangeLog               | 7 +++++++
 gcc/testsuite/gcc.dg/weak/typeof-2.c  | 1 +
 gcc/testsuite/gcc.dg/weak/weak-3.c    | 1 +
 gcc/testsuite/gcc.dg/weak/weak-5.c    | 1 +
 gcc/testsuite/gcc.dg/weak/weak-9.c    | 1 +
 gcc/testsuite/lib/file-format.exp     | 4 ++++
 gcc/testsuite/lib/target-supports.exp | 1 +
 7 files changed, 16 insertions(+)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 647ab555dda..cecd7fad636 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,12 @@
 2004-10-27  Geoffrey Keating  <geoffk@apple.com>
 
+	* gcc.dg/weak/typeof-2.c: Needs aliases as well as weak.
+	* gcc.dg/weak/weak-3.c: Likewise.
+	* gcc.dg/weak/weak-5.c: Likewise.
+	* gcc.dg/weak/weak-9.c: Likewise.
+	* lib/file-format.exp (gcc_target_object_format): Darwin has Mach-O.
+	* lib/target-supports.exp (check_weak_available): Mach-O does weak.
+
 	* gcc.dg/darwin-weakimport-1.c: New.
 
 2004-10-28  Ben Elliston  <bje@au.ibm.com>
diff --git a/gcc/testsuite/gcc.dg/weak/typeof-2.c b/gcc/testsuite/gcc.dg/weak/typeof-2.c
index 7e58bc8b9bb..0ff192b0523 100644
--- a/gcc/testsuite/gcc.dg/weak/typeof-2.c
+++ b/gcc/testsuite/gcc.dg/weak/typeof-2.c
@@ -1,6 +1,7 @@
 /* Test typeof with __asm redirection. */
 /* { dg-do compile } */
 /* { dg-require-weak "" } */
+/* { dg-require-alias "" } */
 /* { dg-options "-O2" } */
 
 extern int foo1 (int x) __asm ("baz1");
diff --git a/gcc/testsuite/gcc.dg/weak/weak-3.c b/gcc/testsuite/gcc.dg/weak/weak-3.c
index da4367a7135..c9448f032cf 100644
--- a/gcc/testsuite/gcc.dg/weak/weak-3.c
+++ b/gcc/testsuite/gcc.dg/weak/weak-3.c
@@ -1,4 +1,5 @@
 /* { dg-do compile } */
+/* { dg-require-alias "" } */
 /* { dg-require-weak "" } */
 /* { dg-options "-fno-common" } */
 
diff --git a/gcc/testsuite/gcc.dg/weak/weak-5.c b/gcc/testsuite/gcc.dg/weak/weak-5.c
index d70f6330490..a8aca287544 100644
--- a/gcc/testsuite/gcc.dg/weak/weak-5.c
+++ b/gcc/testsuite/gcc.dg/weak/weak-5.c
@@ -1,5 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-weak "" } */
+/* { dg-require-alias "" } */
 /* { dg-options "-fno-common" } */
 
 /* { dg-final { scan-assembler "weak\[^ \t\]*\[ \t\]_?vfoo1a" } } */
diff --git a/gcc/testsuite/gcc.dg/weak/weak-9.c b/gcc/testsuite/gcc.dg/weak/weak-9.c
index 29a4e650d2b..95e8f809f38 100644
--- a/gcc/testsuite/gcc.dg/weak/weak-9.c
+++ b/gcc/testsuite/gcc.dg/weak/weak-9.c
@@ -1,5 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-weak "" } */
+/* { dg-require-alias "" } */
 /* { dg-options "-fno-common" } */
 
 /* { dg-final { scan-assembler "weak\[^ \t\]*\[ \t\]_?f1" } } */
diff --git a/gcc/testsuite/lib/file-format.exp b/gcc/testsuite/lib/file-format.exp
index ab69f930614..7be398eeb3a 100644
--- a/gcc/testsuite/lib/file-format.exp
+++ b/gcc/testsuite/lib/file-format.exp
@@ -24,10 +24,14 @@
 
 proc gcc_target_object_format { } { 
     global gcc_target_object_format_saved
+    global target_triplet
     global tool
 
     if [info exists gcc_target_object_format_saved] {
         verbose "gcc_target_object_format returning saved $gcc_target_object_format_saved" 2
+    } elseif { [string match "*-*-darwin*" $target_triplet] } {
+	# Darwin doesn't necessarily have objdump, so hand-code it.
+	set gcc_target_object_format_saved mach-o
     } else {
         set objdump_name [find_binutils_prog objdump]
         set open_file [open objfmtst.c w]
diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index 25d1f8d5837..a737f5db186 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -57,6 +57,7 @@ proc check_weak_available { } {
         elf      { return 1 }
         ecoff    { return 1 }
         a.out    { return 1 }
+	mach-o	 { return 1 }
         unknown  { return -1 }
         default  { return 0 }
     }
-- 
2.30.2