From 3d6e0c015aa832f00ccd4fe3f5f43b90357258e8 Mon Sep 17 00:00:00 2001 From: Andreas Krebbel Date: Tue, 25 Sep 2018 17:13:28 +0200 Subject: [PATCH] S/390: Fix symbolic displacement in lay Increase the fixup length to 4 for the 20 bit displacement. gas/ChangeLog: 2018-09-25 Andreas Krebbel * config/tc-s390.c (md_apply_fix): Set fx_size to 4 for 20 bit displacements. * testsuite/gas/s390/s390.exp: Run new test. * testsuite/gas/s390/zarch-z990-symbol-lay.s: New test. --- gas/config/tc-s390.c | 2 +- gas/testsuite/gas/s390/s390.exp | 1 + gas/testsuite/gas/s390/zarch-z990-symbol-lay.l | 0 gas/testsuite/gas/s390/zarch-z990-symbol-lay.s | 6 ++++++ 4 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 gas/testsuite/gas/s390/zarch-z990-symbol-lay.l create mode 100644 gas/testsuite/gas/s390/zarch-z990-symbol-lay.s diff --git a/gas/config/tc-s390.c b/gas/config/tc-s390.c index 60de23fbbdc..b53e33af3db 100644 --- a/gas/config/tc-s390.c +++ b/gas/config/tc-s390.c @@ -2294,7 +2294,7 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED) } else if (operand->bits == 20 && operand->shift == 20) { - fixP->fx_size = 2; + fixP->fx_size = 4; fixP->fx_where += 2; fixP->fx_r_type = BFD_RELOC_390_20; } diff --git a/gas/testsuite/gas/s390/s390.exp b/gas/testsuite/gas/s390/s390.exp index e6d0754f44d..f0258ef03c6 100644 --- a/gas/testsuite/gas/s390/s390.exp +++ b/gas/testsuite/gas/s390/s390.exp @@ -21,6 +21,7 @@ if [expr [istarget "s390-*-*"] || [istarget "s390x-*-*"]] then { run_dump_test "zarch-z900" "{as -m64}" run_dump_test "zarch-z990" "{as -m64} {as -march=z990}" + run_list_test "zarch-z990-symbol-lay" "-m64 -march=z990" run_dump_test "zarch-z9-109" "{as -m64} {as -march=z9-109}" run_list_test "zarch-z9-109-err" "-march=z9-109" run_dump_test "zarch-z9-ec" "{as -m64} {as -march=z9-ec}" diff --git a/gas/testsuite/gas/s390/zarch-z990-symbol-lay.l b/gas/testsuite/gas/s390/zarch-z990-symbol-lay.l new file mode 100644 index 00000000000..e69de29bb2d diff --git a/gas/testsuite/gas/s390/zarch-z990-symbol-lay.s b/gas/testsuite/gas/s390/zarch-z990-symbol-lay.s new file mode 100644 index 00000000000..97aa8ec5fa2 --- /dev/null +++ b/gas/testsuite/gas/s390/zarch-z990-symbol-lay.s @@ -0,0 +1,6 @@ +.text +foo: + lay %r1,bar + .org 0x10000 +bar: + .long 42 -- 2.30.2