projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make CmmProc take CmmFormals as argument
[ghc-hetmet.git]
/
compiler
/
nativeGen
/
PositionIndependentCode.hs
diff --git
a/compiler/nativeGen/PositionIndependentCode.hs
b/compiler/nativeGen/PositionIndependentCode.hs
index
e2db9da
..
4001078
100644
(file)
--- a/
compiler/nativeGen/PositionIndependentCode.hs
+++ b/
compiler/nativeGen/PositionIndependentCode.hs
@@
-131,7
+131,7
@@
cmmMakePicReference :: CLabel -> CmmExpr
-- everything gets relocated at runtime
cmmMakePicReference lbl
-- everything gets relocated at runtime
cmmMakePicReference lbl
- | opt_PIC && absoluteLabel lbl = CmmMachOp (MO_Add wordRep) [
+ | (opt_PIC || not opt_Static) && absoluteLabel lbl = CmmMachOp (MO_Add wordRep) [
CmmReg (CmmGlobal PicBaseReg),
CmmLit $ picRelative lbl
]
CmmReg (CmmGlobal PicBaseReg),
CmmLit $ picRelative lbl
]