diff options
| author | Andreas Schwab <schwab@linux-m68k.org> | 2012-05-29 23:55:13 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@linux-m68k.org> | 2012-06-01 01:25:41 +0200 |
| commit | 5be8418cb0856aff4de059802570eb12d558c91f (patch) | |
| tree | 687b7a52c60eeeb66b8e25668953cd7e5b2919c0 /elf | |
| parent | 12e5e0f35770127bf8ab732b0c625821c4ab96b7 (diff) | |
| download | glibc-5be8418cb0856aff4de059802570eb12d558c91f.zip glibc-5be8418cb0856aff4de059802570eb12d558c91f.tar.gz glibc-5be8418cb0856aff4de059802570eb12d558c91f.tar.bz2 | |
Remove use of INTDEF/INTUSE in stdio-common
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/dl-minimal.c | 8 | ||||
| -rw-r--r-- | elf/dl-reloc.c | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/elf/dl-minimal.c b/elf/dl-minimal.c index 4a97f56..a8b2d4f 100644 --- a/elf/dl-minimal.c +++ b/elf/dl-minimal.c @@ -315,12 +315,10 @@ _itoa (value, buflim, base, upper_case) unsigned int base; int upper_case; { - extern const char INTUSE(_itoa_lower_digits)[] attribute_hidden; - assert (! upper_case); do - *--buflim = INTUSE(_itoa_lower_digits)[value % base]; + *--buflim = _itoa_lower_digits[value % base]; while ((value /= base) != 0); return buflim; @@ -380,5 +378,5 @@ rtld_hidden_def (__chk_fail) /* The '_itoa_lower_digits' variable in libc.so is able to handle bases up to 36. We don't need this here. */ -const char INTUSE(_itoa_lower_digits)[16] attribute_hidden - = "0123456789abcdef"; +const char _itoa_lower_digits[16] = "0123456789abcdef"; +rtld_hidden_data_def (_itoa_lower_digits) diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c index 97d2f6f..e6968a4 100644 --- a/elf/dl-reloc.c +++ b/elf/dl-reloc.c @@ -1,5 +1,5 @@ /* Relocate a shared object and resolve its references to other loaded objects. - Copyright (C) 1995-2006, 2008-2010, 2011 Free Software Foundation, Inc. + Copyright (C) 1995-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -24,6 +24,7 @@ #include <sys/mman.h> #include <sys/param.h> #include <sys/types.h> +#include <_itoa.h> #include "dynamic-link.h" /* Statistics function. */ @@ -338,8 +339,7 @@ void internal_function __attribute_noinline__ _dl_reloc_bad_type (struct link_map *map, unsigned int type, int plt) { - extern const char INTUSE(_itoa_lower_digits)[] attribute_hidden; -#define DIGIT(b) INTUSE(_itoa_lower_digits)[(b) & 0xf]; +#define DIGIT(b) _itoa_lower_digits[(b) & 0xf]; /* XXX We cannot translate these messages. */ static const char msg[2][32 |