diff options
author | Goran Ferenc <goran.ferenc@imgtec.com> | 2017-06-01 17:56:43 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-06-01 17:56:43 +0000 |
commit | 85fb061c244207822aaae90f68e6f72b57571478 (patch) | |
tree | 2e37e7d6061ac9a37410f98ad2edf0dea351f4fd | |
parent | c27ac0df9bb01e71a83c6a891f2e4ca77d2d65c3 (diff) | |
parent | d32465b2554d36c5370c398a2d56e83e6e20d79d (diff) | |
download | bionic-85fb061c244207822aaae90f68e6f72b57571478.tar.gz |
Merge "MIPS: 32/64-bit VDSO support" am: 72c8fce6c9
am: d32465b255
Change-Id: I9679f0f032d463fbde8996a9174938476f10d276
-rw-r--r-- | libc/SYSCALLS.TXT | 6 | ||||
-rw-r--r-- | libc/arch-mips/syscalls/__clock_gettime.S (renamed from libc/arch-mips/syscalls/clock_gettime.S) | 4 | ||||
-rw-r--r-- | libc/arch-mips/syscalls/__gettimeofday.S (renamed from libc/arch-mips/syscalls/gettimeofday.S) | 4 | ||||
-rw-r--r-- | libc/arch-mips64/syscalls/__clock_gettime.S (renamed from libc/arch-mips64/syscalls/clock_gettime.S) | 5 | ||||
-rw-r--r-- | libc/arch-mips64/syscalls/__gettimeofday.S (renamed from libc/arch-mips64/syscalls/gettimeofday.S) | 5 | ||||
-rw-r--r-- | libc/bionic/vdso.cpp | 9 | ||||
-rw-r--r-- | libc/private/bionic_vdso.h | 2 |
7 files changed, 13 insertions, 22 deletions
diff --git a/libc/SYSCALLS.TXT b/libc/SYSCALLS.TXT index 936f3fd12..5ff3c64ea 100644 --- a/libc/SYSCALLS.TXT +++ b/libc/SYSCALLS.TXT @@ -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 diff --git a/libc/arch-mips/syscalls/clock_gettime.S b/libc/arch-mips/syscalls/__clock_gettime.S index d227a0666..6fad7e936 100644 --- a/libc/arch-mips/syscalls/clock_gettime.S +++ b/libc/arch-mips/syscalls/__clock_gettime.S @@ -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) diff --git a/libc/arch-mips/syscalls/gettimeofday.S b/libc/arch-mips/syscalls/__gettimeofday.S index 672faa3a6..e8b9d6a75 100644 --- a/libc/arch-mips/syscalls/gettimeofday.S +++ b/libc/arch-mips/syscalls/__gettimeofday.S @@ -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) diff --git a/libc/arch-mips64/syscalls/clock_gettime.S b/libc/arch-mips64/syscalls/__clock_gettime.S index 08135607e..34071222c 100644 --- a/libc/arch-mips64/syscalls/clock_gettime.S +++ b/libc/arch-mips64/syscalls/__clock_gettime.S @@ -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 diff --git a/libc/arch-mips64/syscalls/gettimeofday.S b/libc/arch-mips64/syscalls/__gettimeofday.S index 3a6d417e3..2ac5e9b10 100644 --- a/libc/arch-mips64/syscalls/gettimeofday.S +++ b/libc/arch-mips64/syscalls/__gettimeofday.S @@ -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 diff --git a/libc/bionic/vdso.cpp b/libc/bionic/vdso.cpp index f3d95ca8a..dd4c070ac 100644 --- a/libc/bionic/vdso.cpp +++ b/libc/bionic/vdso.cpp @@ -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 diff --git a/libc/private/bionic_vdso.h b/libc/private/bionic_vdso.h index 8fd0743ed..2d11cd69f 100644 --- a/libc/private/bionic_vdso.h +++ b/libc/private/bionic_vdso.h @@ -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 |