diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/i386/i486/bits/string.h | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/readdir.c | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/syscalls.list | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/configure | 11 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/configure.in | 11 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/Makefile | 5 |
6 files changed, 33 insertions, 1 deletions
diff --git a/sysdeps/i386/i486/bits/string.h b/sysdeps/i386/i486/bits/string.h index 6690066d94..60148b7da5 100644 --- a/sysdeps/i386/i486/bits/string.h +++ b/sysdeps/i386/i486/bits/string.h @@ -235,7 +235,7 @@ __memset_cc_by2 (void *__s, int __c, size_t __n) "jnz 1b\n" "2:\n\t" "movw %w2,(%0)" - : "=&r" (__tmp), "=&r" (__dummy) + : "=&r" (__tmp), "=&r" (__d0) : "q" (0x01010101UL * (unsigned char) __c), "0" (__tmp), "1" (__n / 2) : "memory", "cc"); return __s; @@ -1516,6 +1516,7 @@ __strstr_g (__const char *__haystack, __const char *__needle) __STRING_INLINE char * __strstr_g (__const char *__haystack, __const char *__needle) { + register unsigned long int __d0, __d1, __d2, __d3; register char *__res; __asm__ __volatile__ ("cld\n\t" diff --git a/sysdeps/unix/sysv/linux/alpha/readdir.c b/sysdeps/unix/sysv/linux/alpha/readdir.c index 96a6a76945..300ebb2629 100644 --- a/sysdeps/unix/sysv/linux/alpha/readdir.c +++ b/sysdeps/unix/sysv/linux/alpha/readdir.c @@ -1,4 +1,7 @@ #define readdir64 __no_readdir64_decl +#define __readdir64 __no___readdir64_decl #include <sysdeps/unix/readdir.c> +#undef __readdir64 +strong_alias (__readdir, __readdir64) #undef readdir64 weak_alias (__readdir, readdir64) diff --git a/sysdeps/unix/sysv/linux/alpha/syscalls.list b/sysdeps/unix/sysv/linux/alpha/syscalls.list index 8b593a0162..ea3c9452d2 100644 --- a/sysdeps/unix/sysv/linux/alpha/syscalls.list +++ b/sysdeps/unix/sysv/linux/alpha/syscalls.list @@ -51,6 +51,7 @@ sendmsg - sendmsg 3 __libc_sendmsg __sendmsg sendmsg sendto - sendto 6 __libc_sendto __sendto sendto setsockopt - setsockopt 5 __setsockopt setsockopt shutdown - shutdown 2 __shutdown shutdown +socket - socket 3 __socket socket socketpair - socketpair 4 __socketpair socketpair sysctl - _sysctl 6 sysctl diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure index 79dbf16912..dfee18f4eb 100644 --- a/sysdeps/unix/sysv/linux/configure +++ b/sysdeps/unix/sysv/linux/configure @@ -98,3 +98,14 @@ fi if test -f $srcdir/elf/ldconfig.c; then has_ldconfig=yes fi + +# We need some extensions to the `ldd' script. + +case "$machine" in + i[3456]86* | m68k | sparc/sparc32) + ldd_rewrite_script=../sysdeps/unix/sysv/linux/ldd-rewrite.sed + ;; + *) + ;; +esac + diff --git a/sysdeps/unix/sysv/linux/configure.in b/sysdeps/unix/sysv/linux/configure.in index 18bb6dc469..fc332876bb 100644 --- a/sysdeps/unix/sysv/linux/configure.in +++ b/sysdeps/unix/sysv/linux/configure.in @@ -83,3 +83,14 @@ fi if test -f $srcdir/elf/ldconfig.c; then has_ldconfig=yes fi + +# We need some extensions to the `ldd' script. +changequote(,) +case "$machine" in + i[3456]86* | m68k | sparc/sparc32) + ldd_rewrite_script=../sysdeps/unix/sysv/linux/ldd-rewrite.sed + ;; + *) + ;; +esac +changequote([,]) diff --git a/sysdeps/unix/sysv/linux/i386/Makefile b/sysdeps/unix/sysv/linux/i386/Makefile index 2ecedd4b15..d54c4cadbc 100644 --- a/sysdeps/unix/sysv/linux/i386/Makefile +++ b/sysdeps/unix/sysv/linux/i386/Makefile @@ -2,3 +2,8 @@ ifeq ($(subdir),misc) sysdep_routines += ioperm iopl vm86 sysdep_headers += sys/perm.h sys/vm86.h endif + +ifeq ($(subdir),elf) +others += lddlibc4 +install-bin += lddlibc4 +endif |