-configure_gcc-3.3 := --enable-languages=c,c++,java --enable-gc-type=boehm --disable-shared --disable-jvmpi
-configure_gcc-3.3 += --disable-java-awt --disable-interpreter --enable-static --enable-libgcj
-configure_gcc-3.3 += --with-gnu-ld=$(shell pwd)/upstream/install/bin/$(target)-ld
-configure_gcc-3.3 += --with-as=$(shell pwd)/upstream/install/bin/$(target)-as
-configure_gcc-3.3-powerpc-apple-darwin := --enable-threads=posix --disable-hash-synchronization --disable-multilib
-configure_gcc-3.3-powerpc-apple-darwin += --with-headers=$(shell pwd)/upstream/install/powerpc-apple-darwin/include
-configure_gcc-3.3-i686-pc-mingw32 := --enable-threads=win32 --enable-hash-synchronization
-configure_gcc-3.3-i686-pc-linux-gnu := --enable-threads=posix --enable-hash-synchronization
-configure_gcc-3.3-sparc-sun-solaris2.7 := --enable-threads=posix --disable-multilib
-configure_gcc-3.3-mips-unknown-elf := --enable-languages=c --nfp --enable-multilib --disable-threads
+configure_gcc-3.3.2 += --enable-languages=c,c++,java --enable-gc-type=boehm --disable-jvmpi
+ifneq ($(platform),Solaris)
+configure_gcc-3.3.2 += --disable-shared
+else
+configure_gcc-3.3.2 += --enable-shared
+endif
+configure_gcc-3.3.2 += --disable-java-awt --disable-interpreter --enable-static --enable-libgcj
+ifneq ($(shell uname),$(platform))
+ifneq ($(target),mips-unknown-elf)
+configure_gcc-3.3.2 += --with-ld=$(shell pwd)/upstream/install/bin/$(target)-ld --with-gnu-ld
+configure_gcc-3.3.2 += --with-as=$(shell pwd)/upstream/install/bin/$(target)-as --with-gnu-as
+configure_gcc-3.3.2 += --with-headers=$(shell pwd)/upstream/install/$(target)/include
+configure_gcc-3.3.2 += --with-libs=$(shell pwd)/upstream/install/$(target)/lib
+endif
+endif
+configure_gcc-3.3.2_powerpc-apple-darwin += --enable-threads=posix --disable-hash-synchronization --disable-multilib
+configure_gcc-3.3.2_i686-pc-mingw32 += --enable-threads=win32 --enable-hash-synchronization
+configure_gcc-3.3.2_i686-pc-linux-gnu += --enable-threads=posix --enable-hash-synchronization
+configure_gcc-3.3.2_sparc-sun-solaris2.7 += --enable-threads=posix --disable-multilib
+configure_gcc-3.3.2_mips-unknown-elf += --with-gnu-ld=$(shell pwd)/upstream/install/bin/$(target)-ld
+configure_gcc-3.3.2_mips-unknown-elf += --with-as=$(shell pwd)/upstream/install/bin/$(target)-as
+configure_gcc-3.3.2_mips-unknown-elf += --enable-languages=c --nfp --enable-multilib --disable-threads
+
+environment_newlib-1.11.0_mips-unknown-elf += TARGET_CFLAGS="-O3 -ffunction-sections -fdata-sections"