diff options
| author | Sergei Trofimovich <slyfox@gentoo.org> | 2016-03-08 08:14:08 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <siarheit@google.com> | 2016-03-08 08:14:27 +0000 |
| commit | 90e1e160b783644c2d3cc0a05e3a804cea549cf9 (patch) | |
| tree | c150978c9ee9efbe0b3e19da9e21d1a7c10e7154 /compiler/cmm/CLabel.hs | |
| parent | 82e36edcbd831e9b7c05e1c2cb918ad5de56cd3a (diff) | |
| download | haskell-90e1e160b783644c2d3cc0a05e3a804cea549cf9.tar.gz | |
Split external symbol prototypes (EF_) (Trac #11395)
Before the patch both Cmm and C symbols were declared
with 'EF_' macro:
#define EF_(f) extern StgFunPtr f()
but for Cmm symbols we know exact prototypes.
The patch splits there prototypes in to:
#define EFF_(f) void f() /* See Note [External function prototypes] */
#define EF_(f) StgFunPtr f(void)
Cmm functions are 'EF_' (External Functions),
C functions are 'EFF_' (External Foreign Functions).
While at it changed external C function prototype
to return 'void' to workaround ghc bug on m68k.
Described in detail in Trac #11395.
This makes simple tests work on m68k-linux target!
Thanks to Michael Karcher for awesome analysis
happening in Trac #11395.
Signed-off-by: Sergei Trofimovich <siarheit@google.com>
Test Plan: ran "hello world" on m68k successfully
Reviewers: simonmar, austin, bgamari
Reviewed By: bgamari
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D1975
GHC Trac Issues: #11395
Diffstat (limited to 'compiler/cmm/CLabel.hs')
| -rw-r--r-- | compiler/cmm/CLabel.hs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/compiler/cmm/CLabel.hs b/compiler/cmm/CLabel.hs index 9304d66323..15c5ff3481 100644 --- a/compiler/cmm/CLabel.hs +++ b/compiler/cmm/CLabel.hs @@ -88,8 +88,9 @@ module CLabel ( mkForeignLabel, addLabelSize, - foreignLabelStdcallInfo, + foreignLabelStdcallInfo, + isForeignLabel, mkCCLabel, mkCCSLabel, DynamicLinkerLabelInfo(..), @@ -492,6 +493,11 @@ addLabelSize (ForeignLabel str _ src fod) sz addLabelSize label _ = label +-- | Whether label is a non-haskell label (defined in C code) +isForeignLabel :: CLabel -> Bool +isForeignLabel (ForeignLabel _ _ _ _) = True +isForeignLabel _lbl = False + -- | Get the label size field from a ForeignLabel foreignLabelStdcallInfo :: CLabel -> Maybe Int foreignLabelStdcallInfo (ForeignLabel _ info _ _) = info |