From: John Hodge (sonata) <tpg@mutabah.net>
Date: Sun, 15 Feb 2015 07:57:04 +0000 (+0800)
Subject: Merge branch 'master' of git://cadel.mutabah.net/acess2
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=6274aaa8894e14462a36c69090e2f9235f130e31;p=tpg%2Facess2.git

Merge branch 'master' of git://cadel.mutabah.net/acess2

Conflicts:
	Externals/cross-compiler/Makefile
---

6274aaa8894e14462a36c69090e2f9235f130e31
diff --cc Externals/cross-compiler/Makefile
index 831ea4da,b3a489d0..ae2df5ae
--- a/Externals/cross-compiler/Makefile
+++ b/Externals/cross-compiler/Makefile
@@@ -34,7 -83,8 +34,8 @@@ $(BDIR_GCC)/Makefile: Makefile $(addpre
  	@echo "MAKEINFO = :" >> $(BDIR_GCC)/Makefile
  
  $(PREFIX)/bin/$(TARGET)-gcc: $(BDIR_GCC)/Makefile
 -	@PATH=$(PREFIX)/bin:$$PATH make -C $(BDIR_GCC) $(GCC_TARGETS:%=all-%) -j $(PARLEVEL)
 -	@PATH=$(PREFIX)/bin:$$PATH make -C $(BDIR_GCC)libstdc++-v3/ all-target-libsupc++ -j $(PARLEVEL)
 -	@PATH=$(PREFIX)/bin:$$PATH make -C $(BDIR_GCC) $(GCC_TARGETS:%=install-%)
 +	@$(ENVVARS) make -C $(BDIR_GCC) $(GCC_TARGETS:%=all-%) -j $(PARLEVEL)
++	@$(ENVVARS) make -C $(BDIR_GCC)libstdc++-v3/ all-target-libsupc++ -j $(PARLEVEL)
 +	@$(ENVVARS) make -C $(BDIR_GCC) $(GCC_TARGETS:%=install-%)
  
  
diff --cc Externals/cross-compiler/Makefile.common.mk
index f34faa7b,00000000..b986044d
mode 100644,000000..100644
--- a/Externals/cross-compiler/Makefile.common.mk
+++ b/Externals/cross-compiler/Makefile.common.mk
@@@ -1,26 -1,0 +1,26 @@@
 +#
 +#
 +#
 +-include ../config.mk
 +
 +GCC_ARCHIVE:=$(lastword $(sort $(wildcard gcc-*.tar.bz2)))
 +GCC_DIR:=$(GCC_ARCHIVE:%.tar.bz2=%)
 +BINUTILS_ARCHIVE:=$(lastword $(sort $(wildcard binutils-*.tar.bz2)))
 +BINUTILS_DIR:=$(BINUTILS_ARCHIVE:%.tar.bz2=%)
 +
 +ifeq ($(GCC_ARCHIVE),)
 + $(warning Unable to find a GCC archive matching gcc-*.tar.bz2)
 + $(error No archive found)
 +endif
 +ifeq ($(BINUTILS_ARCHIVE),)
 + $(warning Unable to find a binutils archive matching binutils-*.tar.bz2)
 + $(error No archive found)
 +endif
 +
- BINUTILS_CHANGES := config.sub bfd/config.bfd gas/configure.tgt ld/configure.tgt ld/emulparams/acess2_i386.sh ld/emulparams/acess2_amd64.sh ld/Makefile.in
++BINUTILS_CHANGES := config.sub bfd/config.bfd gas/configure.tgt ld/configure.tgt ld/emulparams/acess2_i386.sh ld/emulparams/acess2_amd64.sh ld/emulparams/acess2_arm.sh ld/Makefile.in
 +GCC_CHANGES := config.sub gcc/config.gcc gcc/config/acess2.h libgcc/config.host gcc/config/acess2.opt
 +# libstdc++-v3/crossconfig.m4 config/override.m4
 +
 +TARGET=$(HOST)
 +GCC_TARGETS := gcc target-libgcc
 +# target-libstdc++-v3