* gdb.base/nodebug.c (inner): Use variables so AIX linker doesn't

	remove them.
	* gdb.base/nodebug.exp: Accept "function" in addition to "text
	variable and "variable" in addition to "data variable".
	* gdb.base/nodebug.exp: xfail datalocal and bsslocal tests for AIX.

1 files changed, 23 insertions, 14 deletions

diff --git a/gdb/testsuite/gdb.base/nodebug.exp b/gdb/testsuite/gdb.base/nodebug.exp
index 5939c4a..c50ae67 100644
--- a/gdb/testsuite/gdb.base/nodebug.exp
+++ b/gdb/testsuite/gdb.base/nodebug.exp
@@ -1,6 +1,4 @@
 # Test that things still (sort of) work when compiled without -g.
-# In gdb.t10 because it is related to symbol-reading, and so are the crossload
-# tests.
 
 if $tracelevel then {
 	strace $tracelevel
@@ -39,43 +37,54 @@ if ![file exists $binfile] then {
 	# it knows the type.  GDB probably could be fixed to do better, but
 	# for now xfail these tests.
 	setup_xfail "alpha*-*-osf*" "mips*-*-irix4*"
-	gdb_test "p top" "{<text variable, no debug info>} \[0-9a-fx]* <top>"
+	gdb_test "p top" \
+	    "{<(text variable|function), no debug info>} \[0-9a-fx]* <top>"
 	setup_xfail "alpha*-*-osf*" "mips*-*-irix4*"
-	gdb_test "whatis top" "<text variable, no debug info>"
+	gdb_test "whatis top" "<(text variable|function), no debug info>"
 	setup_xfail "alpha*-*-osf*" "mips*-*-irix4*"
 	gdb_test "ptype top" "int \\(\\)"
 
 	setup_xfail "alpha*-*-osf*" "mips*-*-irix4*"
 	gdb_test "p middle" \
-	    "{<text variable, no debug info>} \[0-9a-fx]* <middle>"
+	    "{<(text variable|function), no debug info>} \[0-9a-fx]* <middle>"
 	setup_xfail "alpha*-*-osf*" "mips*-*-irix4*"
-	gdb_test "whatis middle" "<text variable, no debug info>"
+	gdb_test "whatis middle" "<(text variable|function), no debug info>"
 	setup_xfail "alpha*-*-osf*" "mips*-*-irix4*"
 	gdb_test "ptype middle" "int \\(\\)"
 
 	gdb_test "p dataglobal" "= 3"
 	setup_xfail "alpha*-*-osf*" "mips*-*-irix4*"
-	gdb_test "whatis dataglobal" "<data variable, no debug info>"
+	gdb_test "whatis dataglobal" \
+	    "<(data variable|variable), no debug info>"
 	setup_xfail "alpha*-*-osf*" "mips*-*-irix4*"
-	gdb_test "ptype dataglobal" "<data variable, no debug info>"
+	gdb_test "ptype dataglobal" "<(data variable|variable), no debug info>"
 
+	# The only symbol xcoff puts out for statics is for the TOC entry.
+	# Possible, but hairy, for gdb to deal.  Right now it doesn't, it
+	# doesn't know the variables exist at all.
+	setup_xfail "rs6000*-*-aix*"
 	gdb_test "p datalocal" "= 4"
+	setup_xfail "rs6000*-*-aix*"
 	setup_xfail "alpha*-*-osf*" "mips*-*-irix4*"
-	gdb_test "whatis datalocal" "<data variable, no debug info>"
+	gdb_test "whatis datalocal" "<(data variable|variable), no debug info>"
+	setup_xfail "rs6000*-*-aix*"
 	setup_xfail "alpha*-*-osf*" "mips*-*-irix4*"
-	gdb_test "ptype datalocal" "<data variable, no debug info>"
+	gdb_test "ptype datalocal" "<(data variable|variable), no debug info>"
 
 	gdb_test "p bssglobal" "= 0"
 	setup_xfail "alpha*-*-osf*" "mips*-*-irix4*"
-	gdb_test "whatis bssglobal" "<data variable, no debug info>"
+	gdb_test "whatis bssglobal" "<(data variable|variable), no debug info>"
 	setup_xfail "alpha*-*-osf*" "mips*-*-irix4*"
-	gdb_test "ptype bssglobal" "<data variable, no debug info>"
+	gdb_test "ptype bssglobal" "<(data variable|variable), no debug info>"
 
+	setup_xfail "rs6000*-*-aix*"
 	gdb_test "p bsslocal" "= 0"
+	setup_xfail "rs6000*-*-aix*"
 	setup_xfail "alpha*-*-osf*" "mips*-*-irix4*"
-	gdb_test "whatis bsslocal" "<data variable, no debug info>"
+	gdb_test "whatis bsslocal" "<(data variable|variable), no debug info>"
+	setup_xfail "rs6000*-*-aix*"
 	setup_xfail "alpha*-*-osf*" "mips*-*-irix4*"
-	gdb_test "ptype bsslocal" "<data variable, no debug info>"
+	gdb_test "ptype bsslocal" "<(data variable|variable), no debug info>"
 
 	gdb_test "backtrace" "#0.*inner.*#1.*middle.*#2.*top.*#3.*main"
 	# Or if that doesn't work, at least hope for the external symbols