[commit: ghc] master: Linker: Fix implicit function declaration warning on OS X (f255f80)

git at git.haskell.org git at git.haskell.org
Thu Apr 28 21:40:18 UTC 2016


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/f255f80132aa4cbe16db85b759350945fb66ef85/ghc

>---------------------------------------------------------------

commit f255f80132aa4cbe16db85b759350945fb66ef85
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Wed Apr 27 07:01:26 2016 +1000

    Linker: Fix implicit function declaration warning on OS X
    
    Introduced in commit 177aec697b3.
    
    Test Plan: Validate on OSX and Linux.
    
    Reviewers: austin, bgamari, hvr
    
    Subscribers: goldfire, thomie
    
    Differential Revision: https://phabricator.haskell.org/D2140


>---------------------------------------------------------------

f255f80132aa4cbe16db85b759350945fb66ef85
 rts/Linker.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/rts/Linker.c b/rts/Linker.c
index ef7baf9..87ad9e3 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -342,10 +342,7 @@ static int ocVerifyImage_MachO    ( ObjectCode* oc );
 static int ocGetNames_MachO       ( ObjectCode* oc );
 static int ocResolve_MachO        ( ObjectCode* oc );
 static int ocRunInit_MachO        ( ObjectCode* oc );
-
-#if (USE_MMAP == 0)
 static int machoGetMisalignment( FILE * );
-#endif
 #if NEED_SYMBOL_EXTRAS
 static int ocAllocateSymbolExtras_MachO ( ObjectCode* oc );
 #endif
@@ -7320,7 +7317,7 @@ machoInitSymbolsWithoutUnderscore(void)
 }
 #endif
 
-#if (USE_MMAP == 0)
+#if defined(OBJFORMAT_MACHO)
 /*
  * 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



More information about the ghc-commits mailing list