2
1

0001-Detect-32-bits-armv8-a-architecture.patch 1.9 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849
  1. From daf2e222903bacf85f27dfb0fffc4459bbf58b77 Mon Sep 17 00:00:00 2001
  2. From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@savoirfairelinux.com>
  3. Date: Sun, 10 Jun 2018 08:23:50 -0400
  4. Subject: [PATCH] Detect 32-bits armv8-a architecture
  5. MIME-Version: 1.0
  6. Content-Type: text/plain; charset=utf-8
  7. Content-Transfer-Encoding: 8bit
  8. These toolchains define __ARM_ARCH_8A__ (for ARM architecture version)
  9. and __arm__ (for 32-bits word-size; __aarch64__ for 64-bits).
  10. This commit catches this new architecture (armv8a) within a #ifdef/#endif
  11. inside the if statement dedicated for 32-bits ARM detection. See commit
  12. from WebKit [1] and [2].
  13. Fixes:
  14. In file included from ../3rdparty/javascriptcore/JavaScriptCore/config.h:26,
  15. from ../3rdparty/javascriptcore/JavaScriptCore/pcre/pcre_compile.cpp:44:
  16. ../3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h:370:6: error: #error "Not supported ARM architecture"
  17. # error "Not supported ARM architecture"
  18. ^~~~~
  19. [1]: https://github.com/WebKit/webkit/commit/313d9fc4bdd2f020a5d0cf834c3c61982f161ebb
  20. [2]: https://github.com/WebKit/webkit/commit/98f0de0709786f5d9b09dfd5908266990eb909d6
  21. Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
  22. ---
  23. src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 4 ++++
  24. 1 file changed, 4 insertions(+)
  25. diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
  26. index 00caa6d..c4b758e 100644
  27. --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
  28. +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
  29. @@ -306,6 +306,10 @@
  30. || defined(__ARM_ARCH_7R__)
  31. #define WTF_ARM_ARCH_VERSION 7
  32. +#elif defined(__ARM_ARCH_8__) \
  33. + || defined(__ARM_ARCH_8A__)
  34. +#define WTF_ARM_ARCH_VERSION 8
  35. +
  36. /* RVCT sets _TARGET_ARCH_ARM */
  37. #elif defined(__TARGET_ARCH_ARM)
  38. #define WTF_ARM_ARCH_VERSION __TARGET_ARCH_ARM
  39. --
  40. 2.17.1