From 34d61b64e28d133b963a517256935c23506f3ba2 Mon Sep 17 00:00:00 2001 From: Andreas Krebbel Date: Fri, 5 Jul 2013 09:45:43 +0000 Subject: 2013-07-05 Andreas Krebbel opcodes/ * s390-opc.c (J12_12, J24_24): New macros. (INSTR_MII_UPI): Rename to INSTR_MII_UPP. (MASK_MII_UPI): Rename to MASK_MII_UPP. * s390-opc.txt: Rename MII_UPI to MII_UPP for bprp instruction. include/elf/ * s390.h: Add new relocs R_390_PC12DBL, R_390_PLT12DBL, R_390_PC24DBL, and R_390_PLT24DBL. gas/testsuite/ * gas/s390/zarch-zEC12.s: Change bprp second operand and add variants requiring relocations. * gas/s390/zarch-zEC12.d: Likewise. gas/ * config/tc-s390.c (md_gather_operands, md_apply_fix): Support new relocs. bfd/ * elf32-s390.c: Add new relocation definitions R_390_PC12DBL, R_390_PLT12DBL, R_390_PC24DBL, and R_390_PLT24DBL. (elf_s390_reloc_type_lookup, elf_s390_check_relocs) (elf_s390_gc_sweep_hook, elf_s390_relocate_section): Support new relocations. * elf64-s390.c: See elf32-s390.c * bfd-in2.h: Add new relocs to enum bfd_reloc_code_real. * libbfd.h: Add new reloc strings. --- gas/testsuite/ChangeLog | 6 ++++++ gas/testsuite/gas/s390/zarch-zEC12.d | 11 ++++++++--- gas/testsuite/gas/s390/zarch-zEC12.s | 6 +++++- 3 files changed, 19 insertions(+), 4 deletions(-) (limited to 'gas/testsuite') diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index e48f88c4de..82b437c482 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2013-07-05 Andreas Krebbel + + * gas/s390/zarch-zEC12.s: Change bprp second operand and add + variants requiring relocations. + * gas/s390/zarch-zEC12.d: Likewise. + 2013-07-03 Marcus Shawcroft * gas/aarch64/reloc-insn.s (func): Replace :got_prel19: with :got:. diff --git a/gas/testsuite/gas/s390/zarch-zEC12.d b/gas/testsuite/gas/s390/zarch-zEC12.d index 25424c9153..5a6d5f153e 100644 --- a/gas/testsuite/gas/s390/zarch-zEC12.d +++ b/gas/testsuite/gas/s390/zarch-zEC12.d @@ -1,5 +1,5 @@ #name: s390x opcode -#objdump: -drw +#objdump: -dr .*: +file format .* @@ -13,7 +13,7 @@ Disassembly of section .text: .*: e5 61 6f a0 fd e8 [ ]*tbeginc 4000\(%r6\),65000 .*: b2 f8 00 00 [ ]*tend .*: c7 a0 6f a0 00 00 [ ]*bpp 10,1e ,4000\(%r6\) -.*: c5 a0 00 fe c7 80 [ ]*bprp 10,24 ,-80000 +.*: c5 a0 00 00 00 0c [ ]*bprp 10,24 ,3c .*: b2 fa 00 ad [ ]*niai 10,13 .*: e3 67 8a 4d fe 9f [ ]*lat %r6,-5555\(%r7,%r8\) .*: e3 67 8a 4d fe 85 [ ]*lgat %r6,-5555\(%r7,%r8\) @@ -54,4 +54,9 @@ Disassembly of section .text: .*: b2 e8 c0 56 [ ]*ppa %r5,%r6,12 .*: b9 8f 60 59 [ ]*crdte %r5,%r6,%r9,0 .*: b9 8f 61 59 [ ]*crdte %r5,%r6,%r9,1 -.*: 07 07 [ ]*nopr %r7 +.*: c5 a0 06 00 00 06 [ ]*bprp 10,11e ,11e +.*: c5 a0 00 00 00 00 [ ]*bprp 10,118 ,118 +[ ]*119: R_390_PLT12DBL bar\+0x1 +[ ]*11b: R_390_PLT24DBL bar\+0x3 +.* : +.*: 07 07 [ ]*nopr %r7 diff --git a/gas/testsuite/gas/s390/zarch-zEC12.s b/gas/testsuite/gas/s390/zarch-zEC12.s index a5ece0f9ff..98f0fdedeb 100644 --- a/gas/testsuite/gas/s390/zarch-zEC12.s +++ b/gas/testsuite/gas/s390/zarch-zEC12.s @@ -7,7 +7,7 @@ foo: tbeginc 4000(%r6),65000 tend bpp 10,.,4000(%r6) - bprp 10,.,-80000 + bprp 10,.,.+24 niai 10,13 lat %r6,-5555(%r7,%r8) lgat %r6,-5555(%r7,%r8) @@ -52,3 +52,7 @@ foo: ppa %r5,%r6,12 crdte %r5,%r6,%r9 crdte %r5,%r6,%r9,1 + + bprp 10,bar,bar + bprp 10,bar@PLT,bar@PLT +bar: -- cgit v1.2.1