On Mon, Dec 06, 2010 at 12:39:38PM +1100, Ben Lippmeier wrote: > > After we applied the latest OSX patches to our server, my build is now dying > like so:
Can you test whether the attached patch fixes it please? Thanks Ian
4 patches for repository http://darcs.haskell.org/ghc: Mon Dec 6 20:31:25 GMT 2010 Ian Lynagh <ig...@earth.li> * Correct the stage that the includes/ tools are built in Mon Dec 6 20:33:29 GMT 2010 Ian Lynagh <ig...@earth.li> * Link even programs containing no Haskell modules with GHC I don't remember why we made it use gcc instead, but going back to using ghc doesn't seem to break anything, and should fix the build on OS X 10.6. Mon Dec 6 21:52:01 GMT 2010 Ian Lynagh <ig...@earth.li> * Add a configure message Mon Dec 6 23:30:38 GMT 2010 Ian Lynagh <ig...@earth.li> * Make CPPFLAGS variables, as well as CFLAGS and LDFLAGS This fixes the "does unsetenv return void" test in the unix package on OS X, if I tell it to make 10.4-compatible binaries. The test uses CPPFLAGS but not CFLAGS, so it thought it returned int (as it was in 10.5-mode), but the C compiler (using CFLAGS, so in 10.4 mode) thought it returned void. I also added CONF_LD_OPTS_STAGE$3 to the list of things in LDFLAGS, which looks like an accidental ommission. New patches: [Correct the stage that the includes/ tools are built in Ian Lynagh <ig...@earth.li>**20101206203125] { hunk ./includes/ghc.mk 130 includes_dist-derivedconstants_C_SRCS = mkDerivedConstants.c includes_dist-derivedconstants_PROG = mkDerivedConstants$(exeext) -$(eval $(call build-prog,includes,dist-derivedconstants,1)) +$(eval $(call build-prog,includes,dist-derivedconstants,0)) $(includes_dist-derivedconstants_depfile_c_asm) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(wildcard includes/*.h) $(wildcard rts/*.h) includes/dist-derivedconstants/build/mkDerivedConstants.o : $(includes_H_CONFIG) $(includes_H_PLATFORM) hunk ./includes/ghc.mk 159 includes_dist-ghcconstants_PROG = mkGHCConstants$(exeext) includes_dist-ghcconstants_CC_OPTS = -DGEN_HASKELL -$(eval $(call build-prog,includes,dist-ghcconstants,1)) +$(eval $(call build-prog,includes,dist-ghcconstants,0)) ifneq "$(BINDIST)" "YES" $(includes_dist-ghcconstants_depfile_c_asm) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(wildcard includes/*.h) $(wildcard rts/*.h) } [Link even programs containing no Haskell modules with GHC Ian Lynagh <ig...@earth.li>**20101206203329 I don't remember why we made it use gcc instead, but going back to using ghc doesn't seem to break anything, and should fix the build on OS X 10.6. ] { hunk ./rules/build-prog.mk 125 $1_$2_LINK_WITH_GCC = NO ifeq "$$(BootingFromHc)" "YES" $1_$2_LINK_WITH_GCC = YES -endif -ifeq "$$($1_$2_v_HS_OBJS)" "" -$1_$2_LINK_WITH_GCC = YES endif ifeq "$$($1_$2_LINK_WITH_GCC)" "NO" } [Add a configure message Ian Lynagh <ig...@earth.li>**20101206215201] { hunk ./aclocal.m4 12 # Set the C and LD flags for a given platform AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS], [ + AC_MSG_CHECKING([Setting up $2 and $3]) case $$1 in i386-apple-darwin) # By default, gcc on OS X will generate SSE hunk ./aclocal.m4 44 $2="$$2 -fno-stack-protector" fi rm -f conftest.c conftest.o + AC_MSG_RESULT([done]) ]) } [Make CPPFLAGS variables, as well as CFLAGS and LDFLAGS Ian Lynagh <ig...@earth.li>**20101206233038 Ignore-this: 4b07321a2a3f7b7a54b9f5681da40e09 This fixes the "does unsetenv return void" test in the unix package on OS X, if I tell it to make 10.4-compatible binaries. The test uses CPPFLAGS but not CFLAGS, so it thought it returned int (as it was in 10.5-mode), but the C compiler (using CFLAGS, so in 10.4 mode) thought it returned void. I also added CONF_LD_OPTS_STAGE$3 to the list of things in LDFLAGS, which looks like an accidental ommission. ] { hunk ./aclocal.m4 12 # Set the C and LD flags for a given platform AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS], [ - AC_MSG_CHECKING([Setting up $2 and $3]) + AC_MSG_CHECKING([Setting up $2, $3 and $4]) case $$1 in i386-apple-darwin) # By default, gcc on OS X will generate SSE hunk ./aclocal.m4 21 # back to generic i686 compatibility. Trac #2983. $2="$$2 -march=i686 -m32" $3="$$3 -march=i686 -m32" + $4="$$4 -march=i686 -m32" ;; x86_64-apple-darwin) $2="$$2 -m64" hunk ./aclocal.m4 26 $3="$$3 -m64" + $4="$$4 -m64" ;; esac hunk ./aclocal.m4 35 # We support back to OS X 10.5 $2="$$2 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" $3="$$3 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" + $4="$$4 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" ;; esac hunk ./configure.ac 532 dnl FP_HAVE_GCC -FPTOOLS_SET_C_LD_FLAGS([target],[CFLAGS],[LDFLAGS]) -FPTOOLS_SET_C_LD_FLAGS([build],[CONF_CC_OPTS_STAGE0],[CONF_LD_OPTS_STAGE0]) -FPTOOLS_SET_C_LD_FLAGS([target],[CONF_CC_OPTS_STAGE1],[CONF_LD_OPTS_STAGE1]) +FPTOOLS_SET_C_LD_FLAGS([target],[CFLAGS],[LDFLAGS],[CPPFLAGS]) +FPTOOLS_SET_C_LD_FLAGS([build],[CONF_CC_OPTS_STAGE0],[CONF_LD_OPTS_STAGE0],[CONF_CPP_OPTS_STAGE0]) +FPTOOLS_SET_C_LD_FLAGS([target],[CONF_CC_OPTS_STAGE1],[CONF_LD_OPTS_STAGE1],[CONF_CPP_OPTS_STAGE1]) # Stage 3 won't be supported by cross-compilation hunk ./configure.ac 536 -FPTOOLS_SET_C_LD_FLAGS([target],[CONF_CC_OPTS_STAGE2],[CONF_LD_OPTS_STAGE2]) +FPTOOLS_SET_C_LD_FLAGS([target],[CONF_CC_OPTS_STAGE2],[CONF_LD_OPTS_STAGE2],[CONF_CPP_OPTS_STAGE2]) FP_GCC_EXTRA_FLAGS hunk ./rules/build-package-data.mk 42 # for a feature it may not generate warning-free C code, and thus may # think that the feature doesn't exist if -Werror is on. $1_$2_CONFIGURE_OPTS += --configure-option=CFLAGS="$$(filter-out -Werror,$$(SRC_CC_OPTS)) $$(CONF_CC_OPTS_STAGE$3) $$($1_CC_OPTS) $$($1_$2_CC_OPTS)" -$1_$2_CONFIGURE_OPTS += --configure-option=LDFLAGS="$$(SRC_LD_OPTS) $$($1_LD_OPTS) $$($1_$2_LD_OPTS)" +$1_$2_CONFIGURE_OPTS += --configure-option=LDFLAGS="$$(SRC_LD_OPTS) $$(CONF_LD_OPTS_STAGE$3) $$($1_LD_OPTS) $$($1_$2_LD_OPTS)" +$1_$2_CONFIGURE_OPTS += --configure-option=CPPFLAGS="$$(SRC_CPP_OPTS) $$(CONF_CPP_OPTS_STAGE$3) $$($1_CPP_OPTS) $$($1_$2_CPP_OPTS)" ifneq "$$(ICONV_INCLUDE_DIRS)" "" $1_$2_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="$$(ICONV_INCLUDE_DIRS)" } Context: [throwTo: report the why_blocked value in the barf() Simon Marlow <marlo...@gmail.com>**20101203094840 Ignore-this: 3b167c581be1c51dfe3586cc6359e1d0 ] [handle ThreadMigrating in throwTo() (#4811) Simon Marlow <marlo...@gmail.com>**20101203094818 Ignore-this: 8ef8cb7fd3b50a27f83c29968131d461 If a throwTo targets a thread that has just been created with forkOnIO, then it is possible the exception strikes while the thread is still in the process of migrating. throwTo() didn't handle this case, but it's fairly straightforward. ] [removeThreadFromQueue: stub out the link field before returning (#4813) Simon Marlow <marlo...@gmail.com>**20101202160838 Ignore-this: 653ae17bc1120d7f4130da94665002a1 ] [small tidyup Simon Marlow <marlo...@gmail.com>**20101126140620 Ignore-this: 70b1d5ed4c81a7b29dd5980a2d84aae1 ] [Fix a recomp bug: make classes/datatypes depend directly on DFuns (#4469) Simon Marlow <marlo...@gmail.com>**20101202122349 Ignore-this: 61c765583bb1d97caa88cf9b4f45b87c And remove the old mechanism of recording dfun uses separately, because it didn't work. This wiki page describes recompilation avoidance and fingerprinting. I'll update it to describe the new method and what went wrong with the old method: http://hackage.haskell.org/trac/ghc/wiki/Commentary/Compiler/RecompilationAvoidance ] [make a panic message more informative and suggest -dcore-lint (see #4534) Simon Marlow <marlo...@gmail.com>**20101201151706 Ignore-this: 2a10761925d6f9f52675948baa30f7a ] [A little refactoring (remove redundant argument passed to isGoodRecEv) simo...@microsoft.com**20101202123110 Ignore-this: e517c5c12109a230f08dafb4d1e386df ] [Make rebindable if-then-else a little more permissive simo...@microsoft.com**20101202122540 Ignore-this: ddb552cfe307607b42d1e4baf4e3bf21 See Note [Rebindable syntax for if]. Fixes Trac #4798. Thanks to Nils Schweinsberg <m...@n-sch.de> ] [Improve error message (Trac #4799) simo...@microsoft.com**20101202102706 Ignore-this: d9896e4d182936de1f256c820b96a8cf ] [Fix a nasty bug in RULE matching: Trac #4814 simo...@microsoft.com**20101202102618 Ignore-this: ba058ad46a02bd2faf3a14de93fd19c6 See Note [Matching lets], which explains it all in detail. It took me a day to think of a nice way to fix the bug, but I think the result is quite respectable. Subtle, though. ] [Fix the behaviour of :history for ticks surrounding top level functions pepeibo...@gmail.com**20101203202346 Ignore-this: 8059d4859c52c0c9a235b937cb8cde1d ] [Rename -XPArr to -XParallelArrays Ben Lippmeier <b...@ouroborus.net>**20101130075415 Ignore-this: 21b37680a7f25800d1200b59ad0b6b39 ] [Don't warn of duplicate exports in case of module exports. Michal Terepeta <michal.terep...@gmail.com>**20101127212116 Ignore-this: ea225d517826f971c400bbb68d1405b8 But only when the module exports refer to different modules. See ticket #4478. ] [Fix whitespace/layout in RnNames. Michal Terepeta <michal.terep...@gmail.com>**20101030171303 Ignore-this: 707a7955fc4fc51683cc5a1dfe57f93 ] [Tell gcc to support back to OS X 10.5 Ian Lynagh <ig...@earth.li>**20101203201558 Ignore-this: f02d70e5b9cce50137981c6cb2b62a18 ] [Make RelaxedLayout off by default Ian Lynagh <ig...@earth.li>**20101202140808 I suspect this is a vary rarely used extension to the official layout rule. ] [FIX #1845 (unconditional relative branch out of range) p...@cielonegro.org**20101130143014 Ignore-this: df234bd8ad937104c455656fe3c33732 Don't use mmap on powerpc-apple-darwin as mmap doesn't support reallocating but we need to allocate jump islands just after each object images. Otherwise relative branches to jump islands can fail due to 24-bits displacement overflow. ] [rts/Linker.c (loadArchive): p...@cielonegro.org**20101130142700 Ignore-this: bc84f9369ce5c2d289440701b7a3a2ab This routine should be aware of Mach-O misalignment of malloc'ed memory regions. ] [rts/Linker.c (machoGetMisalignment): p...@cielonegro.org**20101130123355 Ignore-this: 75425600049efd587e9873578e26392f Use fseek(3) instead of rewind(3) to move the file position indicator back to the initial position. Otherwise we can't use this function in loadArchive(). ] [rts/Linker.c (ocFlushInstructionCache): p...@cielonegro.org**20101130121425 Ignore-this: 1e2c207e4b1d17387617ec5d645204b7 I found this function causes a segfault when ocAllocateSymbolExtras() has allocated a separate memory region for jump islands. ] [fix ref to utils/ext-core, which moved to Hackage (extcore package) Simon Marlow <marlo...@gmail.com>**20101201092147 Ignore-this: 272a7daaa335ef60bcc645db70b4d68b ] [fix floating-point/FFI section: fenv is C99, not POSIX Simon Marlow <marlo...@gmail.com>**20101201092119 Ignore-this: ce8b3edd428e4f77691dd739b5b4ae73 ] [Fixed some 'unused vars' warnings kel...@cse.unsw.edu.au**20101130013425 Ignore-this: 35790d443faa23b87e4ba442e62376a3 ] [vectScalarLam handles int, float, and double now kel...@cse.unsw.edu.au**20101129231043 Ignore-this: 6d67bdc8dd8577184040e791e6f3d0 ] [Handling of lets, letrec and case when checking if a lambda expr needs to be vectorised kel...@cse.unsw.edu.au**20101115051225 Ignore-this: 1db6ed63d7b3f6d093e019322b407ff7 ] [Document the behaviour of fenv.h functions with GHC (#4391) Simon Marlow <marlo...@gmail.com>**20101126125336 Ignore-this: bc4eab49428d567505a28add6fed90f1 ] [Inherit the ForceSpecConstr flag in non-recursive nested bindings Roman Leshchinskiy <r...@cse.unsw.edu.au>**20101127125025 Ignore-this: 401391eae25cefcb4afaba2e357decc1 This makes sure that join points are fully specialised in loops which are marked as ForceSpecConstr. ] [Document -ddump-rule-firings and -ddump-rule-rewrites Roman Leshchinskiy <r...@cse.unsw.edu.au>**20101127123528 Ignore-this: beade2efe0cd767c0ce9d4f45a3380ba ] [New flag -dddump-rule-rewrites Roman Leshchinskiy <r...@cse.unsw.edu.au>**20101127122022 Ignore-this: c0ef5b8a199fbd1ef020258d2cde85a3 Now, -ddump-rule-firings only shows the names of the rules that fired (it would show "before" and "after" with -dverbose-core2core previously) and -ddump-rule-rewrites always shows the "before" and "after" bits, even without -dverbose-core2core. ] [Remove NewQualifiedOperators Ian Lynagh <ig...@earth.li>**20101201181117 The extension was rejected by Haskell', and deprecated in 7.0. ] [Remove the no-ghci-lib warning in ghc-pkg Ian Lynagh <ig...@earth.li>**20101127235805 GHCi libs are no longer necessary, as we can use the .a or .so versions instead. ] [Add GNU-variant support to the .a parser, and other improvements/tidyups Ian Lynagh <ig...@earth.li>**20101127223945] [Re-indent only Ian Lynagh <ig...@earth.li>**20101127191646] [Improve linker debugging for archive files Ian Lynagh <ig...@earth.li>**20101127190907] [Always enable the archive-loading code Ian Lynagh <ig...@earth.li>**20101127173000 If the GHCi .o lib doesn't exist, load the .a instead ] [Acutally, wild-card variables *can* have occurrences simo...@microsoft.com**20101126162409 Ignore-this: 544bffed75eeccef03a1097f98524eea This patch removes the Lint test, and comments why ] [Tidy up the handling of wild-card binders, and make Lint check it simo...@microsoft.com**20101126133210 Ignore-this: 9e0be9f7867d53046ee5b0e478a0f433 See Note [WildCard binders] in SimplEnv. Spotted by Roman. ] [Substitution should just substitute, not optimise simo...@microsoft.com**20101125172356 Ignore-this: 657628d9b6796ceb5f915c43d56e4a06 This was causing Trac #4524, by optimising (e |> co) to e on the LHS of a rule. Result, the template variable 'co' wasn't bound any more. Now that substition doesn't optimise, it seems sensible to call simpleOptExpr rather than substExpr when substituting in the RHS of rules. Not a big deal either way. ] [Make SpecConstr "look through" identity coercions simo...@microsoft.com**20101125172138 Ignore-this: c1cc585ed890a7702c33987e971e0af6 ] [Comment only simo...@microsoft.com**20101125172011 Ignore-this: 3c7be8791badd00dcca9610ebb8981d1 ] [White space only simo...@microsoft.com**20101101080748 Ignore-this: f7133fc6b22ae263c6672543a8534a6f ] [Keep a maximum of 6 spare worker threads per Capability (#4262) Simon Marlow <marlo...@gmail.com>**20101125135729 Ignore-this: a020786569656bf2f3a1717b65d463bd ] [Unicide OtherNumber category should be allowed in identifiers (#4373) Simon Marlow <marlo...@gmail.com>**20101115095444 Ignore-this: e331b6ddb17550163ee91bd283348800 ] [vectoriser: fix warning Ben Lippmeier <b...@ouroborus.net>**20101126044036 Ignore-this: e1a66bb405bf2f3f56b42c3b13fd4bf3 ] [vectoriser: fix warning Ben Lippmeier <b...@ouroborus.net>**20101126042950 Ignore-this: df8dd25bcfb3946c2974b13953a2f2c7 ] [vectoriser: take class directly from the instance tycon Ben Lippmeier <b...@ouroborus.net>**20101126042900 Ignore-this: 626a416717a5a059f39e53f4ec95fc66 ] [vectoriser: comments only Ben Lippmeier <b...@ouroborus.net>**20101125073201 Ignore-this: 8846ea8895307083bd1ebbc5d7fb1c5 ] [vectoriser: follow changes in mkClass Ben Lippmeier <b...@ouroborus.net>**20101125062349 Ignore-this: d5018cc022686d4272e126ca9a12283a ] [vectoriser: tracing wibbles Ben Lippmeier <b...@ouroborus.net>**20101125062332 Ignore-this: c2024d8f03bc03bee2851f4f1c139fd5 ] [mkDFunUnfolding wants the type of the dfun to be a PredTy b...@ouroborus.net**20100914062939 Ignore-this: 7aa6e6b140746184cf00355b50c83b66 ] [vectoriser: fix conflicts Ben Lippmeier <b...@ouroborus.net>**20101125060904 Ignore-this: cc3decab1affada8629ca3818b76b3bf ] [Comments and formatting only b...@ouroborus.net**20100914062903 Ignore-this: b0fc25f0952cafd56cc25353936327d4 ] [Comments and formatting to type environment vectoriser b...@ouroborus.net**20100909080405 Ignore-this: ab8549d53f845c9d82ed9a525fda3906 ] [Don't mix implicit and explicit layout Ian Lynagh <ig...@earth.li>**20101124231514] [Whitespace only Ian Lynagh <ig...@earth.li>**20101124230655] [Separate NondecreasingIndentation out into its own extension Ian Lynagh <ig...@earth.li>**20101124220507] [Add another GHC layout rule relaxation to RelaxedLayout Ian Lynagh <ig...@earth.li>**20101124205957] [Remove an unused build system variable: GhcDir Ian Lynagh <ig...@earth.li>**20101124140455] [Remove unused build system variable: GhcHasEditline Ian Lynagh <ig...@earth.li>**20101124140415] [Remove unused variables from the build system: HBC, NHC, MKDEPENDHS Ian Lynagh <ig...@earth.li>**20101124140052] [Remove references to Haskell 98 Ian Lynagh <ig...@earth.li>**20101123233536 They are no longer right, as we have Haskell' generating new Haskell standards. ] [sanity: fix places where we weren't filling fresh memory with 0xaa Simon Marlow <marlo...@gmail.com>**20101029092843 Ignore-this: 2cb18f7f5afcaf33371aeffce67e218f ] [Tweak a configure test Ian Lynagh <ig...@earth.li>**20101123170621] [Add a configure test for the visibility hidden attribute Ian Lynagh <ig...@earth.li>**20101123170541] [Just some alpha renaming Ian Lynagh <ig...@earth.li>**20101121144455 Ignore-this: d5e807c5470840efc199e29f7d50804c ] [Fix bug #3165 (:history throws irrefutable pattern failed) pepeibo...@gmail.com**20101115223623 Ignore-this: 73edf56e502b4d0385bc044133b27946 I ran across this bug and took the time to fix it, closing a long time due TODO in InteractiveEval.hs Instead of looking around to find the enclosing declaration of a tick, this patch makes use of the information already collected during the coverage desugaring phase ] [For bindists, build ghc-pwd with stage 1 Ian Lynagh <ig...@earth.li>**20101121183520 Ignore-this: a3b5c8b78c81ec1b6d5fbf23da346ff5 rather then the bootstrapping compiler. This fixes problems where the bootstrapping compiler dynamically links against libraries not on the target machine. ] [Makefile tweak Ian Lynagh <ig...@earth.li>**20101121183342 Ignore-this: cd55a2819c1a5fd36da1bc7a75d2ded1 ] [Fix a makefile include ordering sanity check Ian Lynagh <ig...@earth.li>**20101121174916 Ignore-this: d0bdd41c4b618944d04ecb4f54fdd0f1 ] [Add an extension for GHC's layout-rule relaxations Ian Lynagh <ig...@earth.li>**20101120215340 Still TODO: Add the other relaxation (#1060) and update the alternative layout rule to use the extension. ] [Tweak the bindist configure.ac.in Ian Lynagh <ig...@earth.li>**20101120173735] [configure.ac tweaks Ian Lynagh <ig...@earth.li>**20101120170245] [When testing the bindist, tell it where gcc is Ian Lynagh <ig...@earth.li>**20101120155920 The location isn't baked into the bindist, as it may differ from machine to machine. ] [Comments only simo...@microsoft.com**20101119100153 Ignore-this: 7abd5d965ea805770449d6f8dadbb921 ] [ForceSpecConstr now forces specialisation even for arguments which aren't scrutinised Roman Leshchinskiy <r...@cse.unsw.edu.au>**20101118212839 Ignore-this: db45721d29a694e53746f8b76513efa4 ] [Move the superclass generation to the canonicaliser simo...@microsoft.com**20101118120533 Ignore-this: 5e0e525402a240b709f2b8104c1682b2 Doing superclass generation in the canonicaliser (rather than TcInteract) uses less code, and is generally more efficient. See Note [Adding superclasses] in TcCanonical. Fixes Trac #4497. ] [Fix the generation of in-scope variables for IfaceLint check simo...@microsoft.com**20101118090057 Ignore-this: bbcdba61ddf89d07fe69ca99c2017e3f ] [Comments only simo...@microsoft.com**20101118090034 Ignore-this: fa2936d35a0f7be4e4535ea9e2b7bf7b ] [Omit bogus test for -XDeriveFunctor simo...@microsoft.com**20101118090028 Ignore-this: a534243011809ebbb788b910961601c5 It was duplicated in the case of 'deriving( Functor )' and wrong for 'deriving( Foldable )' ] [Improve error message on advice from a user simo...@microsoft.com**20101118085306 Ignore-this: bd4f3858ff24e602e985288f27d536f3 See Trac #4499 ] [TAG 2010-11-18 Ian Lynagh <ig...@earth.li>**20101118011554 Ignore-this: ccadbe7fadd1148d2ee3caa8c8821ec5 ] Patch bundle hash: 4c1ddbe036bc4252f6e22b8033ac7cb4b3ed4cb1
_______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
