Merge "MIPS: 32/64-bit VDSO support"
This commit is contained in:
commit
72c8fce6c9
7 changed files with 13 additions and 22 deletions
|
@ -350,7 +350,5 @@ int __set_tls:set_thread_area(void*) mips,mips64
|
|||
int __set_thread_area:set_thread_area(void*) x86
|
||||
|
||||
# vdso stuff.
|
||||
int clock_gettime(clockid_t, timespec*) mips,mips64
|
||||
int __clock_gettime:clock_gettime(clockid_t, timespec*) arm,arm64,x86,x86_64
|
||||
int gettimeofday(timeval*, timezone*) mips,mips64
|
||||
int __gettimeofday:gettimeofday(timeval*, timezone*) arm,arm64,x86,x86_64
|
||||
int __clock_gettime:clock_gettime(clockid_t, timespec*) all
|
||||
int __gettimeofday:gettimeofday(timeval*, timezone*) all
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include <private/bionic_asm.h>
|
||||
|
||||
ENTRY(clock_gettime)
|
||||
ENTRY(__clock_gettime)
|
||||
.set noreorder
|
||||
.cpload t9
|
||||
li v0, __NR_clock_gettime
|
||||
|
@ -16,4 +16,4 @@ ENTRY(clock_gettime)
|
|||
j t9
|
||||
nop
|
||||
.set reorder
|
||||
END(clock_gettime)
|
||||
END(__clock_gettime)
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include <private/bionic_asm.h>
|
||||
|
||||
ENTRY(gettimeofday)
|
||||
ENTRY(__gettimeofday)
|
||||
.set noreorder
|
||||
.cpload t9
|
||||
li v0, __NR_gettimeofday
|
||||
|
@ -16,4 +16,4 @@ ENTRY(gettimeofday)
|
|||
j t9
|
||||
nop
|
||||
.set reorder
|
||||
END(gettimeofday)
|
||||
END(__gettimeofday)
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include <private/bionic_asm.h>
|
||||
|
||||
ENTRY(clock_gettime)
|
||||
ENTRY(__clock_gettime)
|
||||
.set push
|
||||
.set noreorder
|
||||
li v0, __NR_clock_gettime
|
||||
|
@ -22,4 +22,5 @@ ENTRY(clock_gettime)
|
|||
j t9
|
||||
move ra, t0
|
||||
.set pop
|
||||
END(clock_gettime)
|
||||
END(__clock_gettime)
|
||||
.hidden __clock_gettime
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include <private/bionic_asm.h>
|
||||
|
||||
ENTRY(gettimeofday)
|
||||
ENTRY(__gettimeofday)
|
||||
.set push
|
||||
.set noreorder
|
||||
li v0, __NR_gettimeofday
|
||||
|
@ -22,4 +22,5 @@ ENTRY(gettimeofday)
|
|||
j t9
|
||||
move ra, t0
|
||||
.set pop
|
||||
END(gettimeofday)
|
||||
END(__gettimeofday)
|
||||
.hidden __gettimeofday
|
|
@ -17,8 +17,6 @@
|
|||
#include "private/bionic_globals.h"
|
||||
#include "private/bionic_vdso.h"
|
||||
|
||||
#if defined(__aarch64__) || defined(__arm__) || defined(__i386__) || defined(__x86_64__)
|
||||
|
||||
#include <limits.h>
|
||||
#include <link.h>
|
||||
#include <string.h>
|
||||
|
@ -112,10 +110,3 @@ void __libc_init_vdso(libc_globals* globals, KernelArgumentBlock& args) {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
void __libc_init_vdso(libc_globals*, KernelArgumentBlock&) {
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
#if defined(__aarch64__)
|
||||
#define VDSO_CLOCK_GETTIME_SYMBOL "__kernel_clock_gettime"
|
||||
#define VDSO_GETTIMEOFDAY_SYMBOL "__kernel_gettimeofday"
|
||||
#elif defined(__arm__) || defined(__i386__) || defined(__x86_64__)
|
||||
#else
|
||||
#define VDSO_CLOCK_GETTIME_SYMBOL "__vdso_clock_gettime"
|
||||
#define VDSO_GETTIMEOFDAY_SYMBOL "__vdso_gettimeofday"
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue