niansa-misc/musl
1
0
Fork 0
mirror of git://git.musl-libc.org/musl synced 2025-03-06 20:48:29 +01:00
Code Issues Projects Releases Packages Wiki Activity

mostly-cosmetic fixups to x32 port merge

Browse source
This commit is contained in:
Rich Felker 2014-02-23 05:43:09 -05:00
parent adbeefbebd
commit d8b587796f
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/x32/syscall_arch.h
View file

@ -2,7 +2,7 @@
#define __SYSCALL_LL_O(x) (x) #define __SYSCALL_LL_O(x) (x)
#define __scc(X) sizeof(1?(X):0ULL) < 8 ? (unsigned long) (X) : (long long) (X) #define __scc(X) sizeof(1?(X):0ULL) < 8 ? (unsigned long) (X) : (long long) (X)
#define syscall_arg_t long long typedef long long syscall_arg_t;
struct __timespec { long long tv_sec; long tv_nsec; }; struct __timespec { long long tv_sec; long tv_nsec; };
struct __timespec_kernel { long long tv_sec; long long tv_nsec; }; struct __timespec_kernel { long long tv_sec; long long tv_nsec; };
#define __tsc(X) ((struct __timespec*)(unsigned long)(X)) #define __tsc(X) ((struct __timespec*)(unsigned long)(X))

7
src/internal/syscall.h
View file

@ -5,11 +5,8 @@
#include "syscall_arch.h" #include "syscall_arch.h"
#ifndef __scc #ifndef __scc
#define __scc(X) (long) (X) #define __scc(X) ((long) (X))
#endif typedef long syscall_arg_t;
#ifndef syscall_arg_t
#define syscall_arg_t long
#endif #endif
#if defined(__PIC__) && (100*__GNUC__+__GNUC_MINOR__ >= 303) #if defined(__PIC__) && (100*__GNUC__+__GNUC_MINOR__ >= 303)

5
src/thread/cancel_dummy.c
View file

@ -1,8 +1,9 @@
#include "pthread_impl.h" #include "pthread_impl.h"
#include "syscall.h" #include "syscall.h"
static long sccp(syscall_arg_t nr, syscall_arg_t u, syscall_arg_t v, static long sccp(syscall_arg_t nr,
syscall_arg_t w, syscall_arg_t x, syscall_arg_t y, syscall_arg_t z) syscall_arg_t u, syscall_arg_t v, syscall_arg_t w,
syscall_arg_t x, syscall_arg_t y, syscall_arg_t z)
{ {
return (__syscall)(nr, u, v, w, x, y, z); return (__syscall)(nr, u, v, w, x, y, z);
} }

10
src/thread/cancel_impl.c
View file

@ -9,11 +9,13 @@ void __cancel()
pthread_exit(PTHREAD_CANCELED); pthread_exit(PTHREAD_CANCELED);
} }
long __syscall_cp_asm(volatile void *, syscall_arg_t, syscall_arg_t, syscall_arg_t, long __syscall_cp_asm(volatile void *, syscall_arg_t,
syscall_arg_t, syscall_arg_t, syscall_arg_t, syscall_arg_t); syscall_arg_t, syscall_arg_t, syscall_arg_t,
syscall_arg_t, syscall_arg_t, syscall_arg_t);
long (__syscall_cp)(syscall_arg_t nr, syscall_arg_t u, syscall_arg_t v, syscall_arg_t w, long (__syscall_cp)(syscall_arg_t nr,
syscall_arg_t x, syscall_arg_t y, syscall_arg_t z) syscall_arg_t u, syscall_arg_t v, syscall_arg_t w,
syscall_arg_t x, syscall_arg_t y, syscall_arg_t z)
{ {
pthread_t self; pthread_t self;
long r; long r;