diff --git a/BaseBuild/crosschain/binutils b/BaseBuild/crosschain/binutils
index bde6506..7443651 100644
--- a/BaseBuild/crosschain/binutils
+++ b/BaseBuild/crosschain/binutils
@@ -93,7 +93,7 @@ mk() {
 	../binutils*/configure --host=$HOSTSYS \
 			       --target=$TARGET \
 			       --prefix=/cross-tools \
-			       --with-lib-path=/tools/$LIBDIR \
+			       --with-lib-path=/tools/lib \
 			       --disable-nls \
 			       --enable-shared \
 			       --enable-64-bit-bfd
diff --git a/BaseBuild/crosschain/gcc b/BaseBuild/crosschain/gcc
index 045bf31..2d04fe8 100644
--- a/BaseBuild/crosschain/gcc
+++ b/BaseBuild/crosschain/gcc
@@ -85,7 +85,7 @@ premk() {
 	if [ -f /tmp/crossgcc_stage1 ]; then
 		SrcPatch $MAKEDIR/gcc* $LFSSOURCE/$SRCPATH/gcc-*-PR31490-1.patch*
 	fi
-	SrcPatch $MAKEDIR/gcc* $LFSSOURCE/$SRCPATH/gcc-*-pure64_specs-1.patch*
+	SrcPatch $MAKEDIR/gcc* $LFSSOURCE/$SRCPATH/gcc-*-specs-1.patch*
 	SrcPatch $MAKEDIR/gcc* $LFSSOURCE/$SRCPATH/gcc-*-posix-1.patch*
 	SrcPatch $MAKEDIR/gcc* $LFSSOURCE/$SRCPATH/gcc-*-cross_search_paths-1.patch*
 	if [ "$ARCH" == "sparc64" ]; then
@@ -96,14 +96,14 @@ premk() {
 	for i in $OUTFILE; do
 		echo "
 #undef STARTFILE_PREFIX_SPEC
-#define STARTFILE_PREFIX_SPEC \"/tools/$LIBDIR/\"" >>$i
+#define STARTFILE_PREFIX_SPEC \"/tools/lib/\"" >>$i
 	done
 	cp -v gcc/Makefile.in{,.orig}
 	sed -e "s@\(^CROSS_SYSTEM_HEADER_DIR =\).*@\1 /tools/include@g" \
     	gcc/Makefile.in.orig > gcc/Makefile.in
 	if [ -f /tmp/crossgcc_stage1 ]; then
 		cp -v configure{,.orig}
-		sed -e '/FLAGS_FOR_TARGET.*\/'$LIBDIR'\//s@-B[^ ]*/'$LIBDIR'/@@g' configure.orig >configure
+		sed -e '/FLAGS_FOR_TARGET.*\/lib\//s@-B[^ ]*/'$LIBDIR'/@@g' configure.orig >configure
 	fi
 	mkdir ../build-gcc
 	cd ../build-gcc
diff --git a/BaseBuild/crosschain/glibc b/BaseBuild/crosschain/glibc
index a045fc3..d940d7a 100644
--- a/BaseBuild/crosschain/glibc
+++ b/BaseBuild/crosschain/glibc
@@ -90,6 +90,7 @@ mk32() {
 	CC="${TARGET}-gcc ${BUILDOPTIONS32}" \
 	AR="${TARGET}-ar" \
 	RANLIB="${TARGET}-ranlib" \
+	CFLAGS="-march=$ARCH32 -mtune=generic -g -O2" \
 	../glibc*/configure --prefix=/tools \
 	                    --host=$TARGET32 \
 			    --build=$TARGET \
@@ -101,7 +102,6 @@ mk32() {
 			    --with-binutils=/cross-tools/bin \
 			    --with-headers=/tools/include \
 			    --cache-file=config.cache
-	echo "CFLAGS += -march=$ARCH32" >configparms
 	make -j $NUMCPU
 	make -j $NUMCPU install
 	cd ../glibc*
@@ -139,7 +139,7 @@ mk() {
 			    --with-headers=/tools/include \
 			    --cache-file=config.cache
 	if [ ! ${MK64BIT} == "true" ]; then
-		echo "CFLAGS += -march=$ARCH" >configparms
+		echo "CFLAGS += -march=$ARCH -mtune=generic -g -O2" >configparms
 	fi
 	make -j $NUMCPU
 	make -j $NUMCPU install
diff --git a/BaseBuild/toolchain/binutils b/BaseBuild/toolchain/binutils
index 2618172..6bc6a09 100644
--- a/BaseBuild/toolchain/binutils
+++ b/BaseBuild/toolchain/binutils
@@ -87,8 +87,8 @@ SRCPATH=Base/Utilities
 
 premk() {
         SrcPatch $MAKEDIR/binutils* $LFSSOURCE/$SRCPATH/binutils-*-posix*.patch*
-	SrcPatch $MAKEDIR/binutils* $LFSSOURCE/$SRCPATH/binutils-*-branch_update-3*
         SrcPatch $MAKEDIR/binutils* $LFSSOURCE/$SRCPATH/binutils-*-genscripts*.patch*
+	SrcPatch $MAKEDIR/binutils* $LFSSOURCE/$SRCPATH/binutils-*-branch_update-3*
 
 	if [ ${MK64BIT} == "true" ]; then
 		BUILDOPTIONS="-m64"
@@ -109,7 +109,7 @@ mk() {
 		    --build=$HOSTSYS \
 		    --prefix=/tools \
 		    --libdir=/tools/$LIBDIR
-		    --with-lib-path=/tools/$LIBDIR \
+		    --with-lib-path=/tools/lib \
 		    --disable-nls \
 		    --enable-shared \
 		    --enable-64-bit-bfd