diff options
author | nwhitehorn <nwhitehorn@FreeBSD.org> | 2015-03-09 02:19:44 +0000 |
---|---|---|
committer | nwhitehorn <nwhitehorn@FreeBSD.org> | 2015-03-09 02:19:44 +0000 |
commit | cf77261296a7c87dfb75318e9e0aff9f2693ea91 (patch) | |
tree | 98d59897b8107a3a97c2db24c6107bc37943acc8 /lib/libstand/powerpc/_setjmp.S | |
parent | 986216c4aa316d44147e982b1c5f331e01d2bcd3 (diff) | |
download | FreeBSD-src-cf77261296a7c87dfb75318e9e0aff9f2693ea91.zip FreeBSD-src-cf77261296a7c87dfb75318e9e0aff9f2693ea91.tar.gz |
Fix loader on PowerPC following r279784. It turns out that, due to .PATH
confusion, the _setjmp.S in libstand was never being used and was instead
being shadowed by the libc version. Since the libc version now uses FPRs,
it caused loader to crash.
Diffstat (limited to 'lib/libstand/powerpc/_setjmp.S')
-rw-r--r-- | lib/libstand/powerpc/_setjmp.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libstand/powerpc/_setjmp.S b/lib/libstand/powerpc/_setjmp.S index 3884b11..7c7c24b 100644 --- a/lib/libstand/powerpc/_setjmp.S +++ b/lib/libstand/powerpc/_setjmp.S @@ -42,7 +42,7 @@ #define JMP_xer 24*REGWIDTH #define JMP_sig 25*REGWIDTH -ASENTRY_NOPROF(setjmp) +ASENTRY_NOPROF(_setjmp) ST_REG 31, JMP_r31(3) /* r1, r2, r14-r30 */ ST_REG 1, JMP_r1 (3) @@ -79,7 +79,7 @@ ASENTRY_NOPROF(setjmp) .extern sigsetmask -ASENTRY_NOPROF(longjmp) +ASENTRY_NOPROF(_longjmp) LD_REG 31, JMP_r31(3) /* r1, r2, r14-r30 */ LD_REG 1, JMP_r1 (3) |