picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Update.

Browse source 
* elf/dl-reloc.c (_dl_reloc_bad_type): Rewrite to not use writable
	strings.  Change type of second parameter.
	* sysdeps/generic/ldsodefs.h: Adjust _dl_reloc_bad_type prototype
	for last change.
This commit is contained in:
Ulrich Drepper 2001-11-05 22:13:46 +00:00
parent 3abe7c31ed
commit ea41b9267d
3 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,5 +1,10 @@
2001-11-05 Ulrich Drepper <drepper@redhat.com>
* elf/dl-reloc.c (_dl_reloc_bad_type): Rewrite to not use writable
strings. Change type of second parameter.
* sysdeps/generic/ldsodefs.h: Adjust _dl_reloc_bad_type prototype
for last change.
* io/fts.h: Prevent using <fts.h> with _FILE_OFFSET_BITS=64.
2001-11-04 Joseph S. Myers <jsm28@cam.ac.uk>

33
elf/dl-reloc.c
View file

@ -187,28 +187,23 @@ cannot make segment writable for relocation"));
}
}
#include "../stdio-common/_itoa.h"
#define DIGIT(b) _itoa_lower_digits[(b) & 0xf];
void
internal_function
_dl_reloc_bad_type (struct link_map *map, uint_fast8_t type, int plt)
_dl_reloc_bad_type (struct link_map *map, unsigned int type, int plt)
{
extern const char _itoa_lower_digits[];
if (plt)
{
/* XXX We cannot translate the message. */
static 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, NULL, msg);
}
else
{
/* XXX We cannot translate the message. */
static 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, NULL, msg);
}
#define DIGIT(b) _itoa_lower_digits[(b) & 0xf];
/* XXX We cannot translate these messages. */
static const char msg[2][32] = { "unexpected reloc type 0x",
"unexpected PLT reloc type 0x" };
char msgbuf[sizeof (msg[0])];
char *cp;
cp = __stpcpy (msgbuf, msg[plt]);
*cp++ = DIGIT (type >> 4);
*cp = DIGIT (type);
_dl_signal_error (0, map->l_name, NULL, msgbuf);
}

5
sysdeps/generic/ldsodefs.h
View file

@ -416,9 +416,8 @@ extern void _dl_relocate_object (struct link_map *map,
TYPE is the result of ELFW(R_TYPE) (r_info), i.e. an R_<CPU>_* value.
PLT is nonzero if this was a PLT reloc; it just affects the message. */
extern void _dl_reloc_bad_type (struct link_map *map,
uint_fast8_t type, int plt)
internal_function
__attribute__ ((__noreturn__));
unsigned int type, int plt)
internal_function __attribute__ ((__noreturn__));
/* Check the version dependencies of all objects available through
MAP. If VERBOSE print some more diagnostics. */