From 6a20d0289ca9578dd52cf8c09c3a98d3fec06b1d Mon Sep 17 00:00:00 2001 From: Matt Weaver Date: Fri, 2 Mar 2012 16:00:08 -0700 Subject: [PATCH 1/2] switching to armv7 --- makefile | 2 +- src/binaryToObject/mach-o.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/makefile b/makefile index 147bb6f3de..08287d14f9 100755 --- a/makefile +++ b/makefile @@ -321,7 +321,7 @@ ifeq ($(platform),darwin) ifeq ($(build-arch),powerpc) converter-cflags += -DOPPOSITE_ENDIAN endif - flags = -arch armv6 -isysroot \ + flags = -arch armv7 -isysroot \ /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS5.0.sdk/ openjdk-extra-cflags += $(flags) cflags += $(flags) diff --git a/src/binaryToObject/mach-o.cpp b/src/binaryToObject/mach-o.cpp index fefde4a467..2b750a1ba1 100644 --- a/src/binaryToObject/mach-o.cpp +++ b/src/binaryToObject/mach-o.cpp @@ -38,7 +38,7 @@ #define CPU_SUBTYPE_I386_ALL 3 #define CPU_SUBTYPE_X86_64_ALL CPU_SUBTYPE_I386_ALL #define CPU_SUBTYPE_POWERPC_ALL 0 -#define CPU_SUBTYPE_ARM_V6 6 +#define CPU_SUBTYPE_ARM_V7 7 #if (BITS_PER_WORD == 64) # define Magic MH_MAGIC_64 @@ -321,7 +321,7 @@ MAKE_NAME(writeMachO, BITS_PER_WORD, Object) cpuSubType = CPU_SUBTYPE_POWERPC_ALL; } else if (strcmp(architecture, "arm") == 0) { cpuType = CPU_TYPE_ARM; - cpuSubType = CPU_SUBTYPE_ARM_V6; + cpuSubType = CPU_SUBTYPE_ARM_V7; } else { fprintf(stderr, "unsupported architecture: %s\n", architecture); return false; From a7157199f3893a296b202194e88cc37b93ce9c7a Mon Sep 17 00:00:00 2001 From: Matt Weaver Date: Fri, 2 Mar 2012 16:06:22 -0700 Subject: [PATCH 2/2] armv7 is actually 9 --- src/binaryToObject/mach-o.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/binaryToObject/mach-o.cpp b/src/binaryToObject/mach-o.cpp index 2b750a1ba1..8b37e85aaf 100644 --- a/src/binaryToObject/mach-o.cpp +++ b/src/binaryToObject/mach-o.cpp @@ -38,7 +38,7 @@ #define CPU_SUBTYPE_I386_ALL 3 #define CPU_SUBTYPE_X86_64_ALL CPU_SUBTYPE_I386_ALL #define CPU_SUBTYPE_POWERPC_ALL 0 -#define CPU_SUBTYPE_ARM_V7 7 +#define CPU_SUBTYPE_ARM_V7 9 #if (BITS_PER_WORD == 64) # define Magic MH_MAGIC_64