From 0a395f5f49e9ebc933a8e531475b644e360bf4a7 Mon Sep 17 00:00:00 2001 From: ignisf Date: Thu, 28 Feb 2013 02:30:27 +0200 Subject: [PATCH] Avoid compilation failure in snapshot --- Rakefile | 1 + patches/do-not-imply-vfp3-and-armv7.patch | 28 +++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 patches/do-not-imply-vfp3-and-armv7.patch diff --git a/Rakefile b/Rakefile index 0f1e63a..e1d4478 100644 --- a/Rakefile +++ b/Rakefile @@ -27,6 +27,7 @@ task :checkout do # The -fPIC flag is necessary when linking a shared library # against the static libv8 on x86_64. sh "patch -N -p1 -d vendor/v8 < patches/fPIC-on-x64.patch" + sh "patch -N -p1 -d vendor/v8 < patches/do-not-imply-vfp3-and-armv7.patch" end desc "compile v8 via the ruby extension mechanism" diff --git a/patches/do-not-imply-vfp3-and-armv7.patch b/patches/do-not-imply-vfp3-and-armv7.patch new file mode 100644 index 0000000..5e22dbe --- /dev/null +++ b/patches/do-not-imply-vfp3-and-armv7.patch @@ -0,0 +1,28 @@ +diff --git a/build/common.gypi b/build/common.gypi +index e68ee15..198c2b7 100644 +--- a/build/common.gypi ++++ b/build/common.gypi +@@ -160,7 +160,6 @@ + [ 'v8_use_arm_eabi_hardfloat=="true"', { + 'defines': [ + 'USE_EABI_HARDFLOAT=1', +- 'CAN_USE_VFP3_INSTRUCTIONS', + ], + 'target_conditions': [ + ['_toolset=="target"', { +diff --git a/build/standalone.gypi b/build/standalone.gypi +index 7145a16..f34a6c8 100644 +--- a/build/standalone.gypi ++++ b/build/standalone.gypi +@@ -76,9 +76,9 @@ + }], + ], + # Default ARM variable settings. +- 'armv7%': 1, ++ 'armv7%': 0, + 'arm_neon%': 0, +- 'arm_fpu%': 'vfpv3', ++ 'arm_fpu%': 'vfp', + }, + 'target_defaults': { + 'default_configuration': 'Debug',