diff options
| author | Elliott Hughes <enh@google.com> | 2015-01-27 05:46:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-27 05:46:56 +0000 |
| commit | 192e169a404fee48483335ed988788924266ff5d (patch) | |
| tree | 3c1a0960a69a536097c33ea1bb239a0931f76f64 /libc | |
| parent | b518836e8c8aa8fce933d59705a24543672bf238 (diff) | |
| parent | 1edfd9e36acff1824c5e8dcfbdc0580dcc74e1bb (diff) | |
| download | bionic-192e169a404fee48483335ed988788924266ff5d.zip bionic-192e169a404fee48483335ed988788924266ff5d.tar.gz bionic-192e169a404fee48483335ed988788924266ff5d.tar.bz2 | |
Merge "x86 has an assembler bcopy implementation."
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/bionic/ndk_cruft.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libc/bionic/ndk_cruft.cpp b/libc/bionic/ndk_cruft.cpp index 341ba01..28d6355 100644 --- a/libc/bionic/ndk_cruft.cpp +++ b/libc/bionic/ndk_cruft.cpp @@ -235,11 +235,15 @@ extern "C" sighandler_t bsd_signal(int signum, sighandler_t handler) { return signal(signum, handler); } +#if !defined(__i386__) // This was removed from POSIX 2008. #undef bcopy extern "C" void bcopy(const void* src, void* dst, size_t n) { memcpy(dst, src, n); } +#else +// x86 has an assembler implementation. +#endif // sysv_signal() was never in POSIX. extern sighandler_t _signal(int signum, sighandler_t handler, int flags); |