diff options
| author | Andreas Schwab <schwab@linux-m68k.org> | 2010-08-02 18:48:56 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@linux-m68k.org> | 2010-08-02 18:48:56 +0200 |
| commit | 690d264a40288c024fd8c59ca3cd42e70434a018 (patch) | |
| tree | 15dae81681e45607b56d3eb0871190ae061d4834 | |
| parent | 2aed4f91fd55c07675dc656dc35418d99b35c4fd (diff) | |
| download | glibc-690d264a40288c024fd8c59ca3cd42e70434a018.tar.xz glibc-690d264a40288c024fd8c59ca3cd42e70434a018.zip | |
m68k: fix loading of GOT for Coldfire
| -rw-r--r-- | ChangeLog.m68k | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/m68k/coldfire/sysdep.h | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/m68k/m680x0/sysdep.h | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/m68k/sysdep.h | 2 |
4 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog.m68k b/ChangeLog.m68k index 6fdd4e13e4..284a3bf399 100644 --- a/ChangeLog.m68k +++ b/ChangeLog.m68k @@ -6,9 +6,13 @@ (PCREL_OP): Define. * sysdeps/m68k/sysdep.h (PCREL_OP): Don't define here. * sysdeps/unix/sysv/linux/m68k/coldfire/sysdep.h: New file. + (SYSCALL_ERROR_LOAD_GOT): Define. * sysdeps/unix/sysv/linux/m68k/m680x0/sysdep.h: New file. + (SYSCALL_ERROR_LOAD_GOT): Define. * sysdeps/unix/sysv/linux/m68k/sysdep.h: Don't include subordinate sysdep files. + (SYSCALL_ERROR_HANDLER) [PIC && USE___THREAD]: Use + SYSCALL_ERROR_LOAD_GOT. 2010-06-24 Joseph Myers <joseph@codesourcery.com> diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/sysdep.h b/sysdeps/unix/sysv/linux/m68k/coldfire/sysdep.h index d7c523db40..e129dc1ec4 100644 --- a/sysdeps/unix/sysv/linux/m68k/coldfire/sysdep.h +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/sysdep.h @@ -23,4 +23,8 @@ #include <sysdeps/m68k/coldfire/sysdep.h> #include <sysdeps/unix/sysv/linux/m68k/sysdep.h> +#define SYSCALL_ERROR_LOAD_GOT(reg) \ + move.l #_GLOBAL_OFFSET_TABLE_@GOTPC, reg; \ + lea (-6, %pc, reg), reg + #endif diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/sysdep.h b/sysdeps/unix/sysv/linux/m68k/m680x0/sysdep.h index 651128cd4e..371befb275 100644 --- a/sysdeps/unix/sysv/linux/m68k/m680x0/sysdep.h +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/sysdep.h @@ -23,4 +23,7 @@ #include <sysdeps/m68k/m680x0/sysdep.h> #include <sysdeps/unix/sysv/linux/m68k/sysdep.h> +#define SYSCALL_ERROR_LOAD_GOT(reg) \ + lea (_GLOBAL_OFFSET_TABLE_@GOTPC, %pc), reg + #endif diff --git a/sysdeps/unix/sysv/linux/m68k/sysdep.h b/sysdeps/unix/sysv/linux/m68k/sysdep.h index 3e7b105d0d..d381189fe5 100644 --- a/sysdeps/unix/sysv/linux/m68k/sysdep.h +++ b/sysdeps/unix/sysv/linux/m68k/sysdep.h @@ -117,7 +117,7 @@ SYSCALL_ERROR_LABEL: \ neg.l %d0; \ move.l %d0, -(%sp); \ jbsr __m68k_read_tp@PLTPC; \ - lea (_GLOBAL_OFFSET_TABLE_@GOTPC, %pc), %a1; \ + SYSCALL_ERROR_LOAD_GOT (%a1); \ add.l (SYSCALL_ERROR_ERRNO@TLSIE, %a1), %a0; \ move.l (%sp)+, (%a0); \ move.l &-1, %d0; \ |
