diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/alpha/Makefile | 2 | ||||
| -rw-r--r-- | sysdeps/posix/getcwd.c | 29 | ||||
| -rw-r--r-- | sysdeps/posix/libc_fatal.c | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/gethostid.c | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/syscalls.list | 2 |
5 files changed, 12 insertions, 23 deletions
diff --git a/sysdeps/alpha/Makefile b/sysdeps/alpha/Makefile index a9f12d1396..6aaedea6fb 100644 --- a/sysdeps/alpha/Makefile +++ b/sysdeps/alpha/Makefile @@ -30,7 +30,9 @@ endif # gnulib ifeq ($(subdir),elf) # The ld.so code cannot use literals until it self-relocates. + ifeq ($(elf),yes) CFLAGS-rtld.c = -mbuild-constants + endif # The rest of ld.so shouldn't use FP regs for block moves so # that the lazy link trampoline doesn't have to save them. sysdep-CFLAGS += -mno-fp-regs diff --git a/sysdeps/posix/getcwd.c b/sysdeps/posix/getcwd.c index 05f626f869..af858a2643 100644 --- a/sysdeps/posix/getcwd.c +++ b/sysdeps/posix/getcwd.c @@ -180,15 +180,18 @@ extern char *alloca (); #define __lstat stat #endif -/* Get the canonical absolute name of the named directory, and put it in SIZE +#ifndef _LIBC +#define __getcwd getcwd +#endif + +/* Get the pathname of the current working directory, and put it in SIZE bytes of BUF. Returns NULL if the directory couldn't be determined or SIZE was too small. If successful, returns BUF. In GNU, if BUF is NULL, an array is allocated with `malloc'; the array is SIZE bytes long, unless SIZE <= 0, in which case it is as big as necessary. */ char * -__canonicalize_directory_name_internal (thisdir, buf, size) - const char *thisdir; +__getcwd (buf, size) char *buf; size_t size; { @@ -227,7 +230,7 @@ __canonicalize_directory_name_internal (thisdir, buf, size) pathp = path + size; *--pathp = '\0'; - if (__lstat (thisdir, &st) < 0) + if (__lstat (".", &st) < 0) return NULL; thisdev = st.st_dev; thisino = st.st_ino; @@ -366,24 +369,6 @@ __canonicalize_directory_name_internal (thisdir, buf, size) free ((__ptr_t) dotlist); return NULL; } - -/* Get the pathname of the current working directory, and put it in SIZE - bytes of BUF. Returns NULL if the directory couldn't be determined or - SIZE was too small. If successful, returns BUF. In GNU, if BUF is - NULL, an array is allocated with `malloc'; the array is SIZE bytes long, - unless SIZE <= 0, in which case it is as big as necessary. */ - -#ifndef _LIBC -#define __getcwd getcwd -#endif - -char * -__getcwd (buf, size) - char *buf; - size_t size; -{ - return __canonicalize_directory_name_internal (".", buf, size); -} #ifdef _LIBC weak_alias (__getcwd, getcwd) diff --git a/sysdeps/posix/libc_fatal.c b/sysdeps/posix/libc_fatal.c index 5539516733..22f6c4cd43 100644 --- a/sysdeps/posix/libc_fatal.c +++ b/sysdeps/posix/libc_fatal.c @@ -21,6 +21,7 @@ Cambridge, MA 02139, USA. */ #include <unistd.h> #include <errno.h> #include <sysdep.h> +#include <string.h> #ifdef FATAL_PREPARE_INCLUDE #include FATAL_PREPARE_INCLUDE diff --git a/sysdeps/unix/sysv/linux/gethostid.c b/sysdeps/unix/sysv/linux/gethostid.c index 5fd25ba2e7..2883441c5b 100644 --- a/sysdeps/unix/sysv/linux/gethostid.c +++ b/sysdeps/unix/sysv/linux/gethostid.c @@ -49,6 +49,7 @@ sethostid (id) } #else +# include <string.h> # include <sys/param.h> # include <resolv/netdb.h> # include <netinet/in.h> diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list index e57acc8161..317dec23fe 100644 --- a/sysdeps/unix/sysv/linux/syscalls.list +++ b/sysdeps/unix/sysv/linux/syscalls.list @@ -49,7 +49,7 @@ sigprocmask - sigprocmask 3 __sigprocmask sigprocmask s_sysctl sysctl _sysctl 1 __syscall__sysctl sysinfo - sysinfo 1 sysinfo swapon - swapon 2 swapon -ksyslog_ctl - syslog 3 ksyslog_ctl +klogctl - syslog 3 klogctl umount - umount 1 __umount umount uselib - uselib 1 uselib wait4 - wait4 4 __wait4 wait4 |