diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-07-27 05:53:25 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-07-27 05:53:25 +0000 |
| commit | a1eca9f3293f9a40f58f89d33f0a90a0c7a013ae (patch) | |
| tree | 065edf2f59110c76ee26fa24739983c84f61b757 /elf | |
| parent | 650364fa29479ad5926870f03083854cdcad3810 (diff) | |
| download | glibc-a1eca9f3293f9a40f58f89d33f0a90a0c7a013ae.tar.gz glibc-a1eca9f3293f9a40f58f89d33f0a90a0c7a013ae.tar.xz glibc-a1eca9f3293f9a40f58f89d33f0a90a0c7a013ae.zip | |
Update.
1999-07-25 Jakub Jelinek <jj@ultra.linux.cz> * elf/link.h (struct link_map): Use Elf_Symndx instead of ElfXX_Symndx. * elf/dl-lookup.c (_dl_setup_hash): Likewise. * elf/dl-load.c (_dl_map_object): Likewise. * elf/do-lookup.h (do_lookup*): Likewise. * sysdeps/generic/bits/elfclass.h: Define Elf_Symndx as uint32_t. * sysdeps/unix/sysv/linux/alpha/bits/elfclass.h: Define Elf_symndx as uint64_t. * elf/elf.h: Remove Elf32_Symndx and Elf64_Symndx.
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/dl-load.c | 2 | ||||
| -rw-r--r-- | elf/dl-lookup.c | 4 | ||||
| -rw-r--r-- | elf/do-lookup.h | 2 | ||||
| -rw-r--r-- | elf/elf.h | 4 | ||||
| -rw-r--r-- | elf/link.h | 4 |
5 files changed, 6 insertions, 10 deletions
diff --git a/elf/dl-load.c b/elf/dl-load.c index e8b42a96e2..7640ec3289 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -1416,7 +1416,7 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded, are only interested in the list of libraries this isn't so severe. Fake an entry with all the information we have. */ - static const ElfW(Symndx) dummy_bucket = STN_UNDEF; + static const Elf_Symndx dummy_bucket = STN_UNDEF; /* Enter the new object in the list of loaded objects. */ if ((name_copy = local_strdup (name)) == NULL diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c index 4120cb1e64..611effea6a 100644 --- a/elf/dl-lookup.c +++ b/elf/dl-lookup.c @@ -320,8 +320,8 @@ void internal_function _dl_setup_hash (struct link_map *map) { - ElfW(Symndx) *hash; - ElfW(Symndx) nchain; + Elf_Symndx *hash; + Elf_Symndx nchain; if (!map->l_info[DT_HASH]) return; diff --git a/elf/do-lookup.h b/elf/do-lookup.h index f83b13ccf3..3c5e6f4e9b 100644 --- a/elf/do-lookup.h +++ b/elf/do-lookup.h @@ -43,7 +43,7 @@ FCT (const char *undef_name, struct link_map *undef_map, const ElfW(Sym) *symtab; const char *strtab; const ElfW(Half) *verstab; - ElfW(Symndx) symidx; + Elf_Symndx symidx; const ElfW(Sym) *sym; #if ! VERSIONED int num_versions = 0; diff --git a/elf/elf.h b/elf/elf.h index e541be8bc8..e722acbef5 100644 --- a/elf/elf.h +++ b/elf/elf.h @@ -56,10 +56,6 @@ typedef uint64_t Elf64_Off; typedef uint16_t Elf32_Section; typedef uint16_t Elf64_Section; -/* Type of symbol indices. */ -typedef uint32_t Elf32_Symndx; -typedef uint64_t Elf64_Symndx; - /* The ELF file header. This appears at the start of every ELF file. */ diff --git a/elf/link.h b/elf/link.h index d3a54fc011..2de39e5711 100644 --- a/elf/link.h +++ b/elf/link.h @@ -151,8 +151,8 @@ struct link_map struct link_map *l_loader; /* Symbol hash table. */ - ElfW(Symndx) l_nbuckets; - const ElfW(Symndx) *l_buckets, *l_chain; + Elf_Symndx l_nbuckets; + const Elf_Symndx *l_buckets, *l_chain; unsigned int l_opencount; /* Reference count for dlopen/dlclose. */ enum /* Where this object came from. */ |