[tiger] Universal binaries work.

Thanks to the #gcc channel in getting GCC 4.2 to work.
This commit is contained in:
Jason Felds
2011-05-30 10:40:00 -04:00
parent b42eb482bf
commit f686951513
4 changed files with 15 additions and 12 deletions
+8 -8
View File
@@ -7434,8 +7434,8 @@
PREBINDING = NO;
PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
SDKROOT = macosx10.5;
SDKROOT_i386 = /Developer/SDKs/MacOSX10.5.sdk;
SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk;
SDKROOT_i386 = "";
SDKROOT_ppc = "";
SHARED_PRECOMPS_DIR = "/Library/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders/$(PRODUCT_NAME)/$(CONFIGURATION)";
STRIP_INSTALLED_PRODUCT = NO;
STRIP_STYLE = "non-global";
@@ -8011,8 +8011,8 @@
PREBINDING = NO;
PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
SDKROOT = macosx10.5;
SDKROOT_i386 = /Developer/SDKs/MacOSX10.5.sdk;
SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk;
SDKROOT_i386 = "";
SDKROOT_ppc = "";
SHARED_PRECOMPS_DIR = "/Library/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders/$(PRODUCT_NAME)/$(CONFIGURATION)";
STRIP_INSTALLED_PRODUCT = YES;
STRIP_STYLE = "non-global";
@@ -8357,8 +8357,8 @@
PREBINDING = NO;
PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
SDKROOT = macosx10.5;
SDKROOT_i386 = /Developer/SDKs/MacOSX10.5.sdk;
SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk;
SDKROOT_i386 = "";
SDKROOT_ppc = "";
SHARED_PRECOMPS_DIR = "/Library/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders/$(PRODUCT_NAME)/$(CONFIGURATION)";
STRIP_INSTALLED_PRODUCT = YES;
STRIP_STYLE = "non-global";
@@ -8487,8 +8487,8 @@
PREBINDING = NO;
PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
SDKROOT = macosx10.5;
SDKROOT_i386 = /Developer/SDKs/MacOSX10.5.sdk;
SDKROOT_ppc = /Developer/SDKs/MacOSX10.4u.sdk;
SDKROOT_i386 = "";
SDKROOT_ppc = "";
SHARED_PRECOMPS_DIR = "/Library/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders/$(PRODUCT_NAME)/$(CONFIGURATION)";
STRIP_INSTALLED_PRODUCT = YES;
STRIP_STYLE = "non-global";
@@ -6,8 +6,6 @@
#include <objc/objc.h>
typedef const struct __CFDictionary *CFDictionaryRef;
/* XXX: This was changed to a uint32_t later and its header file cannot be included
* since Style conflicts. Ugh. */
typedef uint32_t CGDirectDisplayID;
class LowLevelWindow_MacOSX : public LowLevelWindow
+2 -2
View File
@@ -33,8 +33,8 @@ bool GetThreadBacktraceContext( uint64_t iID, BacktraceContext *ctx )
if( thread_get_state(thread, PPC_THREAD_STATE, thread_state_t(&state), &count) )
return false;
ctx->FramePtr = (const Frame *)state.r1;
ctx->PC = (void *)state.srr0;
ctx->FramePtr = (const Frame *)state.__r1;
ctx->PC = (void *)state.__srr0;
return true;
#elif defined(__i386__)
i386_thread_state_t state;
+5
View File
@@ -635,8 +635,13 @@ struct Frame
void GetSignalBacktraceContext( BacktraceContext *ctx, const ucontext_t *uc )
{
#if defined(__ppc__)
ctx->PC = (const void *) uc->uc_mcontext->__ss.__srr0;
ctx->FramePtr = (const Frame *) uc->uc_mcontext->__ss.__r1;
#else
ctx->PC = (const void *) uc->uc_mcontext->ss.srr0;
ctx->FramePtr = (const Frame *) uc->uc_mcontext->ss.r1;
#endif
}
void InitializeBacktrace() { }