Merge remote-tracking branch 'upstream/master'

CONTRIBUTING.md

@@ -15,6 +15,6 @@ create a temporary commit if you have any unstaged changes.
 ### Projects
 
 If you don't know where to start:
-- Check out the list of [starter projects](https://github.com/dropbox/pyston/wiki/Starter-projects)
+- Check out our [Github issues list](https://github.com/dropbox/pyston/issues), especially those marked ["probably easy"](https://github.com/dropbox/pyston/labels/probably%20easy)
 - Email the [pyston-dev mailing list](http://lists.pyston.org/cgi-bin/mailman/listinfo/pyston-dev), or [browse the archives](http://lists.pyston.org/pipermail/pyston-dev/)
 - Join us on [#pyston](http://webchat.freenode.net/?channels=pyston) on freenode.

docs/INSTALLING.md

@@ -98,7 +98,7 @@ apt-get install zsh
 `readline` is used for the repl.
 
 ```
-sudo apt-get install readline
+sudo apt-get install libreadline-dev
 ```
 
 ### gmp

llvm_revision.txt

-217843
+218648

src/Makefile

@@ -454,11 +454,21 @@ llvm_configure:
 	rm -f $(LLVM_BUILD)/Makefile.config
 	$(MAKE) $(LLVM_CONFIGURATION)
 
-LLVM_CONFIGURE_LINE := CXX=$(GPP) $(LLVM_SRC)/configure --enable-targets=host --with-gcc-toolchain=$(GCC_DIR)
+# Put the llvm_configure line in its own file, so that we can force an llvm reconfigure
+# if we change the configuration parameters.
+# (All non-llvm build targets get rebuilt if the main Makefile is touched, but that is too
+# expensive to do for the llvm ones.)
+LLVM_CONFIG_INCL := Makefile.llvmconfig
+# Sets LLVM_CONFIGURE_LINE:
+include $(LLVM_CONFIG_INCL)
+ifeq (,$(LLVM_CONFIGURE_LINE))
+$(error "did not set configure line")
+endif
 ifneq ($(ENABLE_INTEL_JIT_EVENTS),0)
 LLVM_CONFIGURE_LINE += --with-intel-jitevents
 endif
-$(LLVM_CONFIGURATION): $(LLVM_SRC)/configure | $(LLVM_SRC)/_patched
+
+$(LLVM_CONFIGURATION): $(LLVM_SRC)/configure $(LLVM_CONFIG_INCL) | $(LLVM_SRC)/_patched
 	mkdir -p $(LLVM_BUILD)
 	cd $(LLVM_BUILD) ; \
 	$(LLVM_CONFIGURE_LINE)

src/Makefile.llvmconfig

+# included by Makefile
+
+LLVM_CONFIGURE_LINE := CXX=$(GPP) LDFLAGS="-Wl,-rpath,$(GCC_DIR)/lib64" $(LLVM_SRC)/configure --enable-targets=host --with-gcc-toolchain=$(GCC_DIR)