summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sysdeps/loongarch/__longjmp.S2
-rw-r--r--sysdeps/loongarch/setjmp.S2
-rw-r--r--sysdeps/unix/sysv/linux/loongarch/sysdep.h33
3 files changed, 18 insertions, 19 deletions
diff --git a/sysdeps/loongarch/__longjmp.S b/sysdeps/loongarch/__longjmp.S
index c2c5b56a80..4207376f5e 100644
--- a/sysdeps/loongarch/__longjmp.S
+++ b/sysdeps/loongarch/__longjmp.S
@@ -22,7 +22,7 @@
ENTRY (__longjmp)
#ifdef PTR_MANGLE
REG_L t0, a0, 0*SZREG
- PTR_DEMANGLE (ra, t0, t1, t2)
+ PTR_DEMANGLE (ra, t0, t1)
REG_L t0, a0, 1*SZREG
PTR_DEMANGLE2 (sp, t0, t1)
#else
diff --git a/sysdeps/loongarch/setjmp.S b/sysdeps/loongarch/setjmp.S
index ec4ddc72da..298bb02a82 100644
--- a/sysdeps/loongarch/setjmp.S
+++ b/sysdeps/loongarch/setjmp.S
@@ -30,7 +30,7 @@ END (setjmp)
ENTRY (__sigsetjmp)
#ifdef PTR_MANGLE
- PTR_MANGLE (t0, ra, t1, t2)
+ PTR_MANGLE (t0, ra, t1)
REG_S t0, a0, 0*SZREG
PTR_MANGLE2 (t0, sp, t1)
REG_S t0, a0, 1*SZREG
diff --git a/sysdeps/unix/sysv/linux/loongarch/sysdep.h b/sysdeps/unix/sysv/linux/loongarch/sysdep.h
index 157cbd6c6b..f4a1d23a97 100644
--- a/sysdeps/unix/sysv/linux/loongarch/sysdep.h
+++ b/sysdeps/unix/sysv/linux/loongarch/sysdep.h
@@ -316,29 +316,28 @@ extern long int __syscall_error (long int neg_errno);
/* Pointer mangling is supported for LoongArch. */
-/* Load or store to/from a got-relative EXPR into/from G, using T.
+/* Load a got-relative EXPR into G, using T.
Note G and T are register names. */
-#define LDST_GLOBAL(OP, G, T, EXPR) \
- pcalau12i T, %got_pc_hi20(EXPR); \
- OP T, T, %got_pc_lo12(EXPR); \
- OP G, T, 0;
+#define LD_GLOBAL(G, EXPR) \
+ la.global G, EXPR; \
+ REG_L G, G, 0;
-/* Load or store to/from a pc-relative EXPR into/from G, using T.
+/* Load a pc-relative EXPR into G, using T.
Note G and T are register names. */
-#define LDST_PCREL(OP, G, T, EXPR) \
- pcalau12i T, %pc_hi20(EXPR); \
- OP G, T, %pc_lo12(EXPR);
+#define LD_PCREL(G, EXPR) \
+ la.pcrel G, EXPR; \
+ REG_L G, G, 0;
#if (IS_IN (rtld) \
|| (!defined SHARED && (IS_IN (libc) \
|| IS_IN (libpthread))))
#ifdef __ASSEMBLER__
-#define PTR_MANGLE(dst, src, guard, tmp) \
- LDST_PCREL (REG_L, guard, tmp, __pointer_chk_guard_local); \
+#define PTR_MANGLE(dst, src, guard) \
+ LD_PCREL (guard, __pointer_chk_guard_local); \
PTR_MANGLE2 (dst, src, guard);
-#define PTR_DEMANGLE(dst, src, guard, tmp) \
- LDST_PCREL (REG_L, guard, tmp, __pointer_chk_guard_local); \
+#define PTR_DEMANGLE(dst, src, guard) \
+ LD_PCREL (guard, __pointer_chk_guard_local); \
PTR_DEMANGLE2 (dst, src, guard);
/* Use PTR_MANGLE2 for efficiency if guard is already loaded. */
#define PTR_MANGLE2(dst, src, guard) \
@@ -355,11 +354,11 @@ extern uintptr_t __pointer_chk_guard_local attribute_relro attribute_hidden;
#else
#ifdef __ASSEMBLER__
-#define PTR_MANGLE(dst, src, guard, tmp) \
- LDST_GLOBAL (REG_L, guard, tmp, __pointer_chk_guard); \
+#define PTR_MANGLE(dst, src, guard) \
+ LD_GLOBAL (guard, __pointer_chk_guard); \
PTR_MANGLE2 (dst, src, guard);
-#define PTR_DEMANGLE(dst, src, guard, tmp) \
- LDST_GLOBAL (REG_L, guard, tmp, __pointer_chk_guard); \
+#define PTR_DEMANGLE(dst, src, guard) \
+ LD_GLOBAL (guard, __pointer_chk_guard); \
PTR_DEMANGLE2 (dst, src, guard);
/* Use PTR_MANGLE2 for efficiency if guard is already loaded. */
#define PTR_MANGLE2(dst, src, guard) \