projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b46472f
)
Fix validate on OS X
author
Ian Lynagh
<igloo@earth.li>
Sat, 29 May 2010 15:47:26 +0000
(15:47 +0000)
committer
Ian Lynagh
<igloo@earth.li>
Sat, 29 May 2010 15:47:26 +0000
(15:47 +0000)
rts/Linker.c
patch
|
blob
|
history
diff --git
a/rts/Linker.c
b/rts/Linker.c
index
8a1bdc1
..
dbc8599
100644
(file)
--- a/
rts/Linker.c
+++ b/
rts/Linker.c
@@
-136,7
+136,9
@@
static int ocVerifyImage_MachO ( ObjectCode* oc );
static int ocGetNames_MachO ( ObjectCode* oc );
static int ocResolve_MachO ( ObjectCode* oc );
static int ocGetNames_MachO ( ObjectCode* oc );
static int ocResolve_MachO ( ObjectCode* oc );
+#ifndef USE_MMAP
static int machoGetMisalignment( FILE * );
static int machoGetMisalignment( FILE * );
+#endif
#if defined(powerpc_HOST_ARCH) || defined(x86_64_HOST_ARCH)
static int ocAllocateSymbolExtras_MachO ( ObjectCode* oc );
#endif
#if defined(powerpc_HOST_ARCH) || defined(x86_64_HOST_ARCH)
static int ocAllocateSymbolExtras_MachO ( ObjectCode* oc );
#endif
@@
-4797,6
+4799,7
@@
static void machoInitSymbolsWithoutUnderscore()
}
#endif
}
#endif
+#ifndef USE_MMAP
/*
* Figure out by how much to shift the entire Mach-O file in memory
* when loading so that its single segment ends up 16-byte-aligned
/*
* Figure out by how much to shift the entire Mach-O file in memory
* when loading so that its single segment ends up 16-byte-aligned
@@
-4822,6
+4825,7
@@
static int machoGetMisalignment( FILE * f )
return misalignment ? (16 - misalignment) : 0;
}
return misalignment ? (16 - misalignment) : 0;
}
+#endif
#endif
#endif