aboutsummaryrefslogtreecommitdiff
path: root/ld
diff options
context:
space:
mode:
authorAndrew Waterman <andrew@sifive.com>2017-09-23 18:04:16 -0700
committerPalmer Dabbelt <palmer@dabbelt.com>2017-10-24 08:02:46 -0700
commit3342be5dabeeaf2218dfbf4d38f92214612436f4 (patch)
treee39053086e5e3873823abd2d77e630fc32926fe7 /ld
parent3779bbe01b4ec1e5ae0a5c555f838999ba88ac50 (diff)
downloadbinutils-3342be5dabeeaf2218dfbf4d38f92214612436f4.zip
binutils-3342be5dabeeaf2218dfbf4d38f92214612436f4.tar.gz
binutils-3342be5dabeeaf2218dfbf4d38f92214612436f4.tar.bz2
RISC-V: Only relax to C.LUI when imm != 0 and rd != 0/2
This matches the ISA specification. This also adds two tests: one to make sure the assembler rejects invalid 'c.lui's, and one to make sure we only relax valid 'c.lui's. bfd/ChangeLog 2017-10-24 Andrew Waterman <andrew@sifive.com> * elfnn-riscv.c (_bfd_riscv_relax_lui): Don't relax to c.lui when rd is x0. include/ChangeLog 2017-10-24 Andrew Waterman <andrew@sifive.com> * opcode/riscv.h (VALID_RVC_LUI_IMM): c.lui can't load the immediate 0. gas/ChangeLog 2017-10-24 Andrew Waterman <andrew@sifive.com> * testsuite/gas/riscv/c-lui-fail.d: New testcase. gas/testsuite/gas/riscv/c-lui-fail.l: Likewise. gas/testsuite/gas/riscv/c-lui-fail.s: Likewise. gas/testsuite/gas/riscv/riscv.exp: Likewise. ld/ChangeLog 2017-10-24 Andrew Waterman <andrew@sifive.com> * ld/testsuite/ld-riscv-elf/c-lui.d: New testcase. ld/testsuite/ld-riscv-elf/c-lui.s: Likewise. ld/testsuite/ld-riscv-elf/ld-riscv-elf.exp: New test suite.
Diffstat (limited to 'ld')
-rw-r--r--ld/ChangeLog6
-rw-r--r--ld/testsuite/ld-riscv-elf/c-lui.d17
-rw-r--r--ld/testsuite/ld-riscv-elf/c-lui.s5
-rw-r--r--ld/testsuite/ld-riscv-elf/ld-riscv-elf.exp24
4 files changed, 52 insertions, 0 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 7319d72..f4c4490 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2017-10-24 Andrew Waterman <andrew@sifive.com>
+
+ * ld/testsuite/ld-riscv-elf/c-lui.d: New testcase.
+ ld/testsuite/ld-riscv-elf/c-lui.s: Likewise.
+ ld/testsuite/ld-riscv-elf/ld-riscv-elf.exp: New test suite.
+
2017-10-24 Renlin Li <renlin.li@arm.com>
PR ld/21703
diff --git a/ld/testsuite/ld-riscv-elf/c-lui.d b/ld/testsuite/ld-riscv-elf/c-lui.d
new file mode 100644
index 0000000..7a96711
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/c-lui.d
@@ -0,0 +1,17 @@
+#name: lui to c.lui relaxation
+#source: c-lui.s
+#as: -march=rv32ic
+#ld: -shared -melf32lriscv
+#objdump: -d -M no-aliases,numeric
+
+.*: file format .*
+
+
+Disassembly of section \.text:
+
+.* <.text>:
+.*: 6085 c.lui x1,0x1
+.*: 000000b7 lui x1,0x0
+.*: 00001037 lui x0,0x1
+.*: 00001137 lui x2,0x1
+#pass
diff --git a/ld/testsuite/ld-riscv-elf/c-lui.s b/ld/testsuite/ld-riscv-elf/c-lui.s
new file mode 100644
index 0000000..4a23fdb
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/c-lui.s
@@ -0,0 +1,5 @@
+.text
+ lui x1, 1
+ lui x1, 0
+ lui x0, 1
+ lui x2, 1
diff --git a/ld/testsuite/ld-riscv-elf/ld-riscv-elf.exp b/ld/testsuite/ld-riscv-elf/ld-riscv-elf.exp
new file mode 100644
index 0000000..efe012e
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/ld-riscv-elf.exp
@@ -0,0 +1,24 @@
+# Expect script for RISC-V ELF linker tests
+# Copyright (C) 2017 Free Software Foundation, Inc.
+#
+# This file is part of the GNU Binutils.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+# MA 02110-1301, USA.
+#
+
+if [is_target "riscv-*-*"] {
+ run_dump_test "c-lui"
+}