diff options
Diffstat (limited to 'libc/sysdeps/unix/sysv/linux')
14 files changed, 21 insertions, 37 deletions
diff --git a/libc/sysdeps/unix/sysv/linux/epoll_pwait.c b/libc/sysdeps/unix/sysv/linux/epoll_pwait.c index 70756e844..7bea455b4 100644 --- a/libc/sysdeps/unix/sysv/linux/epoll_pwait.c +++ b/libc/sysdeps/unix/sysv/linux/epoll_pwait.c @@ -64,7 +64,6 @@ int epoll_pwait (int epfd, struct epoll_event *events, } stub_warning (epoll_pwait) -# include <stub-tag.h> #endif libc_hidden_def (epoll_pwait) diff --git a/libc/sysdeps/unix/sysv/linux/futimens.c b/libc/sysdeps/unix/sysv/linux/futimens.c index f586b80f3..c4469fc93 100644 --- a/libc/sysdeps/unix/sysv/linux/futimens.c +++ b/libc/sysdeps/unix/sysv/linux/futimens.c @@ -45,5 +45,4 @@ futimens (int fd, const struct timespec tsp[2]) } #ifndef __NR_utimensat stub_warning (futimens) -# include <stub-tag.h> #endif diff --git a/libc/sysdeps/unix/sysv/linux/lutimes.c b/libc/sysdeps/unix/sysv/linux/lutimes.c index c26623262..7e05a72a2 100644 --- a/libc/sysdeps/unix/sysv/linux/lutimes.c +++ b/libc/sysdeps/unix/sysv/linux/lutimes.c @@ -54,5 +54,4 @@ lutimes (const char *file, const struct timeval tvp[2]) #ifndef __NR_utimensat stub_warning (lutimes) -# include <stub-tag.h> #endif diff --git a/libc/sysdeps/unix/sysv/linux/paths.h b/libc/sysdeps/unix/sysv/linux/paths.h index f4860f24d..1342ab3a9 100644 --- a/libc/sysdeps/unix/sysv/linux/paths.h +++ b/libc/sysdeps/unix/sysv/linux/paths.h @@ -61,9 +61,9 @@ #define _PATH_SHELLS "/etc/shells" #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" -#define _PATH_UTMP "/var/run/utmp" +#define _PATH_UTMP "/var/run/utmp" #define _PATH_VI "/usr/bin/vi" -#define _PATH_WTMP "/var/log/wtmp" +#define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ #define _PATH_DEV "/dev/" diff --git a/libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libc.abilist b/libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libc.abilist index a3cd89540..8e4595825 100644 --- a/libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libc.abilist +++ b/libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libc.abilist @@ -1774,13 +1774,13 @@ GLIBC_2.16 timespec_get F GLIBC_2.17 GLIBC_2.17 A + __ppc_get_timebase_freq F clock_getcpuclockid F clock_getres F clock_gettime F clock_nanosleep F clock_settime F secure_getenv F - __ppc_get_timebase_freq F GLIBC_2.2 GLIBC_2.2 A _IO_adjust_wcolumn F diff --git a/libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S b/libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S index ded2a35e0..0939a6539 100644 --- a/libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S +++ b/libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S @@ -134,26 +134,26 @@ L(noparms): 'makecontext' call. If the pointer is NULL the process must terminate. */ L(exitcode): - /* Recover the ucontext and TOC from the dummy frame. */ - ld r1,FRAME_BACKCHAIN(r1) /* Unstack the parameter save area frame. */ - ld r3,FRAME_PARM1_SAVE(r1) - ld r2,FRAME_TOC_SAVE(r1) - ld r3,UCONTEXT_LINK(r3) /* Load the resume context. */ - cmpdi r3,0 - beq L(BADSTATUS) + /* Recover the ucontext and TOC from the dummy frame. */ + ld r1,FRAME_BACKCHAIN(r1) /* Unstack the parameter save area frame. */ + ld r3,FRAME_PARM1_SAVE(r1) + ld r2,FRAME_TOC_SAVE(r1) + ld r3,UCONTEXT_LINK(r3) /* Load the resume context. */ + cmpdi r3,0 + beq L(do_exit) bl JUMPTARGET(__setcontext) nop - -L(BADSTATUS): -/* If setcontext returns (which can happen if the syscall fails) we will - exit the program with error status (-1). */ - li r3,-1 + /* If setcontext returns (which can happen if the syscall fails) we will + exit the program with error status (-1). */ + li r3,-1 +L(do_exit): #ifdef SHARED - b JUMPTARGET(__GI_exit); + b JUMPTARGET(__GI_exit); #else - b JUMPTARGET(exit); - nop + b JUMPTARGET(exit); + nop #endif + b L(do_exit) /* The address of the exit code is in the link register. Store the lr in the ucontext as LNK so the target function will return to our diff --git a/libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libc.abilist b/libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libc.abilist index 0a80d0c57..8eaaccdfc 100644 --- a/libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libc.abilist +++ b/libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libc.abilist @@ -80,13 +80,13 @@ GLIBC_2.16 timespec_get F GLIBC_2.17 GLIBC_2.17 A + __ppc_get_timebase_freq F clock_getcpuclockid F clock_getres F clock_gettime F clock_nanosleep F clock_settime F secure_getenv F - __ppc_get_timebase_freq F GLIBC_2.3 GLIBC_2.3 A _Exit F diff --git a/libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/sync_file_range.c b/libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/sync_file_range.c index f17a4949f..f4a49c5c4 100644 --- a/libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/sync_file_range.c +++ b/libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/sync_file_range.c @@ -48,6 +48,4 @@ sync_file_range (int fd, __off64_t from, __off64_t to, unsigned int flags) return -1; } stub_warning (sync_file_range) - -# include <stub-tag.h> #endif diff --git a/libc/sysdeps/unix/sysv/linux/readahead.c b/libc/sysdeps/unix/sysv/linux/readahead.c index e7d0c110e..439936741 100644 --- a/libc/sysdeps/unix/sysv/linux/readahead.c +++ b/libc/sysdeps/unix/sysv/linux/readahead.c @@ -42,8 +42,6 @@ __readahead (int fd, off64_t offset, size_t count) return -1; } stub_warning (readahead) - -# include <stub-tag.h> #endif weak_alias (__readahead, readahead) diff --git a/libc/sysdeps/unix/sysv/linux/s390/bits/fcntl.h b/libc/sysdeps/unix/sysv/linux/s390/bits/fcntl.h index 43eee7a37..5b95878cc 100644 --- a/libc/sysdeps/unix/sysv/linux/s390/bits/fcntl.h +++ b/libc/sysdeps/unix/sysv/linux/s390/bits/fcntl.h @@ -25,8 +25,6 @@ #if __WORDSIZE == 64 /* Not necessary, files are always with 64bit off_t. */ # define __O_LARGEFILE 0 -#else -# define __O_LARGEFILE 0100000 #endif #if __WORDSIZE == 64 diff --git a/libc/sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c b/libc/sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c index 67ff77fa8..cb31e5ca2 100644 --- a/libc/sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c +++ b/libc/sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c @@ -91,11 +91,9 @@ __get_clockfreq_via_proc_openprom (void) { unsigned long int buf[4096 / sizeof (unsigned long int)]; struct dirent *dirp = (struct dirent *) buf; - off_t dbase = (off_t) 0; ssize_t len; - while ((len = __getdirentries (obp_fd, (char *) dirp, - sizeof (buf), &dbase)) > 0) + while ((len = __getdents (obp_fd, (char *) dirp, sizeof (buf))) > 0) { struct dirent *this_dirp = dirp; @@ -131,7 +129,7 @@ __get_clockfreq_via_proc_openprom (void) if (read (clkfreq_fd, type_string, sizeof (type_string)) > 0) result = (hp_timing_t) - strtoull (type_string, NULL, 16); + strtoumax (type_string, NULL, 16); close (clkfreq_fd); } } diff --git a/libc/sysdeps/unix/sysv/linux/sync_file_range.c b/libc/sysdeps/unix/sysv/linux/sync_file_range.c index a7785298b..551e900da 100644 --- a/libc/sysdeps/unix/sysv/linux/sync_file_range.c +++ b/libc/sysdeps/unix/sysv/linux/sync_file_range.c @@ -74,6 +74,4 @@ sync_file_range (int fd, __off64_t from, __off64_t to, unsigned int flags) return -1; } stub_warning (sync_file_range) - -# include <stub-tag.h> #endif diff --git a/libc/sysdeps/unix/sysv/linux/utimensat.c b/libc/sysdeps/unix/sysv/linux/utimensat.c index f52e615dd..fc1d362ce 100644 --- a/libc/sysdeps/unix/sysv/linux/utimensat.c +++ b/libc/sysdeps/unix/sysv/linux/utimensat.c @@ -45,5 +45,4 @@ utimensat (int fd, const char *file, const struct timespec tsp[2], } #ifndef __NR_utimensat stub_warning (utimensat) -# include <stub-tag.h> #endif diff --git a/libc/sysdeps/unix/sysv/linux/x86/bits/fcntl.h b/libc/sysdeps/unix/sysv/linux/x86/bits/fcntl.h index 9251e750e..2bcded5bf 100644 --- a/libc/sysdeps/unix/sysv/linux/x86/bits/fcntl.h +++ b/libc/sysdeps/unix/sysv/linux/x86/bits/fcntl.h @@ -22,8 +22,6 @@ #ifdef __x86_64__ # define __O_LARGEFILE 0 -#else -# define __O_LARGEFILE 0100000 #endif #ifdef __x86_64__ |