X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FnativeGen%2FPositionIndependentCode.hs;h=e2db9da62d5a25105c0df80e671e52cd65f5b280;hb=1569075dbdc0b46720a5b2d89df3fb100cf84e3d;hp=53ee563e5cdbfd5da1a642fea0eb46fa3308a29d;hpb=ba8b3afc73880f49c3c9a960d3ac8fc3247fa6f8;p=ghc-hetmet.git diff --git a/compiler/nativeGen/PositionIndependentCode.hs b/compiler/nativeGen/PositionIndependentCode.hs index 53ee563..e2db9da 100644 --- a/compiler/nativeGen/PositionIndependentCode.hs +++ b/compiler/nativeGen/PositionIndependentCode.hs @@ -200,7 +200,7 @@ howToAccessLabel DataReference lbl | otherwise = AccessDirectly -#if x86_TARGET_ARCH || x86_64_TARGET_ARCH +#if i386_TARGET_ARCH || x86_64_TARGET_ARCH -- dyld code stubs don't work for tailcalls because the -- stack alignment is only right for regular calls. -- Therefore, we have to go via a symbol pointer: @@ -274,7 +274,7 @@ howToAccessLabel CallReference lbl = AccessDirectly #if !i386_TARGET_ARCH | labelDynamic lbl && opt_PIC - = AccessViaSymbolStub + = AccessViaStub #endif howToAccessLabel _ lbl @@ -442,7 +442,7 @@ pprImportedSymbol importedLbl ptext SLIT("1:"), ptext SLIT("\tmovl L") <> pprCLabel_asm lbl <> ptext SLIT("$lazy_ptr-1b(%eax),%edx"), - ptext SLIT("\tjmp %edx"), + ptext SLIT("\tjmp *%edx"), ptext SLIT("L") <> pprCLabel_asm lbl <> ptext SLIT("$stub_binder:"), ptext SLIT("\tlea L") <> pprCLabel_asm lbl