diff --git a/gcc/gcc-4.7.1-libada-pic.patch b/gcc/gcc-4.7.1-libada-pic.patch
new file mode 100644
index 000000000..c89d6d864
--- /dev/null
+++ b/gcc/gcc-4.7.1-libada-pic.patch
@@ -0,0 +1,12 @@
+diff -Naur gcc-4.7.1-orig/libada/Makefile.in gcc-4.7.1/libada/Makefile.in
+--- gcc-4.7.1-orig/libada/Makefile.in	2012-06-13 01:12:37.000000000 +1000
++++ gcc-4.7.1/libada/Makefile.in	2012-06-16 15:04:32.179911023 +1000
+@@ -54,7 +54,7 @@
+ PICFLAG = @PICFLAG@
+ GNATLIBFLAGS= -W -Wall -gnatpg -nostdinc
+ GNATLIBCFLAGS= -g -O2
+-GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) \
++GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) $(PICFLAG) \
+	-fexceptions -DIN_RTS @have_getipinfo@
+
+ host_subdir = @host_subdir@
diff --git a/gcc/gcc-4.7.1-libgo-write.patch b/gcc/gcc-4.7.1-libgo-write.patch
new file mode 100644
index 000000000..340c313a6
--- /dev/null
+++ b/gcc/gcc-4.7.1-libgo-write.patch
@@ -0,0 +1,12 @@
+diff -Naur gcc-4.7.1-orig/libgo/runtime/print.c gcc-4.7.1/libgo/runtime/print.c
+--- gcc-4.7.1-orig/libgo/runtime/print.c	2012-05-26 04:22:14.000000000 +1000
++++ gcc-4.7.1/libgo/runtime/print.c	2012-06-16 15:06:28.553138502 +1000
+@@ -17,7 +17,8 @@
+	G* g = runtime_g();
+
+	if(g == nil || g->writebuf == nil) {
+-		runtime_write(2, v, n);
++		ssize_t bytesWritten = runtime_write(2, v, n);
++		(void)bytesWritten;
+		return;
+	}
diff --git a/glibc/PKGBUILD b/glibc/PKGBUILD
index a1093cb2d..90e0cd271 100644
--- a/glibc/PKGBUILD
+++ b/glibc/PKGBUILD
@@ -276,10 +276,6 @@ package() {
   cd ${pkgdir}/lib64
   ln -v -s ../lib/ld* .
 
-  # transitional fix while we move all to /usr/lib
-  ln -s ${pkgdir}/lib/libm-2.15.so ${pkgdir}/usr/lib/libm.so.6
-  ln -s ${pkgdir}/lib/libpthread-2.15.so ${pkgdir}/usr/lib/libpthread.so.0
-  
   cd ${pkgdir}
   strip $STRIP_BINARIES sbin/{ldconfig,sln} \
                         usr/bin/{gencat,getconf,getent,iconv,locale} \
@@ -295,4 +291,5 @@ package() {
                       lib/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \
                       lib/{libmemusage,libpcprofile,libSegFault}.so \
                       usr/lib/{pt_chown,{audit,gconv}/*.so}
+
 }