From f26c9c2eaf6fbfeae03cc7926e4a5fca0bba1ae5 Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Sat, 2 Jul 2016 22:19:15 +0100 Subject: [PATCH] MIPS/GAS/testsuite: Reenable disabled external BEQ tests Complement: commit bad36eacdad37042c4efb1c5fbf48476b47de82b Author: Daniel Jacobowitz Date: Wed Nov 23 14:04:18 2005 +0000 , ("R_MIPS_PC16, again"), and reenable external BEQ tests, the remaining subset missed from the set of branch tests previously disabled with: commit 6f171daac941741e5fa904f6e462adb75a595495 Author: Alexandre Oliva Date: Thu Dec 12 04:40:22 2002 +0000 , ("mips: branches to external labels are broken"). gas/ * testsuite/gas/mips/beq.s: Uncomment branches to undefined symbols. * testsuite/gas/mips/beq.d: Update accordingly. * testsuite/gas/mips/mipsr6@beq.d: Likewise. * testsuite/gas/mips/micromips@beq.d: Likewise. --- gas/ChangeLog | 8 ++++++++ gas/testsuite/gas/mips/beq.d | 12 ++++++------ gas/testsuite/gas/mips/beq.s | 4 ++-- gas/testsuite/gas/mips/micromips@beq.d | 5 +++++ gas/testsuite/gas/mips/mipsr6@beq.d | 6 ++++++ 5 files changed, 27 insertions(+), 8 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 8acbbea8ace..7ab0b28555f 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,11 @@ +2016-07-02 Maciej W. Rozycki + + * testsuite/gas/mips/beq.s: Uncomment branches to undefined + symbols. + * testsuite/gas/mips/beq.d: Update accordingly. + * testsuite/gas/mips/mipsr6@beq.d: Likewise. + * testsuite/gas/mips/micromips@beq.d: Likewise. + 2016-07-02 Maciej W. Rozycki * testsuite/gas/mips/mips.exp: Restrict 64-bit `branch-mips' diff --git a/gas/testsuite/gas/mips/beq.d b/gas/testsuite/gas/mips/beq.d index 4da3d126d7a..17c1ab14a69 100644 --- a/gas/testsuite/gas/mips/beq.d +++ b/gas/testsuite/gas/mips/beq.d @@ -36,10 +36,10 @@ Disassembly of section \.text: [0-9a-f]+ <[^>]*> jal 0+0000 <.*> [ ]*20060: (MIPS_JMP|JMPADDR|R_MIPS_26) \.text [0-9a-f]+ <[^>]*> nop -#[0-9a-f]+ <[^>]*> b 0+20068 <.*\+0x20068> -#[ ]*20068: .*16 external_label -#[0-9a-f]+ <[^>]*> nop -#[0-9a-f]+ <[^>]*> bal 0+20070 <.*\+0x20070> -#[ ]*20070: .*16 external_label -#[0-9a-f]+ <[^>]*> nop +[0-9a-f]+ <[^>]*> b 0+20068 <.*\+0x20068> +[ ]*20068: .*16 external_label +[0-9a-f]+ <[^>]*> nop +[0-9a-f]+ <[^>]*> bal 0+20070 <.*\+0x20070> +[ ]*20070: .*16 external_label +[0-9a-f]+ <[^>]*> nop \.\.\. diff --git a/gas/testsuite/gas/mips/beq.s b/gas/testsuite/gas/mips/beq.s index bed69165474..c37106acda9 100644 --- a/gas/testsuite/gas/mips/beq.s +++ b/gas/testsuite/gas/mips/beq.s @@ -20,8 +20,8 @@ text_label: .endif # Branch to an external label. -# b external_label -# bal external_label + b external_label + bal external_label # Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ... .align 2 diff --git a/gas/testsuite/gas/mips/micromips@beq.d b/gas/testsuite/gas/mips/micromips@beq.d index 9f099e515ef..29dcbc3aafd 100644 --- a/gas/testsuite/gas/mips/micromips@beq.d +++ b/gas/testsuite/gas/mips/micromips@beq.d @@ -45,5 +45,10 @@ Disassembly of section \.text: [0-9a-f]+ <[^>]*> 4060 fffe bal 0002004e 2004e: R_MICROMIPS_PC16_S1 text_label [0-9a-f]+ <[^>]*> 0000 0000 nop +[0-9a-f]+ <[^>]*> 9400 fffe b 00020056 + 20056: R_MICROMIPS_PC16_S1 external_label [0-9a-f]+ <[^>]*> 0c00 nop +[0-9a-f]+ <[^>]*> 4060 fffe bal 0002005c + 2005c: R_MICROMIPS_PC16_S1 external_label +[0-9a-f]+ <[^>]*> 0000 0000 nop \.\.\. diff --git a/gas/testsuite/gas/mips/mipsr6@beq.d b/gas/testsuite/gas/mips/mipsr6@beq.d index b5fec4c0c9d..c334c578e36 100644 --- a/gas/testsuite/gas/mips/mipsr6@beq.d +++ b/gas/testsuite/gas/mips/mipsr6@beq.d @@ -37,5 +37,11 @@ Disassembly of section \.text: [0-9a-f]+ <[^>]*> nop [0-9a-f]+ <[^>]*> bnez a0,0+0050 <.*> [ ]*50: .*R_MIPS_PC16 text_label +[0-9a-f]+ <[^>]*> nop +[0-9a-f]+ <[^>]*> b 0+0058 <.*> +[ ]*58: .*R_MIPS_PC16 external_label +[0-9a-f]+ <[^>]*> nop +[0-9a-f]+ <[^>]*> bal 0+0060 <.*> +[ ]*60: .*R_MIPS_PC16 external_label [0-9a-f]+ <[^>]*> nop \.\.\. -- 2.30.2