diff options
| author | Vishal Bhoj <vishal.bhoj@linaro.org> | 2016-05-19 17:23:38 +0530 |
|---|---|---|
| committer | Vishal Bhoj <vishal.bhoj@linaro.org> | 2016-05-19 17:48:26 +0530 |
| commit | ad63ff391130ec528b49ec421ed9992dc13a08e4 (patch) | |
| tree | 4b825dc642cb6eb9a060e54bf8d69288fbee4904 | |
| parent | b6ab044e1452c89b59bad2bb1b21fc97c93bebfa (diff) | |
| download | chromium-patchsets-ad63ff391130ec528b49ec421ed9992dc13a08e4.tar.gz | |
This reverts commit b6ab044e1452c89b59bad2bb1b21fc97c93bebfa.
Change-Id: Iba8a427e93e0c59f179402fcbb8b9dc3539519aa
| -rw-r--r-- | third_party/android_tools/Remove-asm-construct-for-swap16md-for-aarch64.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/third_party/android_tools/Remove-asm-construct-for-swap16md-for-aarch64.patch b/third_party/android_tools/Remove-asm-construct-for-swap16md-for-aarch64.patch deleted file mode 100644 index bb68e23..0000000 --- a/third_party/android_tools/Remove-asm-construct-for-swap16md-for-aarch64.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 4192e76925c954f561a4d9514902a4f1a56cffa5 Mon Sep 17 00:00:00 2001 -From: Khasim Syed Mohammed <khasim.mohammed@linaro.org> -Date: Thu, 14 Apr 2016 15:54:18 +0530 -Subject: [PATCH] Remove asm construct for swap16md for aarch64 - -building 64bit browser for ARMv8 with clang results in errors, - -../../third_party/android_tools/ndk/platforms/android-21 -/arch-arm64/usr/include/machine/endian.h:39:44: -note: expanded from macro '__swap16md' - - __asm volatile ("rev16 %0, %0" : "+r" (_x)); \ - ^ -../../base/third_party/libevent/evdns.c:838:2: -note: use constraint modifier "w" - -This patch dumps the asm construct to use the built in bswap16. -__builtin_bswap16(x) - -This patch helps in building 64bit browser with clang for ARM64 - -BUG : http://crbug.com/539781 - -Change-Id: Idb55a3356a3baec4a165f5d52d3f961f00fc534d -Signed-off-by: Bernhard Rosenkränzer <bero@linaro.org> -Signed-off-by: Khasim Syed Mohammed <khasim.mohammed@linaro.org> ---- - -diff --git a/ndk/platforms/android-21/arch-arm64/usr/include/machine/endian.h b/ndk/platforms/android-21/arch-arm64/usr/include/machine/endian.h -index 87a038d..cdf2cc2 100644 ---- a/ndk/platforms/android-21/arch-arm64/usr/include/machine/endian.h -+++ b/ndk/platforms/android-21/arch-arm64/usr/include/machine/endian.h -@@ -34,13 +34,8 @@ - - #ifdef __GNUC__ - --#define __swap16md(x) ({ \ -- register u_int16_t _x = (x); \ -- __asm volatile ("rev16 %0, %0" : "+r" (_x)); \ -- _x; \ --}) -- - /* Use GCC builtins */ -+#define __swap16md(x) __builtin_bswap16(x) - #define __swap32md(x) __builtin_bswap32(x) - #define __swap64md(x) __builtin_bswap64(x) - |