Merge latest changes from upstream

Conflicts:
	mk/ways.mk    (removed GranSim)
	rts/RtsMain.c (restructured main function on Windows)

_NO_ conflict (but broken):
	rts/Trace.c   (refactored function name vtrace_stderr)

.travis.yml

@@ -12,11 +12,13 @@ env:
 
 before_install:
  - travis_retry sudo add-apt-repository -y ppa:hvr/ghc
- - travis_retry sudo add-apt-repository -y ppa:h-rayflood/gcc-upper
- - travis_retry sudo add-apt-repository -y ppa:h-rayflood/llvm-upper
+ - travis_retry sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+ - travis_retry sudo sh -c "echo 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise-3.6 main' >> /etc/apt/sources.list"
+ - wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -
  - travis_retry sudo apt-get update
- - travis_retry sudo apt-get install cabal-install-1.18 ghc-7.6.3 alex-3.1.3 happy-1.19.4 llvm-3.5
- - export PATH=/opt/ghc/7.6.3/bin:/opt/cabal/1.18/bin:/opt/alex/3.1.3/bin:/opt/happy/1.19.4/bin:/usr/lib/llvm-3.5/bin:$PATH
+ - travis_retry sudo apt-get install cabal-install-1.18 ghc-7.6.3 alex-3.1.3 happy-1.19.4
+ - travis_retry sudo apt-get install llvm-3.6
+ - export PATH=/opt/ghc/7.6.3/bin:/opt/cabal/1.18/bin:/opt/alex/3.1.3/bin:/opt/happy/1.19.4/bin:/usr/lib/llvm-3.6/bin:$PATH
  - git config --global url."git://github.com/ghc/packages-".insteadOf     git://github.com/ghc/packages/
  - git config --global url."http://github.com/ghc/packages-".insteadOf    http://github.com/ghc/packages/
  - git config --global url."https://github.com/ghc/packages-".insteadOf   https://github.com/ghc/packages/

INSTALL.md

@@ -0,0 +1,40 @@
+Building & Installing
+=====================
+
+For full information on building GHC, see the GHC Building Guide [1].
+Here follows a summary - if you get into trouble, the Building Guide
+has all the answers.
+
+Before building GHC you may need to install some other tools and
+libraries.  See "Setting up your system for building GHC" [2].
+
+NB. in particular you need GHC installed in order to build GHC,
+because the compiler is itself written in Haskell.  For instructions
+on how to port GHC to a new platform, see the Building Guide [1].
+
+For building library documentation, you'll need Haddock [3].  To build
+the compiler documentation, you need a good DocBook XML toolchain and
+dblatex.
+
+Quick start:  the following gives you a default build:
+
+    $ perl boot
+    $ ./configure
+    $ make
+    $ make install
+
+The "perl boot" step is only necessary if this is a tree checked out
+from git.  For source distributions downloaded from GHC's web site,
+this step has already been performed.
+
+These steps give you the default build, which includes everything
+optimised and built in various ways (eg. profiling libs are built).
+It can take a long time.  To customise the build, see the file
+`HACKING.md`.
+
+References
+==========
+
+ [1] http://www.haskell.org/ghc/
+ [2] http://hackage.haskell.org/trac/ghc/wiki/Building/Preparation
+ [3] http://www.haskell.org/haddock/

MAKEHELP.md

@@ -0,0 +1,81 @@
+Quick `make` guide for GHC
+==========================
+
+For a "Getting Started" guide, see:
+
+  http://ghc.haskell.org/trac/ghc/wiki/Building/Hacking
+
+Common commands:
+
+  - `make`
+
+    Builds everything: ghc stages 1 and 2, all libraries and tools.
+
+  - `make -j2`
+
+    Parallel build: runs up to 2 commands at a time.
+
+  - `cd <dir>; make`
+
+    Builds everything in the given directory.
+
+  - cd <dir>; make help
+
+    Shows the targets available in <dir>
+
+  - make install
+
+    Installs GHC, libraries and tools under $(prefix)
+
+  - make sdist
+  - make binary-dist
+
+    Builds a source or binary distribution respectively
+
+  - `make show VALUE=<var>`
+
+    Displays the value of make variable <var>
+
+  - make clean
+  - make distclean
+  - make maintainer-clean
+
+    Various levels of cleaning: "clean" restores the tree to the
+    state after "./configure", "distclean" restores to the state
+    after "perl boot", and maintainer-clean restores the tree to the
+    completely clean checked-out state.
+
+Using `make` in subdirectories
+==============================
+
+  - `make`
+
+    Builds everything in this directory (including dependencies elsewhere
+    in the tree, if necessary)
+
+  - `make fast`
+
+    The same as 'make', but omits some phases and does not
+    recalculate dependencies.  Useful for saving time if you are sure
+    the rest of the tree is up to date.
+
+  - `make clean`
+  - `make distclean`
+  - `make maintainer-clean`
+
+    Clean just this directory
+
+  - `make html`
+  - `make pdf`
+  - `make ps`
+
+    Make documentation in this directory (if any)
+
+  - `make show VALUE=var`
+
+    Show the value of $(var)
+
+  - `make <file>`
+
+    Bring a particular file up to date, e.g. make dist/build/Module.o
+    The name <file> is relative to the current directory

Makefile

@@ -25,13 +25,14 @@ install show:
 
 else
 
+.PHONY: default
 default : all
 	@:
 
 # For help, type 'make help'
 .PHONY: help
 help:
-	@cat MAKEHELP
+	@cat MAKEHELP.md
 
 ifneq "$(filter maintainer-clean distclean clean help,$(MAKECMDGOALS))" ""
 -include mk/config.mk
@@ -52,7 +53,7 @@ endif
 endif
 
 # No need to update makefiles for these targets:
-REALGOALS=$(filter-out binary-dist binary-dist-prep bootstrapping-files framework-pkg clean clean_% distclean maintainer-clean show echo help test fulltest,$(MAKECMDGOALS))
+REALGOALS=$(filter-out binary-dist binary-dist-prep bootstrapping-files framework-pkg clean clean_% distclean maintainer-clean show echo help test fulltest fast fasttest,$(MAKECMDGOALS))
 
 # configure touches certain files even if they haven't changed.  This
 # can mean a lot of unnecessary recompilation after a re-configure, so
@@ -65,7 +66,7 @@ REALGOALS=$(filter-out binary-dist binary-dist-prep bootstrapping-files framewor
 
 # NB. not the same as saying '%: ...', which doesn't do the right thing:
 # it does nothing if we specify a target that already exists.
-.PHONY: $(REALGOALS)
+.PHONY: $(REALGOALS) all
 $(REALGOALS) all: mk/config.mk.old mk/project.mk.old compiler/ghc.cabal.old
 ifneq "$(OMIT_PHASE_0)" "YES"
 	@echo "===--- building phase 0"
@@ -111,11 +112,10 @@ endif
 
 endif
 
-.PHONY: test
-test:
+.PHONY: fasttest fast
+fasttest fast:
 	$(MAKE) -C testsuite/tests CLEANUP=1 OUTPUT_SUMMARY=../../testsuite_summary.txt fast
 
-.PHONY: fulltest
-fulltest:
+.PHONY: fulltest test
+fulltest test:
 	$(MAKE) -C testsuite/tests CLEANUP=1 OUTPUT_SUMMARY=../../testsuite_summary.txt
-

VERSION

@@ -1 +1 @@
-7.11.20150120
+7.11.20150329