We don't need to specify the VALID_ARCHS in the xcode project file.

Also, don't build debugserver with -DUSE_ARM_DISASSEMBLER_FRAMEWORK -
that framework isn't around at this point.

llvm-svn: 176759

diff --git a/lldb/lldb.xcodeproj/project.pbxproj b/lldb/lldb.xcodeproj/project.pbxproj
index eee54c3..80b07d9 100644 (file)
--- a/lldb/lldb.xcodeproj/project.pbxproj
+++ b/lldb/lldb.xcodeproj/project.pbxproj
@@ -4645,7 +4645,6 @@
                                SDKROOT = macosx;
                                STRIP_INSTALLED_PRODUCT = NO;
                                STRIP_STYLE = debugging;
-                               VALID_ARCHS = "armv4t armv5 armv6 armv7 armv7s i386 ppc ppc64 ppc7400 ppc970 x86_64";
                                WARNING_CFLAGS = "-Wreorder";
                        };
                        name = Debug;
@@ -4709,7 +4708,6 @@
                                SDKROOT = macosx;
                                STRIP_INSTALLED_PRODUCT = NO;
                                STRIP_STYLE = debugging;
-                               VALID_ARCHS = "armv4t armv5 armv6 armv7 armv7s i386 ppc ppc64 ppc7400 ppc970 x86_64";
                                WARNING_CFLAGS = "-Wreorder";
                        };
                        name = Release;
@@ -5078,7 +5076,6 @@
                                SDKROOT = "";
                                STRIP_INSTALLED_PRODUCT = NO;
                                STRIP_STYLE = debugging;
-                               VALID_ARCHS = "armv4t armv5 armv6 armv7 armv7s i386 ppc ppc64 ppc7400 ppc970 x86_64";
                                WARNING_CFLAGS = "-Wreorder";
                        };
                        name = BuildAndIntegration;
@@ -5567,7 +5564,6 @@
                                SDKROOT = macosx;
                                STRIP_INSTALLED_PRODUCT = NO;
                                STRIP_STYLE = debugging;
-                               VALID_ARCHS = "armv4t armv5 armv6 armv7 armv7s i386 ppc ppc64 ppc7400 ppc970 x86_64";
                                WARNING_CFLAGS = "-Wreorder";
                        };
                        name = DebugClang;

diff --git a/lldb/tools/debugserver/debugserver.xcodeproj/project.pbxproj b/lldb/tools/debugserver/debugserver.xcodeproj/project.pbxproj
index b3f1e8a..8cfd38f 100644 (file)
--- a/lldb/tools/debugserver/debugserver.xcodeproj/project.pbxproj
+++ b/lldb/tools/debugserver/debugserver.xcodeproj/project.pbxproj
@@ -499,7 +499,6 @@
                                ONLY_ACTIVE_ARCH = YES;
                                SDKROOT = "";
                                STRIP_INSTALLED_PRODUCT = NO;
-                               VALID_ARCHS = "armv4t armv5 armv6 armv7 armv7s i386 ppc ppc64 ppc7400 ppc970 x86_64";
                                VERSIONING_SYSTEM = "apple-generic";
                                VERSION_INFO_BUILDER = "$(USER)";
                        };
@@ -528,7 +527,6 @@
                                SDKROOT = "";
                                STRIPFLAGS = "-x";
                                STRIP_STYLE = debugging;
-                               VALID_ARCHS = "armv4t armv5 armv6 armv7 armv7s i386 ppc ppc64 ppc7400 ppc970 x86_64";
                                VERSIONING_SYSTEM = "apple-generic";
                                VERSION_INFO_BUILDER = "$(USER)";
                        };
@@ -559,7 +557,6 @@
                                SDKROOT = "";
                                STRIPFLAGS = "-x";
                                STRIP_STYLE = debugging;
-                               VALID_ARCHS = "armv4t armv5 armv6 armv7 armv7s i386 ppc ppc64 ppc7400 ppc970 x86_64";
                                VERSIONING_SYSTEM = "apple-generic";
                                VERSION_INFO_BUILDER = "$(USER)";
                        };
@@ -592,7 +589,6 @@
                                        "-Wparentheses",
                                        "-DWITH_LOCKDOWN",
                                        "-DWITH_SPRINGBOARD",
-                                       "-DUSE_ARM_DISASSEMBLER_FRAMEWORK",
                                        "-DOS_OBJECT_USE_OBJC=0",
                                );
                                "OTHER_CPLUSPLUSFLAGS[arch=*][sdk=iphoneos*]" = "$(OTHER_CFLAGS)";
@@ -647,7 +643,6 @@
                                        "-Wparentheses",
                                        "-DWITH_LOCKDOWN",
                                        "-DWITH_SPRINGBOARD",
-                                       "-DUSE_ARM_DISASSEMBLER_FRAMEWORK",
                                        "-DOS_OBJECT_USE_OBJC=0",
                                );
                                "OTHER_CPLUSPLUSFLAGS[arch=*][sdk=iphoneos*]" = "$(OTHER_CFLAGS)";
@@ -702,7 +697,6 @@
                                        "-Wparentheses",
                                        "-DWITH_LOCKDOWN",
                                        "-DWITH_SPRINGBOARD",
-                                       "-DUSE_ARM_DISASSEMBLER_FRAMEWORK",
                                        "-DOS_OBJECT_USE_OBJC=0",
                                );
                                "OTHER_CPLUSPLUSFLAGS[arch=*][sdk=iphoneos*]" = "$(OTHER_CFLAGS)";
@@ -754,7 +748,6 @@
                                ONLY_ACTIVE_ARCH = YES;
                                SDKROOT = "";
                                STRIP_INSTALLED_PRODUCT = NO;
-                               VALID_ARCHS = "armv4t armv5 armv6 armv7 armv7s i386 ppc ppc64 ppc7400 ppc970 x86_64";
                                VERSIONING_SYSTEM = "apple-generic";
                                VERSION_INFO_BUILDER = "$(USER)";
                        };
@@ -788,7 +781,6 @@
                                        "-Wparentheses",
                                        "-DWITH_LOCKDOWN",
                                        "-DWITH_SPRINGBOARD",
-                                       "-DUSE_ARM_DISASSEMBLER_FRAMEWORK",
                                        "-DOS_OBJECT_USE_OBJC=0",
                                );
                                "OTHER_CPLUSPLUSFLAGS[arch=*][sdk=iphoneos*]" = "$(OTHER_CFLAGS)";