Conflicts:
	mk/boilerplate.mk

"value"s can only be imported using capi.

We were parsing "staticfoo" as "static foo".

These really ought to be normalised, but this gets them passing
again for now.

We no longer support CTYPE pragmas on type synonyms

Newtype handling in FFI decls is no longer relaxed

Some redundant test have now been removed

This tests that the header given in the CTYPE pragma is handled.

The hooks for the optllvm way were there in the ghc config
file, but there was no entry in config.other_ways so that a
`make WAY=optllvm` would fail with an "unknown way" error
message.

This patch simply adds optllvm to the other_ways list.