diff options
Diffstat (limited to 'ldso/include')
| -rw-r--r-- | ldso/include/dl-string.h | 17 | ||||
| -rw-r--r-- | ldso/include/dl-syscall.h | 2 |
2 files changed, 11 insertions, 8 deletions
diff --git a/ldso/include/dl-string.h b/ldso/include/dl-string.h index cbb867010..05f8d7d32 100644 --- a/ldso/include/dl-string.h +++ b/ldso/include/dl-string.h @@ -204,15 +204,18 @@ static inline char *_dl_get_last_path_component(char *path) } /* Early on, we can't call printf, so use this to print out - * numbers using the SEND_STDERR() macro */ + * numbers using the SEND_STDERR() macro. Avoid using mod + * or using long division */ static inline char *_dl_simple_ltoa(char * local, unsigned long i) { /* 21 digits plus null terminator, good for 64-bit or smaller ints */ - char *p = &local[22]; + char *p = &local[21]; *p-- = '\0'; do { - *p-- = '0' + i % 10; - i /= 10; + char temp; + do_rem(temp, i, 10); + *p-- = '0' + temp; + i /= 10; } while (i > 0); return p + 1; } @@ -220,15 +223,15 @@ static inline char *_dl_simple_ltoa(char * local, unsigned long i) static inline char *_dl_simple_ltoahex(char * local, unsigned long i) { /* 21 digits plus null terminator, good for 64-bit or smaller ints */ - char *p = &local[22]; + char *p = &local[21]; *p-- = '\0'; do { - char temp = i % 0x10; + char temp = i & 0xf; if (temp <= 0x09) *p-- = '0' + temp; else *p-- = 'a' - 0x0a + temp; - i /= 0x10; + i >>= 4; } while (i > 0); *p-- = 'x'; *p-- = '0'; diff --git a/ldso/include/dl-syscall.h b/ldso/include/dl-syscall.h index 184c12fb1..fbe852d18 100644 --- a/ldso/include/dl-syscall.h +++ b/ldso/include/dl-syscall.h @@ -104,7 +104,7 @@ static inline _syscall0(gid_t, _dl_getpid); static inline _syscall3(int, _dl_readlink, const char *, path, char *, buf, size_t, bufsiz); #ifdef __NR_mmap -#if defined(__powerpc__) || defined(__mips__) || defined(__sh__) +#if defined(__powerpc__) || defined(__mips__) || defined(__sh__) || defined(__sparc__) /* PowerPC, MIPS and SuperH have a different calling convention for mmap(). */ #define __NR__dl_mmap __NR_mmap static inline _syscall6(void *, _dl_mmap, void *, start, size_t, length, |