* gdb.base/funcargs.exp: Fix typos introduced by Aug 15 change.

	* gdb.base/callfuncs.c (main):  Use struct_val1 to inhibit xlc
	from optimizing it away.
	* gdb.base/callfuncs.exp:  Remove rs6000-*-* xfails for
	"call inferior func with struct".

3 files changed, 16 insertions, 17 deletions

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index e817302..a2b9691 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+Sun Aug 20 06:58:25 1995  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* gdb.base/funcargs.exp:  Fix typos introduced by Aug 15 change.
+	* gdb.base/callfuncs.c (main):  Use struct_val1 to inhibit xlc
+	from optimizing it away.
+	* gdb.base/callfuncs.exp:  Remove rs6000-*-* xfails for
+	"call inferior func with struct".
+
 Wed Aug 16 11:57:15 1995  Stan Shebs  <shebs@andros.cygnus.com>
 
 	* configure.in: Only configure gdb.chill for particular targets.
diff --git a/gdb/testsuite/gdb.base/callfuncs.exp b/gdb/testsuite/gdb.base/callfuncs.exp
index 7df86d0..3e03274 100644
--- a/gdb/testsuite/gdb.base/callfuncs.exp
+++ b/gdb/testsuite/gdb.base/callfuncs.exp
@@ -181,27 +181,20 @@ proc do_function_calls {} {
     gdb_test "p sum_args(4,{2,3,4,5})" " = 14"
     gdb_test "p sum10 (1, 2, 3, 4, 5, 6, 7, 8, 9, 10)" " = 55"
 
-    if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" }
     gdb_test "p t_structs_c(struct_val1)" "= 120 'x'" \
 	"call inferior func with struct - returns char"
-    if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" }
     gdb_test "p t_structs_s(struct_val1)" "= 87" \
 	"call inferior func with struct -  returns short"
-    if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" }
     gdb_test "p t_structs_i(struct_val1)" "= 76" \
 	"call inferior func with struct - returns int"
-    if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" }
     gdb_test "p t_structs_l(struct_val1)" "= 51" \
 	"call inferior func with struct - returns long"
     setup_xfail "i*86-*-*"
-    if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" }
     gdb_test "p t_structs_f(struct_val1)" "= 2.12.*" \
 	"call inferior func with struct - returns float"
     setup_xfail "i*86-*-*"
-    if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" }
     gdb_test "p t_structs_d(struct_val1)" "= 9.87.*" \
 	"call inferior func with struct - returns double"
-    if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" }
     gdb_test "p t_structs_a(struct_val1)" "= \"foo\"" \
 	"call inferior func with struct - returns char *"
 
diff --git a/gdb/testsuite/gdb.base/funcargs.exp b/gdb/testsuite/gdb.base/funcargs.exp
index bfed6ec..fe4d4dc 100644
--- a/gdb/testsuite/gdb.base/funcargs.exp
+++ b/gdb/testsuite/gdb.base/funcargs.exp
@@ -189,8 +189,7 @@ proc float_and_integral_args {} {
 
     # Print each arg as a double check to see if we can print
     gdb_test "print c" ".* = 97 'a'" "print c after run to call2a"
-    if {$gcc_compiled} then { setup_xfail "rs6000-*-*" }
-    gdb_test "print fl" ".* = 4" "print f1 after run to call2a"
+    gdb_test "print f1" ".* = 4" "print f1 after run to call2a"
     gdb_test "print s" ".* = 1" "print s after run to call2a"
     gdb_test "print d1" ".* = 5" "print d1 after run to call2a"
     gdb_test "print i" ".* = 2" "print i after run to call2a"
@@ -1058,20 +1057,19 @@ proc localvars_after_alloca { } {
     global prompt
     global hex
     global decimal
+    global gcc_compiled
 
     if { ! [ runto localvars_after_alloca ] } then { return 0 }
 
     # Print each arg as a double check to see if we can print
     # them here as well as with backtrace.
 
-    setup_xfail "rs6000-*-*"
-    gdb_test "print c after runto localvars_after_alloca" " = 97 'a'"
-    setup_xfail "rs6000-*-*"
-    gdb_test "print s after runto localvars_after_alloca" " = 1"
-    setup_xfail "rs6000-*-*"
-    gdb_test "print i after runto localvars_after_alloca" " = 2"
-    setup_xfail "rs6000-*-*"
-    gdb_test "print l after runto localvars_after_alloca" " = 3"
+    if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" }
+    gdb_test "print c" " = 97 'a'" "print c after runto localvars_after_alloca"
+    if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" }
+    gdb_test "print s" " = 1" "print s after runto localvars_after_alloca"
+    gdb_test "print i" " = 2" "print i after runto localvars_after_alloca"
+    gdb_test "print l" " = 3" "print l after runto localvars_after_alloca"
 
     send "next\n"
     expect {