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

Conflicts:
	Externals/cross-compiler/Makefile

diff --cc Externals/cross-compiler/Makefile
index 831ea4d,b3a489d..ae2df5a
--- 1/Externals/cross-compiler/Makefile
--- 2/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 f34faa7,0000000..b986044
mode 100644,000000..100644
--- 1/Externals/cross-compiler/Makefile.common.mk
--- /dev/null
+++ b/Externals/cross-compiler/Makefile.common.mk
@@@ -1,26 -1,0 +1,26 @@@
- 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
 +#
 +#
 +#
 +-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/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 

diff --cc Tools/NetTest_Runner/test_tcp.c
Simple merge