]>
Commit | Line | Data |
---|---|---|
a615a9d3 JB |
1 | # |
2 | # | |
3 | # patch "src/ChangeLog" | |
4 | # from [f8c27340f5383e9b12ba61c17f42836427afb156] | |
5 | # to [9072d1ca5e9889af095178f14a858cf93f2ee8d3] | |
6 | # | |
7 | # patch "src/elflint.c" | |
8 | # from [b5703cc5ab10ebe94c720267613ea88bc7ffbf01] | |
9 | # to [2a6fb2780dcf41443bb96170902773287dba7f17] | |
10 | # | |
11 | # patch "src/readelf.c" | |
12 | # from [c644fd7f7331b5041932ad76ea3dfd9de609fdbf] | |
13 | # to [bbb36859cccf55acf4ca5ff5ddae0daeb4cea4ba] | |
14 | # | |
15 | ============================================================ | |
16 | --- src/ChangeLog f8c27340f5383e9b12ba61c17f42836427afb156 | |
17 | +++ src/ChangeLog 9072d1ca5e9889af095178f14a858cf93f2ee8d3 | |
18 | @@ -1,3 +1,14 @@ | |
19 | +2006-07-17 Roland McGrath <roland@redhat.com> | |
20 | + | |
21 | + * elflint.c (struct version_namelist): Use GElf_Versym for `ndx' field. | |
22 | + (add_version): Likewise for argument. | |
23 | + (check_versym): Cast constant to GElf_Versym for comparison. | |
24 | + | |
25 | +2006-07-12 Roland McGrath <roland@redhat.com> | |
26 | + | |
27 | + * readelf.c (handle_gnu_hash): Add casts for machines where | |
28 | + Elf32_Word != unsigned int. | |
29 | + | |
30 | 2006-07-12 Ulrich Drepper <drepper@redhat.com> | |
31 | ||
32 | * elflint.c (check_sysv_hash64): Fix printf format. | |
33 | ============================================================ | |
34 | --- src/elflint.c b5703cc5ab10ebe94c720267613ea88bc7ffbf01 | |
35 | +++ src/elflint.c 2a6fb2780dcf41443bb96170902773287dba7f17 | |
36 | @@ -2361,14 +2361,14 @@ | |
37 | { | |
38 | const char *objname; | |
39 | const char *name; | |
40 | - GElf_Word ndx; | |
41 | + GElf_Versym ndx; | |
42 | enum { ver_def, ver_need } type; | |
43 | struct version_namelist *next; | |
44 | } *version_namelist; | |
45 | ||
46 | ||
47 | static int | |
48 | -add_version (const char *objname, const char *name, GElf_Word ndx, int type) | |
49 | +add_version (const char *objname, const char *name, GElf_Versym ndx, int type) | |
50 | { | |
51 | /* Check that there are no duplications. */ | |
52 | struct version_namelist *nlp = version_namelist; | |
53 | @@ -2480,7 +2480,7 @@ | |
54 | index we need for this symbol. */ | |
55 | struct version_namelist *runp = version_namelist; | |
56 | while (runp != NULL) | |
57 | - if (runp->ndx == (*versym & 0x7fff)) | |
58 | + if (runp->ndx == (*versym & (GElf_Versym) 0x7fff)) | |
59 | break; | |
60 | else | |
61 | runp = runp->next; | |
62 | ============================================================ | |
63 | --- src/readelf.c c644fd7f7331b5041932ad76ea3dfd9de609fdbf | |
64 | +++ src/readelf.c bbb36859cccf55acf4ca5ff5ddae0daeb4cea4ba | |
65 | @@ -2534,9 +2534,10 @@ | |
66 | if (asprintf (&str, gettext ("\ | |
67 | Symbol Bias: %u\n\ | |
68 | Bitmask Size: %zu bytes %" PRIuFAST32 "%% bits set 2nd hash shift: %u\n"), | |
69 | - symbias, bitmask_words * sizeof (Elf32_Word), | |
70 | - (nbits * 100 + 50) / (bitmask_words * sizeof (Elf32_Word) * 8), | |
71 | - shift) == -1) | |
72 | + (unsigned int) symbias, bitmask_words * sizeof (Elf32_Word), | |
73 | + ((nbits * 100 + 50) | |
74 | + / (uint_fast32_t) (bitmask_words * sizeof (Elf32_Word) * 8)), | |
75 | + (unsigned int) shift) == -1) | |
76 | error (EXIT_FAILURE, 0, gettext ("memory exhausted")); | |
77 | ||
78 | print_hash_info (ebl, scn, shdr, shstrndx, maxlength, nbucket, nsyms, |