Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : cross-compiler-alienless
http://hackage.haskell.org/trac/ghc/changeset/b8f6e55ec9fcdf44cff96b57e523e94c6c4cf9ba >--------------------------------------------------------------- commit b8f6e55ec9fcdf44cff96b57e523e94c6c4cf9ba Merge: 90f7395... 4eb02c1... Author: Gabor Greif <[email protected]> Date: Mon Aug 27 14:46:40 2012 +0200 Merge branch 'master' of https://github.com/ghc/ghc into cross-compiler-alienless aclocal.m4 | 16 +- compiler/basicTypes/BasicTypes.lhs | 2 +- compiler/basicTypes/RdrName.lhs | 21 +- compiler/cmm/Cmm.hs | 15 +- compiler/cmm/CmmBuildInfoTables.hs | 99 ++-- compiler/cmm/CmmCallConv.hs | 52 +- compiler/cmm/CmmContFlowOpt.hs | 95 +++- compiler/cmm/CmmCvt.hs | 2 +- compiler/cmm/CmmExpr.hs | 2 + compiler/cmm/CmmInfo.hs | 110 +++-- compiler/cmm/CmmLayoutStack.hs | 153 ++++-- compiler/cmm/CmmLint.hs | 6 +- compiler/cmm/CmmMachOp.hs | 8 +- compiler/cmm/CmmNode.hs | 36 +- compiler/cmm/CmmOpt.hs | 22 +- compiler/cmm/CmmParse.y | 9 +- compiler/cmm/CmmPipeline.hs | 145 ++++-- compiler/cmm/CmmProcPoint.hs | 26 +- compiler/cmm/CmmRewriteAssignments.hs | 29 +- compiler/cmm/CmmSink.hs | 580 ++++++++++++++------ compiler/cmm/MkGraph.hs | 232 +++++---- compiler/cmm/OldCmm.hs | 20 +- compiler/cmm/PprC.hs | 4 +- compiler/cmm/PprCmm.hs | 2 +- compiler/cmm/PprCmmDecl.hs | 2 - compiler/codeGen/CgCallConv.hs | 76 ++-- compiler/codeGen/CgClosure.lhs | 19 +- compiler/codeGen/CgCon.lhs | 13 +- compiler/codeGen/CgForeignCall.hs | 6 +- compiler/codeGen/CgHeapery.lhs | 12 +- compiler/codeGen/CgInfoTbls.hs | 26 +- compiler/codeGen/CgMonad.lhs | 13 +- compiler/codeGen/CgTailCall.lhs | 14 +- compiler/codeGen/CgUtils.hs | 255 ++------- compiler/codeGen/ClosureInfo.lhs | 37 +- compiler/codeGen/CodeGen/Platform.hs | 67 +++ compiler/codeGen/CodeGen/Platform/ARM.hs | 9 + compiler/codeGen/CodeGen/Platform/NoRegs.hs | 8 + compiler/codeGen/CodeGen/Platform/PPC.hs | 9 + compiler/codeGen/CodeGen/Platform/PPC_Darwin.hs | 10 + compiler/codeGen/CodeGen/Platform/SPARC.hs | 9 + compiler/codeGen/CodeGen/Platform/X86.hs | 9 + compiler/codeGen/CodeGen/Platform/X86_64.hs | 9 + compiler/codeGen/StgCmm.hs | 129 ++--- compiler/codeGen/StgCmmBind.hs | 525 ++++++++++-------- compiler/codeGen/StgCmmClosure.hs | 55 +- compiler/codeGen/StgCmmCon.hs | 71 ++- compiler/codeGen/StgCmmEnv.hs | 29 +- compiler/codeGen/StgCmmExpr.hs | 415 +++++++-------- compiler/codeGen/StgCmmForeign.hs | 38 +- compiler/codeGen/StgCmmHeap.hs | 185 ++++--- compiler/codeGen/StgCmmLayout.hs | 59 ++- compiler/codeGen/StgCmmMonad.hs | 206 +++++--- compiler/codeGen/StgCmmPrim.hs | 2 +- compiler/codeGen/StgCmmProf.hs | 46 +- compiler/codeGen/StgCmmUtils.hs | 498 +++++++---------- compiler/coreSyn/CoreSyn.lhs | 13 + compiler/coreSyn/CoreUtils.lhs | 2 +- compiler/coreSyn/MkCore.lhs | 6 +- compiler/coreSyn/TrieMap.lhs | 111 ++++- compiler/deSugar/Coverage.lhs | 98 +++-- compiler/deSugar/Desugar.lhs | 3 +- compiler/deSugar/DsMeta.hs | 253 ++++++---- compiler/ghc.cabal.in | 8 + compiler/ghc.mk | 14 - compiler/hsSyn/Convert.lhs | 92 ++- compiler/hsSyn/HsExpr.lhs | 2 +- compiler/hsSyn/HsSyn.lhs | 77 ++-- compiler/iface/BinIface.hs | 5 +- compiler/iface/MkIface.lhs | 15 +- compiler/llvmGen/LlvmCodeGen.hs | 8 +- compiler/llvmGen/LlvmCodeGen/Base.hs | 36 +- compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 48 +- compiler/main/CmdLineParser.hs | 12 +- compiler/main/DriverPipeline.hs | 59 +- compiler/main/DynFlags.hs | 55 ++- compiler/main/GHC.hs | 6 + compiler/main/HscMain.hs | 40 +- compiler/main/HscTypes.lhs | 3 +- compiler/main/StaticFlagParser.hs | 27 +- compiler/main/StaticFlags.hs | 13 - compiler/main/SysTools.lhs | 300 ++++++----- compiler/nativeGen/AsmCodeGen.lhs | 75 ++-- compiler/nativeGen/Instruction.hs | 7 +- compiler/nativeGen/PPC/CodeGen.hs | 10 +- compiler/nativeGen/PPC/Instr.hs | 4 +- compiler/nativeGen/PPC/Ppr.hs | 71 ++-- compiler/nativeGen/PPC/Regs.hs | 253 +++++----- compiler/nativeGen/PprInstruction.hs | 2 - compiler/nativeGen/RegAlloc/Graph/Main.hs | 6 +- compiler/nativeGen/RegAlloc/Graph/Spill.hs | 31 +- compiler/nativeGen/RegAlloc/Graph/SpillClean.hs | 2 +- compiler/nativeGen/RegAlloc/Graph/SpillCost.hs | 8 +- compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs | 12 +- .../nativeGen/RegAlloc/Linear/JoinToTargets.hs | 14 +- compiler/nativeGen/RegAlloc/Linear/Main.hs | 110 +++-- compiler/nativeGen/RegAlloc/Linear/X86/FreeRegs.hs | 40 +- compiler/nativeGen/RegAlloc/Liveness.hs | 87 ++-- compiler/nativeGen/SPARC/Instr.hs | 4 +- compiler/nativeGen/SPARC/Ppr.hs | 74 ++-- compiler/nativeGen/SPARC/RegPlate.hs | 2 +- compiler/nativeGen/TargetReg.hs | 10 +- compiler/nativeGen/X86/CodeGen.hs | 16 +- compiler/nativeGen/X86/Instr.hs | 8 +- compiler/nativeGen/X86/Ppr.hs | 98 ++-- compiler/nativeGen/X86/Regs.hs | 183 +++---- compiler/parser/Parser.y.pp | 6 +- compiler/rename/RnEnv.lhs | 15 +- compiler/rename/RnNames.lhs | 210 +++++--- compiler/rename/RnTypes.lhs | 26 +- compiler/simplCore/FloatOut.lhs | 2 +- compiler/simplCore/Simplify.lhs | 374 +++++++------- compiler/specialise/Rules.lhs | 7 +- compiler/specialise/SpecConstr.lhs | 6 +- compiler/specialise/Specialise.lhs | 12 +- compiler/stgSyn/StgSyn.lhs | 10 +- compiler/typecheck/TcBinds.lhs | 57 ++- compiler/typecheck/TcCanonical.lhs | 12 +- compiler/typecheck/TcEvidence.lhs | 23 +- compiler/typecheck/TcHsSyn.lhs | 2 +- compiler/typecheck/TcHsType.lhs | 12 +- compiler/typecheck/TcInstDcls.lhs | 4 +- compiler/typecheck/TcMType.lhs | 44 ++- compiler/typecheck/TcPat.lhs | 10 +- compiler/typecheck/TcRnTypes.lhs | 2 +- compiler/typecheck/TcSimplify.lhs | 84 +--- compiler/typecheck/TcTyClsDecls.lhs | 19 +- compiler/utils/Fingerprint.hsc | 7 - compiler/utils/Outputable.lhs | 32 +- compiler/utils/Platform.hs | 1 + compiler/utils/UniqFM.lhs | 175 +++--- configure.ac | 33 +- distrib/configure.ac.in | 12 + docs/users_guide/ghci.xml | 14 +- docs/users_guide/glasgow_exts.xml | 148 ++++-- docs/users_guide/intro.xml | 14 +- docs/users_guide/using.xml | 19 +- ghc/InteractiveUI.hs | 58 +-- ghc/Main.hs | 21 +- ghc/hschooks.c | 8 + includes/Cmm.h | 3 +- includes/CodeGen.Platform.hs | 152 +++++ includes/HaskellConstants.hs | 3 +- includes/Rts.h | 2 + includes/Stg.h | 2 +- includes/rts/prof/CCS.h | 9 + includes/rts/storage/ClosureMacros.h | 60 ++- includes/stg/HaskellMachRegs.h | 47 ++ includes/stg/MachRegs.h | 64 +-- includes/stg/RtsMachRegs.h | 47 ++ mk/build.mk.sample | 27 - mk/config.mk.in | 22 +- rts/Interpreter.c | 2 +- rts/Linker.c | 72 +++- rts/Printer.c | 2 +- rts/Profiling.c | 3 +- rts/Proftimer.c | 8 +- rts/Proftimer.h | 5 - rts/RaiseAsync.c | 2 +- rts/Schedule.c | 52 ++- rts/posix/OSThreads.c | 6 +- rts/posix/Select.c | 17 +- rts/sm/BlockAlloc.c | 37 ++- rts/sm/BlockAlloc.h | 2 + rts/sm/Compact.c | 6 +- rts/sm/Evac.c | 6 +- rts/sm/GC.c | 62 +-- rts/sm/MarkWeak.c | 23 +- rts/sm/Sanity.c | 8 +- rts/sm/Storage.c | 47 ++- rts/sm/Storage.h | 4 +- rules/build-package-way.mk | 2 +- rules/haddock.mk | 3 +- settings.in | 5 + utils/genapply/GenApply.hs | 2 +- utils/ghc-cabal/Main.hs | 3 +- utils/ghc-cabal/ghc-cabal.cabal | 1 + 177 files changed, 5330 insertions(+), 3947 deletions(-) diff --cc configure.ac index 36b1bb4,4ca64f2..4b94580 --- a/configure.ac +++ b/configure.ac @@@ -555,24 -567,15 +578,28 @@@ dnl ** look to see if we have a C compi dnl FP_CC_LLVM_BACKEND +dnl ** figure out how to invoke cpp directly (gcc -E is no good) +AC_PROG_CPP + FP_PROG_LD_HashSize31 FP_PROG_LD_ReduceMemoryOverheads + FP_PROG_LD_IS_GNU + FP_PROG_LD_BUILD_ID + FP_PROG_LD_NO_COMPACT_UNWIND + -FPTOOLS_SET_C_LD_FLAGS([target],[CFLAGS],[LDFLAGS],[IGNORE_LINKER_LD_FLAGS],[CPPFLAGS]) FPTOOLS_SET_C_LD_FLAGS([build],[CONF_CC_OPTS_STAGE0],[CONF_GCC_LINKER_OPTS_STAGE0],[CONF_LD_LINKER_OPTS_STAGE0],[CONF_CPP_OPTS_STAGE0]) +if test x"$TargetPlatform" != x"$HostPlatform"; then + cross_compiling=yes + if test x"$TargetCC" != x; then + unset CFLAGS + CC="$TargetCC" + fi + FPTOOLS_SET_C_LD_FLAGS([target],[CFLAGS],[LDFLAGS],[IGNORE_LINKER_LD_FLAGS],[CPPFLAGS]) + FPTOOLS_SET_C_LD_FLAGS([target],[CONF_CC_OPTS_STAGE1],[CONF_GCC_LINKER_OPTS_STAGE1],[CONF_LD_LINKER_OPTS_STAGE1],[CONF_CPP_OPTS_STAGE1]) + +else +FPTOOLS_SET_C_LD_FLAGS([target],[CFLAGS],[LDFLAGS],[IGNORE_LINKER_LD_FLAGS],[CPPFLAGS]) FPTOOLS_SET_C_LD_FLAGS([target],[CONF_CC_OPTS_STAGE1],[CONF_GCC_LINKER_OPTS_STAGE1],[CONF_LD_LINKER_OPTS_STAGE1],[CONF_CPP_OPTS_STAGE1]) # Stage 3 won't be supported by cross-compilation FPTOOLS_SET_C_LD_FLAGS([target],[CONF_CC_OPTS_STAGE2],[CONF_GCC_LINKER_OPTS_STAGE2],[CONF_LD_LINKER_OPTS_STAGE2],[CONF_CPP_OPTS_STAGE2]) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
