1 patch for repository http://darcs.haskell.org/ghc-7.0/ghc:
Mon Dec 6 15:04:13 EST 2010 gwri...@antiope.com
* Filter out -optP-traditional from cmm build options
The build fails if SRC_HC_OPTS contains -optP-traditional because
making .cmm files requires stripping out comments, which the
-traditional flag prevents. However, If the preprocessor is specified
explicitly using the -pgmP option, the -traditional
flag is usually required. The minimal fix seems to be to filter
out the -traditional flags when building .cmm files.
New patches:
[Filter out -optP-traditional from cmm build options
gwri...@antiope.com**20101206200413
Ignore-this: a9ff133aa60f3b66af10b44d4e68a7e8
The build fails if SRC_HC_OPTS contains -optP-traditional because
making .cmm files requires stripping out comments, which the
-traditional flag prevents. However, If the preprocessor is specified
explicitly using the -pgmP option, the -traditional
flag is usually required. The minimal fix seems to be to filter
out the -traditional flags when building .cmm files.
] {
hunk ./rules/cmm-suffix-rules.mk 25
ifneq "$$(BootingFromHc)" "YES"
+# Below is an unfortunate hack. Expliciting invoking the preprocessor
+# breaks the delicate option invocation of the default case. Passing
+# "-traditional" as an argument breaks building .cmm files, because .cmm
+# files need to have comments stripped out. However, the "-traditional"
+# argument is required in most other cases. So it is filtered out.
+
$1/$2/build/%.$$($3_way_)o : $1/%.cmm $$(rts_H_FILES) $$($1_$2_HC_DEP) | $$$$(dir $$$$@)/.
hunk ./rules/cmm-suffix-rules.mk 32
- "$$($1_$2_HC)" $$($1_$2_$3_MOST_HC_OPTS) -c $$< -o $$@
+ "$$($1_$2_HC)" $$(filter-out -optP-traditional,$$($1_$2_$3_MOST_HC_OPTS)) -c $$< -o $$@
$1/$2/build/%.$$($3_way_)o : $1/$2/build/%.cmm $$(rts_H_FILES) $$($1_$2_HC_DEP) | $$$$(dir $$$$@)/.
hunk ./rules/cmm-suffix-rules.mk 35
- "$$($1_$2_HC)" $$($1_$2_$3_MOST_HC_OPTS) -c $$< -o $$@
+ "$$($1_$2_HC)" $$(filter-out -optP-traditional,$$($1_$2_$3_MOST_HC_OPTS)) -c $$< -o $$@
$1/$2/build/%.$$($3_way_)hc : $1/%.cmm $$(rts_H_FILES) $$($1_$2_HC_DEP) | $$$$(dir $$$$@)/.
hunk ./rules/cmm-suffix-rules.mk 38
- "$$($1_$2_HC)" $$($1_$2_$3_MOST_HC_OPTS) -C $$< -o $$@
+ "$$($1_$2_HC)" $$(filter-out -optP-traditional,$$($1_$2_$3_MOST_HC_OPTS)) -C $$< -o $$@
$1/$2/build/%.$$($3_way_)hc : $1/$2/build/%.cmm $$(rts_H_FILES) $$($1_$2_HC_DEP) | $$$$(dir $$$$@)/.
hunk ./rules/cmm-suffix-rules.mk 41
- "$$($1_$2_HC)" $$($1_$2_$3_MOST_HC_OPTS) -C $$< -o $$@
+ "$$($1_$2_HC)" $$(filter-out -optP-traditional,$$($1_$2_$3_MOST_HC_OPTS)) -C $$< -o $$@
# XXX
# When we started using "| $$$$(dir $$$$@)/." for directory deps, these
}
Context:
[Tell gcc to support back to OS X 10.5
Ian Lynagh <ig...@earth.li>**20101203201558
Ignore-this: f02d70e5b9cce50137981c6cb2b62a18
]
[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.
]
[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.
]
[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
]
[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 (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
]
[Document the behaviour of fenv.h functions with GHC (#4391)
Simon Marlow <marlo...@gmail.com>**20101126125336
Ignore-this: bc4eab49428d567505a28add6fed90f1
]
[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.
]
[Allow the old [$foo| ... |] syntax for quasi-quotes
simo...@microsoft.com**20101112083052
Ignore-this: 868e0e07fc6bbc9772bcba54e8ca79d
This is just a backward-compatibility thing, to be removed
eventually.
]
[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
]
[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.
]
[Add -fwarn-lazy-unlifted-bindings to the list of flags
simo...@microsoft.com**20101116172211
Ignore-this: 4f150f347bb74027adacb64545f6b757
]
[Improve documentation for -fwarn-incomplete-patterns
simo...@microsoft.com**20101116171527
Ignore-this: d8386202cc322207436db0c5b185dab
]
[Eventlog: Put correct size for startup event
sc...@leeds.ac.uk**20101105151655
Ignore-this: 8b6eb4fa2137c8dfe50c5917e3a609a7
]
[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 )'
]
[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.
]
[Improve error message on advice from a user
simo...@microsoft.com**20101118085306
Ignore-this: bd4f3858ff24e602e985288f27d536f3
See Trac #4499
]
[Buglet in tcIface, now that nested binders can have pragmas
simo...@microsoft.com**20101027184235
Ignore-this: de2db50370c35b8ae92ec2574d806b33
This fix ties the knot for recursive groups properly
]
[Fix initialisation of strictness in the demand analyser
simo...@microsoft.com**20101026081757
Ignore-this: d89b117caa95b51b6c24584ac03bedf6
Previously, the demand analyser assumed that every binder
starts off with no strictness info. But now that we are
preserving strictness on nesting bindings in interface files,
that assumption is no longer correct, because an inlined function
might have a nested binding with strictness set.
So we need to know when we are in the initial sweep, so that we can
set the strictness to 'bottom'.
See Note [Initialising strictness]
]
[Fix the generation of in-scope variables for IfaceLint check
simo...@microsoft.com**20101118090057
Ignore-this: bbcdba61ddf89d07fe69ca99c2017e3f
]
[Serialise nested unfoldings across module boundaries
simo...@microsoft.com**20101025152817
Ignore-this: 1520586f152501d4acb084ebf9cd3136
As Roman reported in #4428, nested let-bindings weren't
being recorded with their unfoldings. Needless to say,
fixing this had more knock-on effects than I expected.
]
[Nicer error message for #3782
b...@ouroborus.net**20101029063320
Ignore-this: fc746cad57410123a29f37f61f13dd3c
It now says:
ghc-stage2: sorry! (this is work in progress)
(GHC version 7.1.20101028 for i386-apple-darwin):
Vectorise.Builtins.indexBuiltin
DPH builtin function 'sumTyCon' of size '11' is not yet implemented.
This function does not appear in your source program, but it is needed
to compile your code in the backend. This is a known, current limitation
of DPH. If you want it to to work you should send mail to cvs-ghc@haskell.org
and ask what you can do to help (it might involve some GHC hacking).
I added 'pprSorry' that behaves like 'pprPanic' except it say sorry! instead
of panic!, and doesn't ask the user to report a bug.
]
[Build system tweak: Inline DQ now it's the same on all platforms
Ian Lynagh <ig...@earth.li>**20101114134636]
[Update to docbook 4.5; fixes trac #4447
Ian Lynagh <ig...@earth.li>**20101114155023]
[Fix -fwarn-missing-import-lists (fix Trac #4489)
simo...@microsoft.com**20101115232142
Ignore-this: 656b3a76540a488a7111ba7c9ec8ebc4
]
[Ensure that instance overlap errors are report properly
simo...@microsoft.com**20101115142805
Ignore-this: 2fca29a95bdc69a4c783cbcc663a10f7
This (annoyingly) requires us to re-flatten the class predicate.
See Note [Flattening in error message generation]
]
[Fix Trac #4501: a transposition error in DynFlags
simo...@microsoft.com**20101117100832
Ignore-this: b81eca419581a7cec773556514915814
Push to STABLE
]
[Fix Trac #4498: bang-pattern bindings are monomorphic
simo...@microsoft.com**20101117101058
Ignore-this: 2a739aeca590b4dd1907078ba80133ff
This patch forces bang patterns to be monomorphic,
and documents this fact.
]
[Ensure that unification variables alloc'd during solving are untouchable
simo...@microsoft.com**20101115121540
Ignore-this: 4cdb38180488e605489ce5d018998089
This fixes Trac #4494. See Note [Extra TcsTv untouchables] in TcSimplify.
]
[Document SPECIALISE for imported functions
simo...@microsoft.com**20101117111559
Ignore-this: 5c9e83d15b85fe5a8639321e00e5dcaa
This is a really useful new facility, but I'd forgotten to document it.
Pls merge to 7.0 branch
]
[Add a build system dependency; fixes #4357
Ian Lynagh <ig...@earth.li>**20101114140311]
[Set RELEASE to NO
Ian Lynagh <ig...@earth.li>**20101117141621]
[TAG GHC 7.0.1 release
Ian Lynagh <ig...@earth.li>**20101117140118
Ignore-this: ac737bfbb99523a6e0aa7f7a32727de9
]
Patch bundle hash:
a2a473861e9124fb7c7a08b39af9c5f5275a1701
_______________________________________________
Cvs-ghc mailing list
Cvs-ghc@haskell.org
http://www.haskell.org/mailman/listinfo/cvs-ghc
