ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-09 06:23:04 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'git/master'

Browse Source
This commit is contained in:
Joel Dice 2012-03-02 16:33:50 -07:00
commit 87032ca8a8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makefile
View File

@ -321,7 +321,7 @@ ifeq ($(platform),darwin)
ifeq ($(build-arch),powerpc) ifeq ($(build-arch),powerpc)
converter-cflags += -DOPPOSITE_ENDIAN converter-cflags += -DOPPOSITE_ENDIAN
endif endif
flags = -arch armv6 -isysroot \ flags = -arch armv7 -isysroot \
/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS5.0.sdk/ /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS5.0.sdk/
openjdk-extra-cflags += $(flags) openjdk-extra-cflags += $(flags)
cflags += $(flags) cflags += $(flags)

4
src/binaryToObject/mach-o.cpp
View File

@ -38,7 +38,7 @@
#define CPU_SUBTYPE_I386_ALL 3 #define CPU_SUBTYPE_I386_ALL 3
#define CPU_SUBTYPE_X86_64_ALL CPU_SUBTYPE_I386_ALL #define CPU_SUBTYPE_X86_64_ALL CPU_SUBTYPE_I386_ALL
#define CPU_SUBTYPE_POWERPC_ALL 0 #define CPU_SUBTYPE_POWERPC_ALL 0
#define CPU_SUBTYPE_ARM_V6 6 #define CPU_SUBTYPE_ARM_V7 9
#if (BITS_PER_WORD == 64) #if (BITS_PER_WORD == 64)
# define Magic MH_MAGIC_64 # define Magic MH_MAGIC_64
@ -321,7 +321,7 @@ MAKE_NAME(writeMachO, BITS_PER_WORD, Object)
cpuSubType = CPU_SUBTYPE_POWERPC_ALL; cpuSubType = CPU_SUBTYPE_POWERPC_ALL;
} else if (strcmp(architecture, "arm") == 0) { } else if (strcmp(architecture, "arm") == 0) {
cpuType = CPU_TYPE_ARM; cpuType = CPU_TYPE_ARM;
cpuSubType = CPU_SUBTYPE_ARM_V6; cpuSubType = CPU_SUBTYPE_ARM_V7;
} else { } else {
fprintf(stderr, "unsupported architecture: %s\n", architecture); fprintf(stderr, "unsupported architecture: %s\n", architecture);
return false; return false;