diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-11-23 17:26:27 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-11-23 17:26:27 +0000 |
| commit | 33e09162d0187eddf91bafa5e64f9d413a5a920f (patch) | |
| tree | a56a58437faf749c920e6525e6b593597d482daa | |
| parent | ba4cf0e9ef65eb8f188a4d2432562f0aa572202c (diff) | |
| download | glibc-33e09162d0187eddf91bafa5e64f9d413a5a920f.zip glibc-33e09162d0187eddf91bafa5e64f9d413a5a920f.tar.gz glibc-33e09162d0187eddf91bafa5e64f9d413a5a920f.tar.bz2 | |
Ifdef out handling for relocs which never occur during bootstrap.
| -rw-r--r-- | sysdeps/sparc/sparc32/dl-machine.h | 6 | ||||
| -rw-r--r-- | sysdeps/sparc/sparc64/dl-machine.h | 12 |
2 files changed, 14 insertions, 4 deletions
diff --git a/sysdeps/sparc/sparc32/dl-machine.h b/sysdeps/sparc/sparc32/dl-machine.h index 84d25cd..feec35e 100644 --- a/sysdeps/sparc/sparc32/dl-machine.h +++ b/sysdeps/sparc/sparc32/dl-machine.h @@ -377,6 +377,7 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc, switch (ELF32_R_TYPE (reloc->r_info)) { +#ifndef RTLD_BOOTSTRAP case R_SPARC_COPY: if (sym == NULL) /* This can happen in trace mode if an object could not be @@ -397,6 +398,7 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc, memcpy (reloc_addr, (void *) value, MIN (sym->st_size, refsym->st_size)); break; +#endif case R_SPARC_GLOB_DAT: case R_SPARC_32: *reloc_addr = value; @@ -404,6 +406,7 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc, case R_SPARC_JMP_SLOT: elf_machine_fixup_plt(map, 0, reloc, reloc_addr, value); break; +#ifndef RTLD_BOOTSTRAP case R_SPARC_8: *(char *) reloc_addr = value; break; @@ -429,11 +432,14 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc, case R_SPARC_HI22: *reloc_addr = (*reloc_addr & 0xffc00000) | (value >> 10); break; +#endif case R_SPARC_NONE: /* Alright, Wilbur. */ break; +#if !defined RTLD_BOOTSTRAP || defined _NDEBUG default: _dl_reloc_bad_type (map, ELFW(R_TYPE) (reloc->r_info), 0); break; +#endif } } } diff --git a/sysdeps/sparc/sparc64/dl-machine.h b/sysdeps/sparc/sparc64/dl-machine.h index b2a0e7a..aee5ba8 100644 --- a/sysdeps/sparc/sparc64/dl-machine.h +++ b/sysdeps/sparc/sparc64/dl-machine.h @@ -212,6 +212,7 @@ elf_machine_rela (struct link_map *map, const Elf64_Rela *reloc, switch (ELF64_R_TYPE_ID (reloc->r_info)) { +#ifndef RTLD_BOOTSTRAP case R_SPARC_COPY: if (sym == NULL) /* This can happen in trace mode if an object could not be @@ -232,11 +233,12 @@ elf_machine_rela (struct link_map *map, const Elf64_Rela *reloc, memcpy (reloc_addr, (void *) value, MIN (sym->st_size, refsym->st_size)); break; - +#endif case R_SPARC_64: case R_SPARC_GLOB_DAT: *reloc_addr = value; break; +#ifndef RTLD_BOOTSTRAP case R_SPARC_8: *(char *) reloc_addr = value; break; @@ -311,11 +313,11 @@ elf_machine_rela (struct link_map *map, const Elf64_Rela *reloc, ((*(unsigned int *)reloc_addr & 0xffc00000) | ((value >> 10) & 0x003fffff)); break; - +#endif case R_SPARC_JMP_SLOT: elf_machine_fixup_plt(map, 0, reloc, reloc_addr, value); break; - +#ifndef RTLD_BOOTSTRAP case R_SPARC_UA64: if (! ((long) reloc_addr & 3)) { @@ -333,10 +335,12 @@ elf_machine_rela (struct link_map *map, const Elf64_Rela *reloc, ((unsigned char *) reloc_addr) [6] = value >> 8; ((unsigned char *) reloc_addr) [7] = value; break; - +#endif +#if !defined RTLD_BOOTSTRAP || defined _NDEBUG default: _dl_reloc_bad_type (map, ELFW(R_TYPE) (reloc->r_info), 0); break; +#endif } } } |