diff options
| author | Ben Gamari <bgamari.foss@gmail.com> | 2016-12-07 08:51:02 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2016-12-07 09:55:30 -0500 |
| commit | 83d69dca896c7df1f2a36268d5b45c9283985ebf (patch) | |
| tree | 5803804671418d397504a62756bd2601731bbc0f /rts/LinkerInternals.h | |
| parent | d70d452a38bed3321bfc3c14074a6b3e1f30a090 (diff) | |
| download | haskell-83d69dca896c7df1f2a36268d5b45c9283985ebf.tar.gz | |
Don't barf() on failures in loadArchive()
This patch replaces calls to barf() in loadArchive() with proper
error handling.
Test Plan: GHC CI
Reviewers: rwbarton, erikd, hvr, austin, simonmar, bgamari
Reviewed By: bgamari
Subscribers: thomie
Tags: #ghc
Differential Revision: https://phabricator.haskell.org/D2652
GHC Trac Issues: #12388
Diffstat (limited to 'rts/LinkerInternals.h')
| -rw-r--r-- | rts/LinkerInternals.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/rts/LinkerInternals.h b/rts/LinkerInternals.h index da20e3b278..a09d079758 100644 --- a/rts/LinkerInternals.h +++ b/rts/LinkerInternals.h @@ -259,8 +259,6 @@ extern /*Str*/HashTable *symhash; #define USE_CONTIGUOUS_MMAP 0 #endif -#include "EndPrivate.h" - HsInt isAlreadyLoaded( pathchar *path ); HsInt loadOc( ObjectCode* oc ); ObjectCode* mkOc( pathchar *path, char *image, int imageSize, @@ -268,10 +266,6 @@ ObjectCode* mkOc( pathchar *path, char *image, int imageSize, int misalignment ); -#ifdef darwin_HOST_OS -int machoGetMisalignment( FILE * f ); -#endif /* darwin_HOST_OS */ - #if defined (mingw32_HOST_OS) /* We use myindex to calculate array addresses, rather than simply doing the normal subscript thing. That's because @@ -313,4 +307,5 @@ char *cstring_from_section_name( #define MAP_ANONYMOUS 0 #endif +#include "EndPrivate.h" #endif /* LINKERINTERNALS_H */ |