From decb5394ef36a58e7c7fc99076d81c8383bc194e Mon Sep 17 00:00:00 2001
From: "jkummerow@chromium.org"
 <jkummerow@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Date: Tue, 16 Apr 2013 15:36:11 +0000
Subject: [PATCH] More ARM GYP fixes

Review URL: https://codereview.chromium.org/13902014

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14292 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
---
 Makefile              | 4 ----
 build/standalone.gypi | 4 +++-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index f885bf1..191bb89 100644
--- a/Makefile
+++ b/Makefile
@@ -122,8 +122,6 @@ ifeq ($(armv7), false)
 else
 ifeq ($(armv7), true)
   GYPFLAGS += -Darmv7=1
-else
-  GYPFLAGS += -Darmv7=default
 endif
 endif
 # vfp2=off. Deprecated, use armfpu=
@@ -166,8 +164,6 @@ ifeq ($(armthumb), off)
 else
 ifeq ($(armthumb), on)
   GYPFLAGS += -Darm_thumb=1
-else
-  GYPFLAGS += -Darm_thumb=default
 endif
 endif
 # armtest=on
diff --git a/build/standalone.gypi b/build/standalone.gypi
index 749755c..dde0575 100644
--- a/build/standalone.gypi
+++ b/build/standalone.gypi
@@ -76,9 +76,11 @@
       }],
     ],
     # Default ARM variable settings.
-    'armv7%': 1,
+    'armv7%': 'default',
     'arm_neon%': 0,
     'arm_fpu%': 'vfpv3',
+    'arm_float_abi%': 'default',
+    'arm_thumb': 'default',
   },
   'target_defaults': {
     'default_configuration': 'Debug',
-- 
2.7.4