Merge GDB 7.5.1

gdb/testsuite/gdb.base/auxv.exp

Index: gdb/testsuite/gdb.base/auxv.exp
diff --git a/gdb/testsuite/gdb.base/auxv.exp b/gdb/testsuite/gdb.base/auxv.exp
index e0f4cb4ff5d95bfa94e318c5dff38cc6bcfd2440..16f12c7f93d4abbad44af86296743240b3906899 100644
--- a/gdb/testsuite/gdb.base/auxv.exp
+++ b/gdb/testsuite/gdb.base/auxv.exp
@@ -24,10 +24,6 @@ if { ! [istarget "*-*-linux*"] && ! [istarget "*-*-solaris*"] } {
     return
 }
 
-if $tracelevel then {
-	strace $tracelevel
-}
-
 
 set testfile "auxv"
 set srcfile ${testfile}.c
@@ -35,7 +31,10 @@ set binfile ${objdir}/${subdir}/${testfile}
 set corefile ${objdir}/${subdir}/${testfile}.corefile
 set gcorefile ${objdir}/${subdir}/${testfile}.gcore
 
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
+if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable \
+		  {debug additional_flags=-DUSE_RLIMIT}] != ""
+     && [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable \
+		  {debug}] != "" } {
     untested "couldn't compile ${srcdir}/${subdir}/${srcfile}"
     return -1
 }
@@ -159,7 +158,7 @@ if {$core_works} {
     } else {
 	set core_works 0
 	warning "can't generate a core file - core tests suppressed - check ulimit -c"
-	fail $test
+	unsupported $test
     }
 } else {
     unsupported $test