gdb/testsuite/

	Fix s390x compatibility.
	* gdb.dwarf2/pr11465.S (DW_TAG_pointer_type): Use PTRBITS.  Twice.
	* gdb.dwarf2/pr11465.exp: Set ptrbits, use it for -DPTRBITS.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d48b6d08d7cfa4da1716529015102c625e47c93c..9254c5ded24cef04c165b6b6a4c09de8d0385154 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-17  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+       Fix s390x compatibility.
+       * gdb.dwarf2/pr11465.S (DW_TAG_pointer_type): Use PTRBITS.  Twice.
+       * gdb.dwarf2/pr11465.exp: Set ptrbits, use it for -DPTRBITS.
+
 2010-10-17  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
        * gdb.threads/sigstep-threads.exp: New file.

diff --git a/gdb/testsuite/gdb.dwarf2/pr11465.S b/gdb/testsuite/gdb.dwarf2/pr11465.S
index 8d805ddf83b245e321d63b9cd3887075b3332354..83396bf5bed5f3c6df464ef62065c89c7324a766 100644 (file)
--- a/gdb/testsuite/gdb.dwarf2/pr11465.S
+++ b/gdb/testsuite/gdb.dwarf2/pr11465.S
@@ -88,14 +88,14 @@ die77:      .uleb128 0x9            /* DW_TAG_formal_parameter */
        .byte   0x0
        .byte   0x0
 die7e: .uleb128 0xa            /* DW_TAG_pointer_type */
-       .byte   0x4             /* DW_AT_byte_size */
+       .byte   PTRBITS / 8     /* DW_AT_byte_size */
        .long   die84-d         /* DW_AT_type */
 die84: .uleb128 0xb            /* DW_TAG_subroutine_type */
 die89: .uleb128 0x9            /* DW_TAG_formal_parameter */
        .long   die5e-d         /* DW_AT_type */
        .byte   0x0
 die8f: .uleb128 0xa            /* DW_TAG_pointer_type */
-       .byte   0x4             /* DW_AT_byte_size */
+       .byte   PTRBITS / 8     /* DW_AT_byte_size */
        .long   die5e-d         /* DW_AT_type */
 die95: .uleb128 0xc            /* DW_TAG_subprogram */
        .long   die6a-d         /* DW_AT_specification */

diff --git a/gdb/testsuite/gdb.dwarf2/pr11465.exp b/gdb/testsuite/gdb.dwarf2/pr11465.exp
index c5bc2f1a6798974238a44e90b655d53f2192e340..d2d659697e2cc97533b2ca02c6e2c7bb0cd1a4eb 100644 (file)
--- a/gdb/testsuite/gdb.dwarf2/pr11465.exp
+++ b/gdb/testsuite/gdb.dwarf2/pr11465.exp
@@ -29,8 +29,14 @@ set srcfile "$testfile.S"
 set executable "$testfile.x"
 set binfile [file join $objdir $subdir $executable]
 
+if [is_ilp32_target] {
+    set ptrbits 32
+} else {
+    set ptrbits 64
+}
+
 if  { [gdb_compile [file join $srcdir $subdir $srcfile] \
-          $binfile object {}] != "" } {
+          $binfile object [list additional_flags=-DPTRBITS=$ptrbits]] != "" } {
     return -1
 }