Merge GDB 7.5.1

gdb/testsuite/gdb.ada/arrayidx.exp

Index: gdb/testsuite/gdb.ada/arrayidx.exp
diff --git a/gdb/testsuite/gdb.ada/arrayidx.exp b/gdb/testsuite/gdb.ada/arrayidx.exp
index 0373cc315f2e38b94ea56d83bf671d812e311b4b..5de1145098d878f180e1cde1d74c6f378dbc9106 100644
--- a/gdb/testsuite/gdb.ada/arrayidx.exp
+++ b/gdb/testsuite/gdb.ada/arrayidx.exp
@@ -13,10 +13,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-if $tracelevel then {
-    strace $tracelevel
-}
-
 load_lib "ada.exp"
 
 if { [skip_ada_tests] } { return -1 }
@@ -31,6 +27,12 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug}] != ""} {
     return -1
 }
 
+if [get_compiler_info] {
+    return -1;
+}
+set old_gcc [expr [test_compiler_info {gcc-[0-3]-*}] \
+	     || [test_compiler_info {gcc-4-[0-6]-*}]]
+
 clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "START" ${testdir}/p.adb]
@@ -40,6 +42,9 @@ runto "p.adb:$bp_location"
 
 gdb_test_no_output "set print array-indexes off"
 
+if $old_gcc {
+    setup_xfail "*-*-*"
+}
 gdb_test "print one_two_three" \
          "= \\(1, 2, 3\\)" \
          "print one_two_three, indexes off"
@@ -57,17 +62,26 @@ gdb_test "print u_one_two_three" \
          "print u_one_two_three, indexes off"
 
 gdb_test "print p_one_two_three" \
-         "= \\(0 => false, true, true\\)" \
+         "= \\(false, true, true\\)" \
          "print p_one_two_three, indexes off"
 
+if $old_gcc {
+    setup_xfail "*-*-*"
+}
 gdb_test "print few_reps" \
          "= \\(1, 2, 3, 3, 3, 3, 3, 4, 5\\)" \
          "print few_reps, indexes off"
 
+if $old_gcc {
+    setup_xfail "*-*-*"
+}
 gdb_test "print many_reps" \
          "= \\(1, 2, 3 <repeats 12 times>, 4, 5\\)" \
          "print many_reps, indexes off"
 
+if $old_gcc {
+    setup_xfail "*-*-*"
+}
 gdb_test "print empty" \
          "= \\(\\)" \
          "print empty, indexes off"
@@ -76,6 +90,9 @@ gdb_test "print empty" \
 
 gdb_test_no_output "set print array-indexes on"
 
+if $old_gcc {
+    setup_xfail "*-*-*"
+}
 gdb_test "print one_two_three" \
          "= \\(1 => 1, 2 => 2, 3 => 3\\)" \
          "print one_two_three"
@@ -93,17 +110,26 @@ gdb_test "print u_one_two_three" \
          "print u_one_two_three"
 
 gdb_test "print p_one_two_three" \
-         "= \\(0 => false, 1 => true, 2 => true\\)" \
+         "= \\(one => false, two => true, three => true\\)" \
          "print p_one_two_three"
 
+if $old_gcc {
+    setup_xfail "*-*-*"
+}
 gdb_test "print few_reps" \
          "= \\(1 => 1, 2 => 2, 3 => 3, 4 => 3, 5 => 3, 6 => 3, 7 => 3, 8 => 4, 9 => 5\\)" \
          "print few_reps"
 
+if $old_gcc {
+    setup_xfail "*-*-*"
+}
 gdb_test "print many_reps" \
          "= \\(1 => 1, 2 => 2, 3 => 3 <repeats 12 times>, 15 => 4, 16 => 5\\)" \
          "print many_reps"
 
+if $old_gcc {
+    setup_xfail "*-*-*"
+}
 gdb_test "print empty" \
          "= \\(\\)" \
          "print empty"