[commit: ghc] master: Treat foreign imported things in CMM as being in this package (4be70f9)

[Ian Lynagh]

Repository : http://darcs.haskell.org/ghc.git/

On branch  : master

https://github.com/ghc/ghc/commit/4be70f9361f536ec18625833a2e9c156a4cf8ef4

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

commit 4be70f9361f536ec18625833a2e9c156a4cf8ef4
Author: Ian Lynagh <ian at well-typed.com>
Date:   Thu May 9 15:15:54 2013 +0100

    Treat foreign imported things in CMM as being in this package
    
    They used to be treated as being in an exnternal package, which went
    wrong on Windows (it tried to call them via an imp wrapper, rather
    than calling them directly).

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

 compiler/cmm/CmmParse.y | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/cmm/CmmParse.y b/compiler/cmm/CmmParse.y
index 43fe88d..e9914bd 100644
--- a/compiler/cmm/CmmParse.y
+++ b/compiler/cmm/CmmParse.y
@@ -589,7 +589,7 @@ stmt    :: { CmmParse () }
                 { pushStackFrame $3 $5 }
 
 foreignLabel     :: { CmmParse CmmExpr }
-        : NAME                          { return (CmmLit (CmmLabel (mkForeignLabel $1 Nothing ForeignLabelInExternalPackage IsFunction))) }
+        : NAME                          { return (CmmLit (CmmLabel (mkForeignLabel $1 Nothing ForeignLabelInThisPackage IsFunction))) }
 
 opt_never_returns :: { CmmReturnInfo }
         :                               { CmmMayReturn }