1. From 56bb7440c284e34424fe36bb237c8efc22084d92 Mon Sep 17 00:00:00 2001
  2. From: Adam Farden <[email protected]>
  3. Date: Sun, 11 Nov 2012 20:12:11 +0100
  4. Subject: [PATCH] Simple changes for ARMv6
  5. ---
  6. b2g/config/mozconfigs/common.override | 2 ++
  7. build/autoconf/android.m4 | 4 ++--
  8. build/autoconf/arch.m4 | 16 ++++++++--------
  9. js/src/build/autoconf/android.m4 | 4 ++--
  10. js/src/build/autoconf/arch.m4 | 16 ++++++++--------
  11. media/libvpx/vpx_config_arm-linux-gcc.h | 2 +-
  12. 6 files changed, 23 insertions(+), 21 deletions(-)
  13. diff --git a/b2g/config/mozconfigs/common.override b/b2g/config/mozconfigs/common.override
  14. index b94b773..ac5e689 100644
  15. --- a/b2g/config/mozconfigs/common.override
  16. +++ b/b2g/config/mozconfigs/common.override
  17. @@ -4,4 +4,6 @@
  18. # This file is included at the bottom of all b2g mozconfigs
  19. +ac_add_options --with-arch=armv6
  20. +export MOZ_PKG_SPECIAL=armv6
  21. . "$topsrcdir/build/mozconfig.common.override"
  22. diff --git a/build/autoconf/android.m4 b/build/autoconf/android.m4
  23. index 26746c3..6c1cbfe 100644
  24. --- a/build/autoconf/android.m4
  25. +++ b/build/autoconf/android.m4
  26. @@ -165,10 +165,10 @@ AC_DEFUN([MOZ_ANDROID_STLPORT],
  27. if test "$OS_TARGET" = "Android" -a -z "$gonkdir"; then
  28. case "${CPU_ARCH}-${MOZ_ARCH}" in
  29. arm-armv7*)
  30. - ANDROID_CPU_ARCH=armeabi-v7a
  31. + ANDROID_CPU_ARCH=armeabi-v6l
  32. ;;
  33. arm-*)
  34. - ANDROID_CPU_ARCH=armeabi
  35. + ANDROID_CPU_ARCH=armeabi-v6l
  36. ;;
  37. x86-*)
  38. ANDROID_CPU_ARCH=x86
  39. diff --git a/build/autoconf/arch.m4 b/build/autoconf/arch.m4
  40. index 0310234..5ce38df 100644
  41. --- a/build/autoconf/arch.m4
  42. +++ b/build/autoconf/arch.m4
  43. @@ -28,23 +28,23 @@ if test -z "$MOZ_ARCH"; then
  44. dnl Defaults
  45. case "${CPU_ARCH}-${OS_TARGET}" in
  46. arm-Android)
  47. - MOZ_THUMB=yes
  48. - MOZ_ARCH=armv7-a
  49. + MOZ_THUMB=toolchain-default
  50. + MOZ_ARCH=toolchain-default
  51. MOZ_FPU=vfp
  52. - MOZ_FLOAT_ABI=softfp
  53. + MOZ_FLOAT_ABI=toolchain-default
  54. ;;
  55. arm-Darwin)
  56. MOZ_ARCH=toolchain-default
  57. - MOZ_THUMB=yes
  58. + MOZ_THUMB=toolchain-default
  59. ;;
  60. arm-*)
  61. if test -n "$MOZ_PLATFORM_MAEMO"; then
  62. - MOZ_THUMB=no
  63. - MOZ_ARCH=armv7-a
  64. - MOZ_FLOAT_ABI=softfp
  65. + MOZ_THUMB=toolchain-default
  66. + MOZ_ARCH=toolchain-default
  67. + MOZ_FLOAT_ABI=toolchain-default
  68. fi
  69. if test "$MOZ_PLATFORM_MAEMO" = 6; then
  70. - MOZ_THUMB=yes
  71. + MOZ_THUMB=toolchain-default
  72. fi
  73. ;;
  74. esac
  75. diff --git a/js/src/build/autoconf/android.m4 b/js/src/build/autoconf/android.m4
  76. index 26746c3..6c1cbfe 100644
  77. --- a/js/src/build/autoconf/android.m4
  78. +++ b/js/src/build/autoconf/android.m4
  79. @@ -165,10 +165,10 @@ AC_DEFUN([MOZ_ANDROID_STLPORT],
  80. if test "$OS_TARGET" = "Android" -a -z "$gonkdir"; then
  81. case "${CPU_ARCH}-${MOZ_ARCH}" in
  82. arm-armv7*)
  83. - ANDROID_CPU_ARCH=armeabi-v7a
  84. + ANDROID_CPU_ARCH=armeabi-v6l
  85. ;;
  86. arm-*)
  87. - ANDROID_CPU_ARCH=armeabi
  88. + ANDROID_CPU_ARCH=armeabi-v6l
  89. ;;
  90. x86-*)
  91. ANDROID_CPU_ARCH=x86
  92. diff --git a/js/src/build/autoconf/arch.m4 b/js/src/build/autoconf/arch.m4
  93. index 0310234..5ce38df 100644
  94. --- a/js/src/build/autoconf/arch.m4
  95. +++ b/js/src/build/autoconf/arch.m4
  96. @@ -28,23 +28,23 @@ if test -z "$MOZ_ARCH"; then
  97. dnl Defaults
  98. case "${CPU_ARCH}-${OS_TARGET}" in
  99. arm-Android)
  100. - MOZ_THUMB=yes
  101. - MOZ_ARCH=armv7-a
  102. + MOZ_THUMB=toolchain-default
  103. + MOZ_ARCH=toolchain-default
  104. MOZ_FPU=vfp
  105. - MOZ_FLOAT_ABI=softfp
  106. + MOZ_FLOAT_ABI=toolchain-default
  107. ;;
  108. arm-Darwin)
  109. MOZ_ARCH=toolchain-default
  110. - MOZ_THUMB=yes
  111. + MOZ_THUMB=toolchain-default
  112. ;;
  113. arm-*)
  114. if test -n "$MOZ_PLATFORM_MAEMO"; then
  115. - MOZ_THUMB=no
  116. - MOZ_ARCH=armv7-a
  117. - MOZ_FLOAT_ABI=softfp
  118. + MOZ_THUMB=toolchain-default
  119. + MOZ_ARCH=toolchain-default
  120. + MOZ_FLOAT_ABI=toolchain-default
  121. fi
  122. if test "$MOZ_PLATFORM_MAEMO" = 6; then
  123. - MOZ_THUMB=yes
  124. + MOZ_THUMB=toolchain-default
  125. fi
  126. ;;
  127. esac
  128. diff --git a/media/libvpx/vpx_config_arm-linux-gcc.h b/media/libvpx/vpx_config_arm-linux-gcc.h
  129. index 53a317c..6a3ff8c 100644
  130. --- a/media/libvpx/vpx_config_arm-linux-gcc.h
  131. +++ b/media/libvpx/vpx_config_arm-linux-gcc.h
  132. @@ -17,7 +17,7 @@
  133. #define ARCH_PPC64 0
  134. #define HAVE_ARMV5TE 1
  135. #define HAVE_ARMV6 1
  136. -#define HAVE_ARMV7 1
  137. +#define HAVE_ARMV7 0
  138. #define HAVE_MIPS32 0
  139. #define HAVE_MMX 0
  140. #define HAVE_SSE 0
  141. --
  142. 1.7.10.4