From 51fc77c7c03fa0b300e9a609b18f11f0e4db065a Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Sun, 19 Apr 2015 21:49:54 -0400 Subject: [PATCH] remove invalid PLT calls from or1k asm analogous to commit 646cb9a4a04e5ed78e2dd928bf9dc6e79202f609 for sh. --- src/setjmp/or1k/setjmp.s | 3 +++ src/signal/or1k/sigsetjmp.s | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/setjmp/or1k/setjmp.s b/src/setjmp/or1k/setjmp.s index 8de4d3c2..06770338 100644 --- a/src/setjmp/or1k/setjmp.s +++ b/src/setjmp/or1k/setjmp.s @@ -1,9 +1,12 @@ +.global ___setjmp +.hidden ___setjmp .global __setjmp .global _setjmp .global setjmp .type __setjmp,@function .type _setjmp,@function .type setjmp,@function +___setjmp: __setjmp: _setjmp: setjmp: diff --git a/src/signal/or1k/sigsetjmp.s b/src/signal/or1k/sigsetjmp.s index 350c00e2..b9bcdae1 100644 --- a/src/signal/or1k/sigsetjmp.s +++ b/src/signal/or1k/sigsetjmp.s @@ -5,12 +5,13 @@ sigsetjmp: __sigsetjmp: l.sfeq r4, r0 - l.bf plt(setjmp) +.hidden ___setjmp + l.bf ___setjmp l.sw 52(r3), r9 l.sw 52+4+8(r3), r20 - l.jal plt(setjmp) + l.jal ___setjmp l.ori r20, r3, 0 l.ori r4, r11, 0 @@ -19,5 +20,5 @@ __sigsetjmp: l.lwz r9, 52(r3) .hidden __sigsetjmp_tail - l.j plt(__sigsetjmp_tail) + l.j __sigsetjmp_tail l.lwz r20, 52+4+8(r3) -- 2.25.1