diff -r fd30c132d1bd src/cmd/ld/dwarf.c
--- a/src/cmd/ld/dwarf.c	Mon Sep 19 12:32:07 2011 +1000
+++ b/src/cmd/ld/dwarf.c	Wed Oct 05 16:30:58 2011 +0200
@@ -1602,10 +1602,16 @@
 
 	for (i = 1; i < histfilesize; i++) {
 		if ((c = strstr(histfile[i], "runtime/runtime_defs.go")) != nil) {
+#ifndef GDB_PRINTER
 			l = c - histfile[i];
 			memmove(gdbscript, histfile[i], l);
 			memmove(gdbscript + l, "runtime/runtime-gdb.py", strlen("runtime/runtime-gdb.py") + 1);
 			break;
+#endif
+#ifdef GDB_PRINTER
+			memmove(gdbscript, GDB_PRINTER, strlen(GDB_PRINTER) + 1);
+			break;
+#endif
 		}
 	}
 }