2011-05-04 Yao Qi <yao@codesourcery.com>

	* gdb.arch/arm-disp-step.S: Fix usage of macros __thumb__
	and __thumb2__.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 3e330c3..2bcbb0c 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-04  Yao Qi  <yao@codesourcery.com>
+
+       * gdb.arch/arm-disp-step.S: Fix usage of macros __thumb__
+       and __thumb2__.
+
 2011-05-03  Marek Polacek  <mpolacek@redhat.com>
 
        * gdb.base/pr10179.exp: Get rid of races using `delete_breakpoints'

diff --git a/gdb/testsuite/gdb.arch/arm-disp-step.S b/gdb/testsuite/gdb.arch/arm-disp-step.S
index fb76974..1463555 100644 (file)
--- a/gdb/testsuite/gdb.arch/arm-disp-step.S
+++ b/gdb/testsuite/gdb.arch/arm-disp-step.S
@@ -18,7 +18,7 @@
        .syntax unified
        .text
        .type main,%function
-#if defined (__thumb__) || defined (__thumb2__)
+#if defined (__thumb__)
        .code   16
        .thumb_func
 #endif
@@ -44,7 +44,7 @@ test_ret_end:
        bl test_ldr_pc
 
        /* Test ldm/stm only in ARM mode */
-#if !defined (__thumb__) && !defined (__thumb2__)
+#if !defined (__thumb__)
        bl test_ldm_stm_pc
 #endif
 
@@ -60,7 +60,7 @@ test_ret_end:
        .size main, .-main
        
        .global test_call_subr
-#if defined (__thumb__) || defined (__thumb2__)
+#if defined (__thumb__)
        .code   16
        .thumb_func
 #endif
@@ -77,7 +77,7 @@ test_ret:
 
        
        .global test_branch
-#if defined (__thumb__) || defined (__thumb2__)
+#if defined (__thumb__)
        .code   16
        .thumb_func
 #endif
@@ -90,7 +90,7 @@ L_branch:
        .size test_branch, .-test_branch
 
        .global test_ldr_pc
-#if defined (__thumb__) || defined (__thumb2__)
+#if defined (__thumb__)
        .code   16
        .thumb_func
 #endif
@@ -103,7 +103,7 @@ test_ldr_pc_ret:
        bx lr
        .size test_ldr_pc, .-test_ldr_pc
 
-#if !defined (__thumb__) && !defined (__thumb2__)
+#if !defined (__thumb__)
        .global test_ldm_stm_pc
        .type test_ldm_stm_pc, %function
 test_ldm_stm_pc: