target-supports.exp (get-compiler_messages): New.

	* lib/target-supports.exp (get-compiler_messages): New.
	(check_named_sections_available): Use it.
	(check_effective_target_ilp32): New.
	(check_effective_target_lp64): New.
	(is-effective-target): New.
	* lib/gcc-dg.exp (dg-require-effective-target): New.

Co-Authored-By: Richard Sandiford <rsandifo@redhat.com>

From-SVN: r90515

3 files changed, 91 insertions, 16 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index bc7f2fb..5011758 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2004-11-11  Janis Johnson  <janis187@us.ibm.com>
+	    Richard Sandiford  <rsandifo@redhat.com>
+
+	* lib/target-supports.exp (get-compiler_messages): New.
+	(check_named_sections_available): Use it.
+	(check_effective_target_ilp32): New.
+	(check_effective_target_lp64): New.
+	(is-effective-target): New.
+	* lib/gcc-dg.exp (dg-require-effective-target): New.
+
 2004-11-11  Joseph S. Myers  <joseph@codesourcery.com>
 
 	* gcc.dg/precedence-1.c: New test.
diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp
index 7e833bc..2c2ee00 100644
--- a/gcc/testsuite/lib/gcc-dg.exp
+++ b/gcc/testsuite/lib/gcc-dg.exp
@@ -432,6 +432,16 @@ proc dg-require-named-sections { args } {
     }
 }
 
+# If the target does not match the required effective target, skip this test.
+
+proc dg-require-effective-target { args } {
+    set args [lreplace $args 0 0]
+    if { ![is-effective-target [lindex $args 0]] } {
+	upvar dg-do-what dg-do-what
+	skip_test_and_clear_xfail
+    }
+}
+
 # Prune any messages matching ARGS[1] (a regexp) from test output.
 proc dg-prune-output { args } {
     global additional_prunes
diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index d04d7d3..df1b441 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -19,6 +19,29 @@
 
 # This file defines procs for determining features supported by the target.
 
+# Try to compile some code and return the messages printed by the compiler.
+#
+# BASENAME is a basename to use for temporary files.
+# TYPE is the type of compilation to perform (see target_compile).
+# CONTENTS gives the contents of the input file.
+proc get_compiler_messages {basename type contents} {
+    global tool
+
+    set src ${basename}[pid].c
+    switch $type {
+	assembly { set output ${basename}[pid].s }
+	object { set output ${basename}[pid].o }
+    }
+    set f [open $src "w"]
+    puts $f $contents
+    close $f
+    set lines [${tool}_target_compile $src $output $type ""]
+    file delete $src
+    remote_file build delete $output
+
+    return $lines
+}
+
 ###############################
 # proc check_weak_available { }
 ###############################
@@ -280,22 +303,11 @@ proc check_iconv_available { test_what } {
 # when cycling over subtarget options (e.g. irix o32/n32/n64) in
 # the same test run.
 proc check_named_sections_available { } {
-    global tool
-
-    set src named[pid].c
-    set obj named[pid].o
-    verbose "check_named_sections_available compiling testfile $src" 2
-    set f [open $src "w"]
-    # Compile a small test program.
-    puts $f "int __attribute__ ((section(\"whatever\"))) foo;"
-    close $f
-    set lines [${tool}_target_compile $src $obj object ""]
-    file delete $src
-    remote_file build delete $obj
-
-    # If we got no error messages, everything is OK.
-    set answer [string match "" $lines]
-    verbose "check_named_sections_available  returning $answer" 2
+    verbose "check_named_sections_available: compiling source" 2
+    set answer [string match "" [get_compiler_messages named object {
+	int __attribute__ ((section("whatever"))) foo;
+    }]]
+    verbose "check_named_sections_available: returning $answer" 2
     return $answer
 }
 
@@ -355,3 +367,46 @@ proc check_vmx_hw_available { } {
 
     return $vmx_hw_available_saved
 }
+
+# Return 1 if we're generating 32-bit code using default options, 0
+# otherwise.
+
+proc check_effective_target_ilp32 { } {
+    verbose "check_effective_target_ilp32: compiling source" 2
+    set answer [string match "" [get_compiler_messages ilp32 object {
+	int dummy[(sizeof (int) == 4 && sizeof (void *) == 4 && sizeof (long) == 4 ) ? 1 : -1];
+    }]]
+    verbose "check_effective_target_ilp32: returning $answer" 2
+    return $answer
+}
+
+# Return 1 if we're generating 64-bit code using default options, 0
+# otherwise.
+
+proc check_effective_target_lp64 { } {
+    verbose "check_effective_target_lp64: compiling source" 2
+    set answer [string match "" [get_compiler_messages lp64 object {
+	int dummy[(sizeof (int) == 4 && sizeof (void *) == 8 && sizeof (long) == 8 ) ? 1 : -1];
+    }]]
+    verbose "check_effective_target_lp64: returning $answer" 2
+    return $answer
+}
+
+# Return 1 if the target matches the effective target 'arg', 0 otherwise.
+# This can be used with any check_* proc that takes no argument and
+# returns only 1 or 0.  It could be used with check_* procs that take
+# arguments with keywords that pass particular arguments.
+
+proc is-effective-target { arg } {
+    set selected 0
+    switch $arg {
+	"ilp32"  { set selected [check_effective_target_ilp32] }
+	"lp64"   { set selected [check_effective_target_lp64] }
+	"vmx_hw" { set selected [check_vmx_hw_available] }
+	"named_sections" { set selected [check_named_sections_available] }
+	"gc_sections" { set selected [check_gc_sections_available] }
+	default  { error "unknown effective target selector `$arg'" }
+    }
+    verbose "is-effective-target: $arg $selected" 2
+    return $selected
+}