From 5556231db2301917cd14a7450de4eba2368c9763 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Wed, 5 Jun 2013 20:26:40 +0000 Subject: Remove trailing whitespace in ports. --- ports/sysdeps/unix/alpha/sysdep.S | 2 +- ports/sysdeps/unix/mips/sysdep.S | 4 +-- .../unix/sysv/linux/alpha/kernel-features.h | 2 +- ports/sysdeps/unix/sysv/linux/alpha/kernel_stat.h | 2 +- .../unix/sysv/linux/alpha/nptl/lowlevellock.h | 2 +- .../sysdeps/unix/sysv/linux/alpha/register-dump.h | 12 ++++---- ports/sysdeps/unix/sysv/linux/alpha/syscall.S | 2 +- ports/sysdeps/unix/sysv/linux/arm/mmap.S | 2 +- .../unix/sysv/linux/arm/nptl/lowlevellock.h | 2 +- ports/sysdeps/unix/sysv/linux/arm/swapcontext.S | 2 +- .../sysv/linux/generic/wordsize-32/syscalls.list | 4 +-- ports/sysdeps/unix/sysv/linux/hppa/bits/atomic.h | 6 ++-- ports/sysdeps/unix/sysv/linux/hppa/clone.S | 34 +++++++++++----------- ports/sysdeps/unix/sysv/linux/hppa/internaltypes.h | 4 +-- ports/sysdeps/unix/sysv/linux/hppa/makecontext.c | 14 ++++----- ports/sysdeps/unix/sysv/linux/hppa/mmap.c | 2 +- .../unix/sysv/linux/hppa/nptl/bits/pthreadtypes.h | 12 ++++---- .../unix/sysv/linux/hppa/nptl/lowlevellock.h | 4 +-- ports/sysdeps/unix/sysv/linux/hppa/nptl/pt-vfork.S | 4 +-- ports/sysdeps/unix/sysv/linux/hppa/nptl/pthreadP.h | 2 +- .../unix/sysv/linux/hppa/nptl/sysdep-cancel.h | 14 ++++----- ports/sysdeps/unix/sysv/linux/hppa/setcontext.S | 4 +-- ports/sysdeps/unix/sysv/linux/hppa/syscalls.list | 6 ++-- ports/sysdeps/unix/sysv/linux/hppa/sysdep.c | 6 ++-- ports/sysdeps/unix/sysv/linux/m68k/socket.S | 2 +- ports/sysdeps/unix/sysv/linux/mips/dl-static.c | 2 +- .../unix/sysv/linux/mips/nptl/lowlevellock.h | 2 +- .../linux/powerpc/powerpc32/nofpu/getcontext.S | 2 +- .../linux/powerpc/powerpc32/nofpu/setcontext.S | 2 +- .../linux/powerpc/powerpc32/nofpu/swapcontext.S | 2 +- ports/sysdeps/unix/sysv/linux/tile/nptl/clone.S | 10 +++---- ports/sysdeps/unix/sysv/linux/tile/setcontext.S | 2 +- ports/sysdeps/unix/sysv/linux/tile/swapcontext.S | 2 +- 33 files changed, 87 insertions(+), 87 deletions(-) (limited to 'ports/sysdeps/unix') diff --git a/ports/sysdeps/unix/alpha/sysdep.S b/ports/sysdeps/unix/alpha/sysdep.S index efd87fb..cc5846d 100644 --- a/ports/sysdeps/unix/alpha/sysdep.S +++ b/ports/sysdeps/unix/alpha/sysdep.S @@ -21,7 +21,7 @@ #if defined(PIC) /* Put this at the end of libc's text segment so that all of - the direct branches from the syscalls are forward, and + the direct branches from the syscalls are forward, and thus predicted not taken. */ .section .text.last, "ax", @progbits #else diff --git a/ports/sysdeps/unix/mips/sysdep.S b/ports/sysdeps/unix/mips/sysdep.S index e27aada..f033638 100644 --- a/ports/sysdeps/unix/mips/sysdep.S +++ b/ports/sysdeps/unix/mips/sysdep.S @@ -30,7 +30,7 @@ FRAMESZ= (((NARGSAVE+LOCALSZ)*SZREG)+ALSZ)&ALMASK RAOFF= FRAMESZ-(1*SZREG) GPOFF= FRAMESZ-(2*SZREG) V0OFF= FRAMESZ-(3*SZREG) - + ENTRY(__syscall_error) #ifdef __PIC__ .set noat @@ -79,7 +79,7 @@ ENTRY(__syscall_error) SETUP_GPX (AT) #endif SETUP_GPX64 (t9, AT) - + #if defined (EWOULDBLOCK_sys) && EWOULDBLOCK_sys != EAGAIN /* We translate the system's EWOULDBLOCK error into EAGAIN. The GNU C library always defines EWOULDBLOCK==EAGAIN. diff --git a/ports/sysdeps/unix/sysv/linux/alpha/kernel-features.h b/ports/sysdeps/unix/sysv/linux/alpha/kernel-features.h index 45ed2e8..1c6bedd 100644 --- a/ports/sysdeps/unix/sysv/linux/alpha/kernel-features.h +++ b/ports/sysdeps/unix/sysv/linux/alpha/kernel-features.h @@ -34,7 +34,7 @@ # define __ASSUME_IN_NONBLOCK 1 #endif -/* Support for the pipe2, eventfd2, signalfd4 syscalls was added for alpha +/* Support for the pipe2, eventfd2, signalfd4 syscalls was added for alpha after 2.6.33-rc1. */ #if __LINUX_KERNEL_VERSION >= 0x020621 # define __ASSUME_PIPE2 1 diff --git a/ports/sysdeps/unix/sysv/linux/alpha/kernel_stat.h b/ports/sysdeps/unix/sysv/linux/alpha/kernel_stat.h index a1d012a..94d358e 100644 --- a/ports/sysdeps/unix/sysv/linux/alpha/kernel_stat.h +++ b/ports/sysdeps/unix/sysv/linux/alpha/kernel_stat.h @@ -35,7 +35,7 @@ struct kernel_stat64 unsigned int __pad0; unsigned long st_atime; - unsigned long st_atimensec; + unsigned long st_atimensec; unsigned long st_mtime; unsigned long st_mtimensec; unsigned long st_ctime; diff --git a/ports/sysdeps/unix/sysv/linux/alpha/nptl/lowlevellock.h b/ports/sysdeps/unix/sysv/linux/alpha/nptl/lowlevellock.h index cf6b8bf..567f8ab 100644 --- a/ports/sysdeps/unix/sysv/linux/alpha/nptl/lowlevellock.h +++ b/ports/sysdeps/unix/sysv/linux/alpha/nptl/lowlevellock.h @@ -73,7 +73,7 @@ : (fl)) \ : ((fl) | (((private) ^ FUTEX_PRIVATE_FLAG) \ & THREAD_GETMEM (THREAD_SELF, header.private_futex)))) -# endif +# endif #endif diff --git a/ports/sysdeps/unix/sysv/linux/alpha/register-dump.h b/ports/sysdeps/unix/sysv/linux/alpha/register-dump.h index adc7d67..216f547 100644 --- a/ports/sysdeps/unix/sysv/linux/alpha/register-dump.h +++ b/ports/sysdeps/unix/sysv/linux/alpha/register-dump.h @@ -32,7 +32,7 @@ T10: XXXXXXXXXXXXXXXX T11: XXXXXXXXXXXXXXXX RA: XXXXXXXXXXXXXXXX T12: XXXXXXXXXXXXXXXX AT: XXXXXXXXXXXXXXXX GP: XXXXXXXXXXXXXXXX SP: XXXXXXXXXXXXXXXX PC: XXXXXXXXXXXXXXXX - + FP0: XXXXXXXXXXXXXXXX FP1: XXXXXXXXXXXXXXXX FP2: XXXXXXXXXXXXXXXX FP3: XXXXXXXXXXXXXXXX FP4: XXXXXXXXXXXXXXXX FP5: XXXXXXXXXXXXXXXX FP6: XXXXXXXXXXXXXXXX FP7: XXXXXXXXXXXXXXXX FP8: XXXXXXXXXXXXXXXX @@ -44,13 +44,13 @@ FP24: XXXXXXXXXXXXXXXX FP25: XXXXXXXXXXXXXXXX FP26: XXXXXXXXXXXXXXXX FP27: XXXXXXXXXXXXXXXX FP28: XXXXXXXXXXXXXXXX FP29: XXXXXXXXXXXXXXXX FP30: XXXXXXXXXXXXXXXX FPCR: XXXXXXXXXXXXXXXX - + TA0: XXXXXXXXXXXXXXXX TA1: XXXXXXXXXXXXXXXX TA2: XXXXXXXXXXXXXXXX */ #define NREGS (32+32+3) -static const char __attribute__((aligned(8))) regnames[NREGS][8] = +static const char __attribute__((aligned(8))) regnames[NREGS][8] = { " V0: ", " T0: ", " T1: ", " T2: ", " T3: ", " T4: ", @@ -81,7 +81,7 @@ static const char __attribute__((aligned(8))) regnames[NREGS][8] = #define O(FIELD, LF) offsetof(struct sigcontext, FIELD) + LF -static const int offsets[NREGS] = +static const int offsets[NREGS] = { O(sc_regs[0], 0), O(sc_regs[1], 0), O(sc_regs[2], 1), O(sc_regs[3], 0), O(sc_regs[4], 0), O(sc_regs[5], 1), @@ -118,7 +118,7 @@ register_dump (int fd, struct sigcontext *ctx) char buf[NREGS*(8+16) + 25 + 80]; char *p = buf; size_t i; - + p = stpcpy (p, "Register dump:\n\n"); for (i = 0; i < NREGS; ++i) @@ -126,7 +126,7 @@ register_dump (int fd, struct sigcontext *ctx) int this_offset, this_lf; unsigned long val; signed long j; - + this_offset = offsets[i]; this_lf = this_offset & 7; diff --git a/ports/sysdeps/unix/sysv/linux/alpha/syscall.S b/ports/sysdeps/unix/sysv/linux/alpha/syscall.S index bfb1205..f4161fe 100644 --- a/ports/sysdeps/unix/sysv/linux/alpha/syscall.S +++ b/ports/sysdeps/unix/sysv/linux/alpha/syscall.S @@ -20,7 +20,7 @@ /* * This is for COMPATIBILITY with Linux/x86 only. Linux/Alpha system - * calls return an error indication in a3. This allows arbitrary 64bit + * calls return an error indication in a3. This allows arbitrary 64bit * values to be returned in v0 (because negative values are not * mistaken as error numbers). However, C allows only one value to * be returned, so the interface below folds the error indication passed in diff --git a/ports/sysdeps/unix/sysv/linux/arm/mmap.S b/ports/sysdeps/unix/sysv/linux/arm/mmap.S index 06b737e..9fb1931 100644 --- a/ports/sysdeps/unix/sysv/linux/arm/mmap.S +++ b/ports/sysdeps/unix/sysv/linux/arm/mmap.S @@ -37,7 +37,7 @@ ENTRY (__mmap) movs ip, r5, lsl #20 bne .Linval mov r5, r5, lsr #12 - + /* do the syscall */ DO_CALL (mmap2, 0) diff --git a/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h b/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h index fe21cda..a29593a 100644 --- a/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h +++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h @@ -71,7 +71,7 @@ : (fl)) \ : ((fl) | (((private) ^ FUTEX_PRIVATE_FLAG) \ & THREAD_GETMEM (THREAD_SELF, header.private_futex)))) -# endif +# endif #endif diff --git a/ports/sysdeps/unix/sysv/linux/arm/swapcontext.S b/ports/sysdeps/unix/sysv/linux/arm/swapcontext.S index db85623..8a968eb 100644 --- a/ports/sysdeps/unix/sysv/linux/arm/swapcontext.S +++ b/ports/sysdeps/unix/sysv/linux/arm/swapcontext.S @@ -50,7 +50,7 @@ ENTRY(swapcontext) itt ne movne r0, r4 RETINSTR(ne, r14) - + /* Fix up LR and the PC. */ str r13,[r0, #MCONTEXT_ARM_SP] str r14,[r0, #MCONTEXT_ARM_LR] diff --git a/ports/sysdeps/unix/sysv/linux/generic/wordsize-32/syscalls.list b/ports/sysdeps/unix/sysv/linux/generic/wordsize-32/syscalls.list index 58b4057..f055c68 100644 --- a/ports/sysdeps/unix/sysv/linux/generic/wordsize-32/syscalls.list +++ b/ports/sysdeps/unix/sysv/linux/generic/wordsize-32/syscalls.list @@ -1,7 +1,7 @@ # File name Caller Syscall name # args Strong name Weak names # rlimit APIs -getrlimit - getrlimit i:ip __getrlimit getrlimit -setrlimit - setrlimit i:ip __setrlimit setrlimit +getrlimit - getrlimit i:ip __getrlimit getrlimit +setrlimit - setrlimit i:ip __setrlimit setrlimit prlimit64 EXTRA prlimit64 i:iipp prlimit64 fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark diff --git a/ports/sysdeps/unix/sysv/linux/hppa/bits/atomic.h b/ports/sysdeps/unix/sysv/linux/hppa/bits/atomic.h index bcead73..a92e8ac 100644 --- a/ports/sysdeps/unix/sysv/linux/hppa/bits/atomic.h +++ b/ports/sysdeps/unix/sysv/linux/hppa/bits/atomic.h @@ -49,13 +49,13 @@ typedef uintmax_t uatomic_max_t; *addr = new; return prev; */ -/* Use the kernel atomic light weight syscalls on hppa. */ +/* Use the kernel atomic light weight syscalls on hppa. */ #define _LWS "0xb0" #define _LWS_CAS "0" /* Note r31 is the link register. */ #define _LWS_CLOBBER "r1", "r26", "r25", "r24", "r23", "r22", "r21", "r20", "r28", "r31", "memory" /* String constant for -EAGAIN. */ -#define _ASM_EAGAIN "-11" +#define _ASM_EAGAIN "-11" /* String constant for -EDEADLOCK. */ #define _ASM_EDEADLOCK "-45" @@ -100,7 +100,7 @@ typedef uintmax_t uatomic_max_t; }) #else # error __ASSUME_LWS_CAS is required to build glibc. -#endif +#endif /* __ASSUME_LWS_CAS */ #endif diff --git a/ports/sysdeps/unix/sysv/linux/hppa/clone.S b/ports/sysdeps/unix/sysv/linux/hppa/clone.S index fbb3f70..0d7a7eb 100644 --- a/ports/sysdeps/unix/sysv/linux/hppa/clone.S +++ b/ports/sysdeps/unix/sysv/linux/hppa/clone.S @@ -26,23 +26,23 @@ #include /* Non-thread code calls __clone with the following parameters: - int clone(int (*fn)(void *arg), - void *child_stack, - int flags, + int clone(int (*fn)(void *arg), + void *child_stack, + int flags, void *arg) - + NPTL Code will call __clone with the following parameters: - int clone(int (*fn)(void *arg), - void *child_stack, - int flags, + int clone(int (*fn)(void *arg), + void *child_stack, + int flags, void *arg, - int *parent_tidptr, - struct user_desc *newtls, + int *parent_tidptr, + struct user_desc *newtls, int *child_pidptr) - + The code should not mangle the extra input registers. Syscall expects: Input to __clone: - 4(r25) - function pointer (r26, arg0) + 4(r25) - function pointer (r26, arg0) 0(r25) - argument (r23, arg3) r26 - clone flags. (r24, arg2) r25+64 - user stack pointer. (r25, arg1) @@ -53,9 +53,9 @@ Return: - On success the thread ID of the child process is returend in + On success the thread ID of the child process is returend in the callers context. - On error return -1, and set errno to the value returned by + On error return -1, and set errno to the value returned by the syscall. */ @@ -100,13 +100,13 @@ ENTRY(__clone) /* Restore the PIC register. */ #ifdef PIC - copy %r4, %r19 /* parent */ + copy %r4, %r19 /* parent */ #endif comib,=,n 0, %ret0, .LthreadStart /* Successful return from the parent - No need to restore the PIC register, + No need to restore the PIC register, since we return immediately. */ ldw -84(%sp), %rp @@ -134,14 +134,14 @@ ENTRY(__clone) #ifdef RESET_PID # define CLONE_VM_BIT 23 /* 0x00000100 */ # define CLONE_THREAD_BIT 15 /* 0x00010000 */ - /* Load original clone flags. + /* Load original clone flags. If CLONE_THREAD was passed, don't reset the PID/TID. If CLONE_VM was passed, we need to store -1 to PID/TID. If CLONE_VM and CLONE_THREAD were not set store the result of getpid to PID/TID. */ ldw -56(%sp), %r26 bb,<,n %r26, CLONE_THREAD_BIT, 1f - bb,< %r26, CLONE_VM_BIT, 2f + bb,< %r26, CLONE_VM_BIT, 2f ldi -1, %ret0 ble 0x100(%sr2, %r0) ldi __NR_getpid, %r20 diff --git a/ports/sysdeps/unix/sysv/linux/hppa/internaltypes.h b/ports/sysdeps/unix/sysv/linux/hppa/internaltypes.h index 6eee0b3..ac827b6 100644 --- a/ports/sysdeps/unix/sysv/linux/hppa/internaltypes.h +++ b/ports/sysdeps/unix/sysv/linux/hppa/internaltypes.h @@ -1,9 +1,9 @@ #include_next -#ifndef _INTERNAL_TYPES_H_HPPA_ +#ifndef _INTERNAL_TYPES_H_HPPA_ #define _INTERNAL_TYPES_H_HPPA_ 1 #include -/* In GLIBC 2.10 HPPA switched from Linuxthreads to NPTL, and in order +/* In GLIBC 2.10 HPPA switched from Linuxthreads to NPTL, and in order to maintain ABI compatibility with pthread_cond_t, some care had to be taken. diff --git a/ports/sysdeps/unix/sysv/linux/hppa/makecontext.c b/ports/sysdeps/unix/sysv/linux/hppa/makecontext.c index c59dd83..046aad2 100644 --- a/ports/sysdeps/unix/sysv/linux/hppa/makecontext.c +++ b/ports/sysdeps/unix/sysv/linux/hppa/makecontext.c @@ -29,9 +29,9 @@ /* Stack must be 64-byte aligned at all times. */ #define STACK_ALIGN 64 /* Size of frame marker in unsigned long words. */ -#define FRAME_SIZE_UL 8 +#define FRAME_SIZE_UL 8 /* Size of frame marker in bytes. */ -#define FRAME_SIZE_BYTES (8 * sizeof(unsigned long)) +#define FRAME_SIZE_BYTES (8 * sizeof(unsigned long)) /* Size of X arguments in bytes. */ #define ARGS(x) (x * sizeof(unsigned long)) @@ -42,7 +42,7 @@ __makecontext (ucontext_t *ucp, void (*func) (void), int argc, ...) va_list ap; int i; - /* Create a 64-byte aligned frame to store args. Use ss_sp if + /* Create a 64-byte aligned frame to store args. Use ss_sp if it is available, otherwise be robust and use the currently saved stack pointer. */ if (ucp->uc_stack.ss_sp && ucp->uc_stack.ss_size) @@ -50,8 +50,8 @@ __makecontext (ucontext_t *ucp, void (*func) (void), int argc, ...) else osp = (unsigned long *)ucp->uc_mcontext.sc_gr[30]; - sp = (unsigned long *)((((unsigned long) osp) - + FRAME_SIZE_BYTES + ARGS(argc) + STACK_ALIGN) + sp = (unsigned long *)((((unsigned long) osp) + + FRAME_SIZE_BYTES + ARGS(argc) + STACK_ALIGN) & ~(STACK_ALIGN - 1)); /* Use new frame. */ @@ -89,12 +89,12 @@ __makecontext (ucontext_t *ucp, void (*func) (void), int argc, ...) /* 64bit: r19-r22 are arg7-arg4. */ ucp->uc_mcontext.sc_gr[22+4-i] = va_arg (ap, int); continue; - } + } /* All other arguments go on the stack. */ sp[-1 * (FRAME_SIZE_UL + 1 + i)] = va_arg (ap, int); } - va_end (ap); + va_end (ap); } weak_alias(__makecontext, makecontext) diff --git a/ports/sysdeps/unix/sysv/linux/hppa/mmap.c b/ports/sysdeps/unix/sysv/linux/hppa/mmap.c index 00e6d60..bb3b97f 100644 --- a/ports/sysdeps/unix/sysv/linux/hppa/mmap.c +++ b/ports/sysdeps/unix/sysv/linux/hppa/mmap.c @@ -33,7 +33,7 @@ __ptr_t __mmap (__ptr_t addr, size_t len, int prot, int flags, int fd, off_t offset) { - + __ptr_t ret; ret = (__ptr_t) INLINE_SYSCALL (mmap, 6, addr, len, prot, flags, fd, offset); diff --git a/ports/sysdeps/unix/sysv/linux/hppa/nptl/bits/pthreadtypes.h b/ports/sysdeps/unix/sysv/linux/hppa/nptl/bits/pthreadtypes.h index c0efd68..7e52c68 100644 --- a/ports/sysdeps/unix/sysv/linux/hppa/nptl/bits/pthreadtypes.h +++ b/ports/sysdeps/unix/sysv/linux/hppa/nptl/bits/pthreadtypes.h @@ -21,7 +21,7 @@ /* Linuxthread type sizes (bytes): sizeof(pthread_attr_t) = 0x24 (36) sizeof(pthread_barrier_t) = 0x30 (48) - sizeof(pthread_barrierattr_t) = 0x4 (4) + sizeof(pthread_barrierattr_t) = 0x4 (4) sizeof(pthread_cond_t) = 0x30 (48) sizeof(pthread_condattr_t) = 0x4 (4) sizeof(pthread_mutex_t) = 0x30 (48) @@ -33,9 +33,9 @@ #define __SIZEOF_PTHREAD_ATTR_T 36 #define __SIZEOF_PTHREAD_BARRIER_T 48 #define __SIZEOF_PTHREAD_BARRIERATTR_T 4 -#define __SIZEOF_PTHREAD_COND_T 48 +#define __SIZEOF_PTHREAD_COND_T 48 #define __SIZEOF_PTHREAD_CONDATTR_T 4 -#define __SIZEOF_PTHREAD_MUTEX_T 48 +#define __SIZEOF_PTHREAD_MUTEX_T 48 #define __SIZEOF_PTHREAD_MUTEXATTR_T 4 #define __SIZEOF_PTHREAD_RWLOCK_T 64 #define __SIZEOF_PTHREAD_RWLOCKATTR_T 8 @@ -74,7 +74,7 @@ typedef union binary compatibility. */ int __kind; /* The old 4-word 16-byte aligned lock. This is initalized - to all ones by the Linuxthreads PTHREAD_MUTEX_INITIALIZER. + to all ones by the Linuxthreads PTHREAD_MUTEX_INITIALIZER. Unused in NPTL. */ int __compat_padding[4]; /* In the old structure there are 4 words left due to alignment. @@ -105,7 +105,7 @@ typedef union the attribute type is not exposed on purpose. However, this structure is exposed via PTHREAD_COND_INITIALIZER, and because of this, the Linuxthreads version sets the first four ints to one. In the NPTL - version we must check, in every function using pthread_cond_t, + version we must check, in every function using pthread_cond_t, for the static Linuxthreads initializer and clear the appropriate words. */ typedef union @@ -114,7 +114,7 @@ typedef union { /* In the old Linuxthreads pthread_cond_t, this is the start of the 4-word lock structure, the next four words - are set all to 1 by the Linuxthreads + are set all to 1 by the Linuxthreads PTHREAD_COND_INITIALIZER. */ int __lock __attribute__ ((aligned(16))); /* Tracks the initialization of this structure: diff --git a/ports/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h b/ports/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h index b88703f..4cf8468 100644 --- a/ports/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h +++ b/ports/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h @@ -77,7 +77,7 @@ : (fl)) \ : ((fl) | (((private) ^ FUTEX_PRIVATE_FLAG) \ & THREAD_GETMEM (THREAD_SELF, header.private_futex)))) -# endif +# endif #endif /* Type for lock object. */ @@ -257,7 +257,7 @@ __lll_cond_lock (int *futex, int private) } #define lll_cond_lock(futex, private) __lll_cond_lock (&(futex), private) -extern int __lll_timedlock_wait (lll_lock_t *futex, const struct timespec *, +extern int __lll_timedlock_wait (lll_lock_t *futex, const struct timespec *, int private) attribute_hidden; extern int __lll_robust_timedlock_wait (int *futex, const struct timespec *, int private) attribute_hidden; diff --git a/ports/sysdeps/unix/sysv/linux/hppa/nptl/pt-vfork.S b/ports/sysdeps/unix/sysv/linux/hppa/nptl/pt-vfork.S index 1307b1a..5fa0ef5 100644 --- a/ports/sysdeps/unix/sysv/linux/hppa/nptl/pt-vfork.S +++ b/ports/sysdeps/unix/sysv/linux/hppa/nptl/pt-vfork.S @@ -49,7 +49,7 @@ /* r26, r25, r24, r23 are free since vfork has no arguments */ ENTRY(__vfork) - /* We must not create a frame. When the child unwinds to call + /* We must not create a frame. When the child unwinds to call exec it will clobber the same frame that the parent needs to unwind. */ @@ -75,7 +75,7 @@ ENTRY(__vfork) /* Return, and DO NOT restore rp. The child may have called functions that updated the frame's rp. This works because - the kernel ensures rp is preserved across the vfork + the kernel ensures rp is preserved across the vfork syscall. */ bv,n %r0(%rp) diff --git a/ports/sysdeps/unix/sysv/linux/hppa/nptl/pthreadP.h b/ports/sysdeps/unix/sysv/linux/hppa/nptl/pthreadP.h index 0e68ccf..d6d9198 100644 --- a/ports/sysdeps/unix/sysv/linux/hppa/nptl/pthreadP.h +++ b/ports/sysdeps/unix/sysv/linux/hppa/nptl/pthreadP.h @@ -1,5 +1,5 @@ #include_next -#ifndef _PTHREADP_H_HPPA_ +#ifndef _PTHREADP_H_HPPA_ #define _PTHREADP_H_HPPA_ 1 /* Internal cond functions. */ diff --git a/ports/sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h b/ports/sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h index 3c53d26..b0ba118 100644 --- a/ports/sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h +++ b/ports/sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h @@ -33,16 +33,16 @@ do arguments (read arg5 and arg6 to registers) setup frame - + check if there are threads, yes jump to pseudo_cancel - + unthreaded: syscall check syscall return (jump to pre_end) set errno set return to -1 (jump to pre_end) - + pseudo_cancel: cenable syscall @@ -50,14 +50,14 @@ check syscall return (jump to pre_end) set errno set return to -1 - + pre_end restore stack - + It is expected that 'ret' and 'END' macros will - append an 'undo arguments' and 'return' to the + append an 'undo arguments' and 'return' to the this PSEUDO macro. */ - + # undef PSEUDO # define PSEUDO(name, syscall_name, args) \ ENTRY (__##syscall_name##_nocancel) \ diff --git a/ports/sysdeps/unix/sysv/linux/hppa/setcontext.S b/ports/sysdeps/unix/sysv/linux/hppa/setcontext.S index d36ef49..2740afc 100644 --- a/ports/sysdeps/unix/sysv/linux/hppa/setcontext.S +++ b/ports/sysdeps/unix/sysv/linux/hppa/setcontext.S @@ -117,7 +117,7 @@ ENTRY(__setcontext) /* Do not load oSS_SP into %sp. The value of oSS_SP indicates the start of the user allocated stack, but not the sp that - should be used by the new context. In fact makecontext + should be used by the new context. In fact makecontext will create a frame, and adjust sp as required. We do not support calling getcontext and modifying ss_sp without a call to makecontext to synchronize ss_sp into the machine @@ -141,7 +141,7 @@ ENTRY(__setcontext) /* No further context available. Exit now. */ bl _exit, %r2 ldi -1, %r26 - + .Lerror: /* Epilogue */ diff --git a/ports/sysdeps/unix/sysv/linux/hppa/syscalls.list b/ports/sysdeps/unix/sysv/linux/hppa/syscalls.list index f3ff3e7..ae36d46 100644 --- a/ports/sysdeps/unix/sysv/linux/hppa/syscalls.list +++ b/ports/sysdeps/unix/sysv/linux/hppa/syscalls.list @@ -17,7 +17,7 @@ semctl - semctl i:iiii __semctl semctl # proper socket implementations: accept - accept Ci:iBN __libc_accept __accept accept bind - bind i:ipi __bind bind -connect - connect Ci:ipi __libc_connect __connect_internal __connect connect +connect - connect Ci:ipi __libc_connect __connect_internal __connect connect getpeername - getpeername i:ipp __getpeername getpeername getsockname - getsockname i:ipp __getsockname getsockname getsockopt - getsockopt i:iiiBN __getsockopt getsockopt @@ -33,6 +33,6 @@ shutdown - shutdown i:ii __shutdown shutdown socket - socket i:iii __socket socket socketpair - socketpair i:iiif __socketpair socketpair -setrlimit - setrlimit i:ip __setrlimit setrlimit -getrlimit - getrlimit i:ip __getrlimit getrlimit +setrlimit - setrlimit i:ip __setrlimit setrlimit +getrlimit - getrlimit i:ip __getrlimit getrlimit prlimit64 EXTRA prlimit64 i:iipp __prlimit64 prlimit64@@GLIBC_2.17 diff --git a/ports/sysdeps/unix/sysv/linux/hppa/sysdep.c b/ports/sysdeps/unix/sysv/linux/hppa/sysdep.c index 0ca5186..3bf31f2 100644 --- a/ports/sysdeps/unix/sysv/linux/hppa/sysdep.c +++ b/ports/sysdeps/unix/sysv/linux/hppa/sysdep.c @@ -37,8 +37,8 @@ __syscall_error (int err_no) INTERNAL_SYSCALL, and all the generated pure assembly syscall wrappers. How often the function is used is unknown. */ -long int -syscall (long int __sysno, ...) +long int +syscall (long int __sysno, ...) { /* FIXME: Keep this matching INLINE_SYSCALL for hppa */ va_list args; @@ -54,7 +54,7 @@ syscall (long int __sysno, ...) arg4 = va_arg (args, long int); arg5 = va_arg (args, long int); va_end (args); - + { register unsigned long int __res asm("r28"); PIC_REG_DEF diff --git a/ports/sysdeps/unix/sysv/linux/m68k/socket.S b/ports/sysdeps/unix/sysv/linux/m68k/socket.S index ce7352a..d82d30c 100644 --- a/ports/sysdeps/unix/sysv/linux/m68k/socket.S +++ b/ports/sysdeps/unix/sysv/linux/m68k/socket.S @@ -114,7 +114,7 @@ ENTRY (__socket) /* Successful; return the syscall's value. */ rts #endif - + PSEUDO_END (__socket) #ifndef NO_WEAK_ALIAS diff --git a/ports/sysdeps/unix/sysv/linux/mips/dl-static.c b/ports/sysdeps/unix/sysv/linux/mips/dl-static.c index 3ffc4b7..e0501be 100644 --- a/ports/sysdeps/unix/sysv/linux/mips/dl-static.c +++ b/ports/sysdeps/unix/sysv/linux/mips/dl-static.c @@ -68,7 +68,7 @@ _dl_static_init (struct link_map *l) loadbase = _dl_lookup_symbol_x ("_dl_var_init", l, &ref, l->l_local_scope, NULL, 0, 1, NULL); - + for (scope = l->l_local_scope; *scope != NULL; scope++) for (i = 0; i < (*scope)->r_nlist; i++) if ((*scope)->r_list[i] == loadbase) diff --git a/ports/sysdeps/unix/sysv/linux/mips/nptl/lowlevellock.h b/ports/sysdeps/unix/sysv/linux/mips/nptl/lowlevellock.h index 4f27b8b..208df8d 100644 --- a/ports/sysdeps/unix/sysv/linux/mips/nptl/lowlevellock.h +++ b/ports/sysdeps/unix/sysv/linux/mips/nptl/lowlevellock.h @@ -71,7 +71,7 @@ : (fl)) \ : ((fl) | (((private) ^ FUTEX_PRIVATE_FLAG) \ & THREAD_GETMEM (THREAD_SELF, header.private_futex)))) -# endif +# endif #endif diff --git a/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/getcontext.S b/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/getcontext.S index 04aed29..90d9dcd 100644 --- a/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/getcontext.S +++ b/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/getcontext.S @@ -34,7 +34,7 @@ versioned_symbol (libc, __getcontext, getcontext, GLIBC_2_3_4) #if SHLIB_COMPAT (libc, GLIBC_2_3_3, GLIBC_2_3_4) -/* For the nofpu case the old/new versions are the same function. */ +/* For the nofpu case the old/new versions are the same function. */ strong_alias (__getcontext, __novec_getcontext) compat_symbol (libc, __novec_getcontext, getcontext, GLIBC_2_3_3) diff --git a/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/setcontext.S b/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/setcontext.S index d5f7390..06061ea 100644 --- a/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/setcontext.S +++ b/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/setcontext.S @@ -34,7 +34,7 @@ versioned_symbol (libc, __setcontext, setcontext, GLIBC_2_3_4) #if SHLIB_COMPAT (libc, GLIBC_2_3_3, GLIBC_2_3_4) -/* For the nofpu case the old/new versions are the same function. */ +/* For the nofpu case the old/new versions are the same function. */ strong_alias (__setcontext, __novec_setcontext) compat_symbol (libc, __novec_setcontext, setcontext, GLIBC_2_3_3) diff --git a/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/swapcontext.S b/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/swapcontext.S index a87d64a..2150eec 100644 --- a/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/swapcontext.S +++ b/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/swapcontext.S @@ -34,7 +34,7 @@ versioned_symbol (libc, __swapcontext, swapcontext, GLIBC_2_3_4) #if SHLIB_COMPAT (libc, GLIBC_2_3_3, GLIBC_2_3_4) -/* For the nofpu case the old/new versions are the same function. */ +/* For the nofpu case the old/new versions are the same function. */ strong_alias (__swapcontext, __novec_swapcontext) compat_symbol (libc, __novec_swapcontext, swapcontext, GLIBC_2_3_3) diff --git a/ports/sysdeps/unix/sysv/linux/tile/nptl/clone.S b/ports/sysdeps/unix/sysv/linux/tile/nptl/clone.S index 03fe3f9..f8c821a 100644 --- a/ports/sysdeps/unix/sysv/linux/tile/nptl/clone.S +++ b/ports/sysdeps/unix/sysv/linux/tile/nptl/clone.S @@ -83,7 +83,7 @@ ENTRY (__clone) /* We need to switch the argument convention around from libc to kernel: - + libc: r0 fn r1 child_stack @@ -92,14 +92,14 @@ ENTRY (__clone) r4 ptid r5 tls r6 ctid - + kernel: r0 flags r1 child_stack [same as libc] r2 ptid r3 ctid r4 tls - + Plus the callee-saves as described at .Lthread_start, below. */ { move r32, r0 @@ -151,9 +151,9 @@ ENTRY (__clone) movei r1, EINVAL j SYSCALL_ERROR_NAME } - + /* This function expects to receive: - + sp: the top of a valid stack area r30: clone() flags r31: the argument to pass to the user function diff --git a/ports/sysdeps/unix/sysv/linux/tile/setcontext.S b/ports/sysdeps/unix/sysv/linux/tile/setcontext.S index 9db13bc..0436894 100644 --- a/ports/sysdeps/unix/sysv/linux/tile/setcontext.S +++ b/ports/sysdeps/unix/sysv/linux/tile/setcontext.S @@ -143,7 +143,7 @@ ENTRY (__setcontext) mtspr EX_CONTEXT_0_1, r12 iret jrp lr /* keep the backtracer happy */ - + .Lsigreturn: /* This is a context obtained from a signal handler. Perform a full restore by pushing the context diff --git a/ports/sysdeps/unix/sysv/linux/tile/swapcontext.S b/ports/sysdeps/unix/sysv/linux/tile/swapcontext.S index 66d6a3f..6e7dfa7 100644 --- a/ports/sysdeps/unix/sysv/linux/tile/swapcontext.S +++ b/ports/sysdeps/unix/sysv/linux/tile/swapcontext.S @@ -46,7 +46,7 @@ ENTRY (__swapcontext) /* Save the current context. */ jal __getcontext - + /* Tear down the frame and restore r0, r1, and lr. */ { BNEZ r0, .Lerror -- cgit v1.1