82 lines
2.1 KiB
Diff
82 lines
2.1 KiB
Diff
|
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
|
||
|
|
index b0cbb6e2d55..58d38f74bde 100644
|
||
|
|
--- a/gcc/config/aarch64/aarch64.c
|
||
|
|
+++ b/gcc/config/aarch64/aarch64.c
|
||
|
|
@@ -2739,8 +2739,21 @@ aarch64_load_symref_appropriately (rtx dest, rtx imm,
|
||
|
|
}
|
||
|
|
|
||
|
|
case SYMBOL_TINY_GOT:
|
||
|
|
- emit_insn (gen_ldr_got_tiny (dest, imm));
|
||
|
|
- return;
|
||
|
|
+ {
|
||
|
|
+ rtx insn;
|
||
|
|
+ machine_mode mode = GET_MODE (dest);
|
||
|
|
+
|
||
|
|
+ if (mode == ptr_mode)
|
||
|
|
+ insn = gen_ldr_got_tiny (mode, dest, imm);
|
||
|
|
+ else
|
||
|
|
+ {
|
||
|
|
+ gcc_assert (mode == Pmode);
|
||
|
|
+ insn = gen_ldr_got_tiny_sidi (dest, imm);
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ emit_insn (insn);
|
||
|
|
+ return;
|
||
|
|
+ }
|
||
|
|
|
||
|
|
case SYMBOL_TINY_TLSIE:
|
||
|
|
{
|
||
|
|
diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md
|
||
|
|
index 7ad4e918578..c7c4d1dd519 100644
|
||
|
|
--- a/gcc/config/aarch64/aarch64.md
|
||
|
|
+++ b/gcc/config/aarch64/aarch64.md
|
||
|
|
@@ -6766,13 +6766,23 @@
|
||
|
|
[(set_attr "type" "load_4")]
|
||
|
|
)
|
||
|
|
|
||
|
|
-(define_insn "ldr_got_tiny"
|
||
|
|
- [(set (match_operand:DI 0 "register_operand" "=r")
|
||
|
|
- (unspec:DI [(match_operand:DI 1 "aarch64_valid_symref" "S")]
|
||
|
|
- UNSPEC_GOTTINYPIC))]
|
||
|
|
+(define_insn "@ldr_got_tiny_<mode>"
|
||
|
|
+ [(set (match_operand:PTR 0 "register_operand" "=r")
|
||
|
|
+ (unspec:PTR [(match_operand:PTR 1 "aarch64_valid_symref" "S")]
|
||
|
|
+ UNSPEC_GOTTINYPIC))]
|
||
|
|
""
|
||
|
|
- "ldr\\t%0, %L1"
|
||
|
|
- [(set_attr "type" "load_8")]
|
||
|
|
+ "ldr\t%<w>0, %L1"
|
||
|
|
+ [(set_attr "type" "load_<ldst_sz>")]
|
||
|
|
+)
|
||
|
|
+
|
||
|
|
+(define_insn "ldr_got_tiny_sidi"
|
||
|
|
+ [(set (match_operand:DI 0 "register_operand" "=r")
|
||
|
|
+ (zero_extend:DI
|
||
|
|
+ (unspec:SI [(match_operand:DI 1 "aarch64_valid_symref" "S")]
|
||
|
|
+ UNSPEC_GOTTINYPIC)))]
|
||
|
|
+ "TARGET_ILP32"
|
||
|
|
+ "ldr\t%w0, %L1"
|
||
|
|
+ [(set_attr "type" "load_4")]
|
||
|
|
)
|
||
|
|
|
||
|
|
(define_insn "aarch64_load_tp_hard"
|
||
|
|
diff --git a/gcc/testsuite/gcc.target/aarch64/pr94201.c b/gcc/testsuite/gcc.target/aarch64/pr94201.c
|
||
|
|
new file mode 100644
|
||
|
|
index 00000000000..69176169186
|
||
|
|
--- /dev/null
|
||
|
|
+++ b/gcc/testsuite/gcc.target/aarch64/pr94201.c
|
||
|
|
@@ -0,0 +1,13 @@
|
||
|
|
+/* { dg-do compile } */
|
||
|
|
+/* { dg-options "-mcmodel=tiny -mabi=ilp32 -fPIC" } */
|
||
|
|
+
|
||
|
|
+extern int bar (void *);
|
||
|
|
+extern long long a;
|
||
|
|
+
|
||
|
|
+int
|
||
|
|
+foo (void)
|
||
|
|
+{
|
||
|
|
+ a = 1;
|
||
|
|
+ return bar ((void *)bar);
|
||
|
|
+}
|
||
|
|
+
|