From 3eb2ef34ffca3f1366ccb6fd83785dac44940f8e Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Wed, 4 May 2011 06:40:28 +0000 Subject: [PATCH] 2011-05-04 Yao Qi * gdb.arch/arm-disp-step.S: Fix usage of macros __thumb__ and __thumb2__. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.arch/arm-disp-step.S | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 3e330c30270..2bcbb0c4c54 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-05-04 Yao Qi + + * gdb.arch/arm-disp-step.S: Fix usage of macros __thumb__ + and __thumb2__. + 2011-05-03 Marek Polacek * 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 fb769743592..14635559e29 100644 --- 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: -- 2.30.2