diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | elf/dl-reloc.c | 4 | ||||
| -rw-r--r-- | sysdeps/sparc/sparc64/dl-machine.h | 18 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/sparc64/time.c | 1 |
4 files changed, 29 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index eaabc81ea6..b607e38e3f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2000-05-10 Jakub Jelinek <jakub@redhat.com> + * elf/dl-reloc.c (_dl_reloc_bad_type): Sync messages with plt + argument. + * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela): Handle + R_SPARC_UA64. + * sysdeps/unix/sysv/linux/sparc/sparc64/time.c: New file. + +2000-05-10 Jakub Jelinek <jakub@redhat.com> + * elf/dl-reloc.c (_dl_reloc_bad_type): Write type into the message at proper place. Compute the high nibble correctly. diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c index 3ee6f08483..3bfba7709d 100644 --- a/elf/dl-reloc.c +++ b/elf/dl-reloc.c @@ -157,14 +157,14 @@ _dl_reloc_bad_type (struct link_map *map, uint_fast8_t type, int plt) extern const char _itoa_lower_digits[]; if (plt) { - char msg[] = "unexpected reloc type 0x??"; + char msg[] = "unexpected PLT reloc type 0x??"; msg[sizeof msg - 3] = DIGIT(type >> 4); msg[sizeof msg - 2] = DIGIT(type); _dl_signal_error (0, map->l_name, msg); } else { - char msg[] = "unexpected PLT reloc type 0x??"; + char msg[] = "unexpected reloc type 0x??"; msg[sizeof msg - 3] = DIGIT(type >> 4); msg[sizeof msg - 2] = DIGIT(type); _dl_signal_error (0, map->l_name, msg); diff --git a/sysdeps/sparc/sparc64/dl-machine.h b/sysdeps/sparc/sparc64/dl-machine.h index 552076ac1c..35efc8e9f1 100644 --- a/sysdeps/sparc/sparc64/dl-machine.h +++ b/sysdeps/sparc/sparc64/dl-machine.h @@ -316,6 +316,24 @@ elf_machine_rela (struct link_map *map, const Elf64_Rela *reloc, elf_machine_fixup_plt(map, NULL, reloc, reloc_addr, value); break; + case R_SPARC_UA64: + if (! ((long) reloc_addr & 3)) + { + /* Common in .eh_frame */ + ((unsigned int *) reloc_addr) [0] = value >> 32; + ((unsigned int *) reloc_addr) [1] = value; + break; + } + ((unsigned char *) reloc_addr) [0] = value >> 56; + ((unsigned char *) reloc_addr) [1] = value >> 48; + ((unsigned char *) reloc_addr) [2] = value >> 40; + ((unsigned char *) reloc_addr) [3] = value >> 32; + ((unsigned char *) reloc_addr) [4] = value >> 24; + ((unsigned char *) reloc_addr) [5] = value >> 16; + ((unsigned char *) reloc_addr) [6] = value >> 8; + ((unsigned char *) reloc_addr) [7] = value; + break; + default: _dl_reloc_bad_type (map, ELFW(R_TYPE) (reloc->r_info), 0); break; diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/time.c b/sysdeps/unix/sysv/linux/sparc/sparc64/time.c new file mode 100644 index 0000000000..3a64ef1958 --- /dev/null +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/time.c @@ -0,0 +1 @@ +#include <sysdeps/unix/time.c> |