Commit aaf192c3 authored by Ian Lynagh's avatar Ian Lynagh
Browse files

OS X / amd64 fixes

parent 5fcfdb3b
...@@ -294,7 +294,7 @@ typedef struct AdjustorStub { ...@@ -294,7 +294,7 @@ typedef struct AdjustorStub {
} AdjustorStub; } AdjustorStub;
#endif #endif
#if defined(darwin_HOST_OS) || defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH) #if (defined(i386_HOST_ARCH) && defined(darwin_HOST_OS)) || defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
static int totalArgumentSize(char *typeString) static int totalArgumentSize(char *typeString)
{ {
int sz = 0; int sz = 0;
......
...@@ -205,7 +205,7 @@ static void machoInitSymbolsWithoutUnderscore( void ); ...@@ -205,7 +205,7 @@ static void machoInitSymbolsWithoutUnderscore( void );
#define MMAP_32BIT_BASE_DEFAULT 0x40000000 #define MMAP_32BIT_BASE_DEFAULT 0x40000000
#endif #endif
static void *mmap_32bit_base = MMAP_32BIT_BASE_DEFAULT; static void *mmap_32bit_base = (void *)MMAP_32BIT_BASE_DEFAULT;
#endif #endif
/* MAP_ANONYMOUS is MAP_ANON on some systems, e.g. OpenBSD */ /* MAP_ANONYMOUS is MAP_ANON on some systems, e.g. OpenBSD */
...@@ -4098,7 +4098,9 @@ static int relocateSection( ...@@ -4098,7 +4098,9 @@ static int relocateSection(
char *thingPtr = image + sect->offset + reloc->r_address; char *thingPtr = image + sect->offset + reloc->r_address;
uint64_t thing; uint64_t thing;
uint64_t value; /* We shouldn't need to initialise this, but gcc on OS X 64 bit
complains that it may be used uninitialized if we don't */
uint64_t value = 0;
uint64_t baseValue; uint64_t baseValue;
int type = reloc->r_type; int type = reloc->r_type;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment