diff --git a/gdb/c-exp.y b/gdb/c-exp.y
index ec2bde99042..b30729aba5e 100644
--- a/gdb/c-exp.y
+++ b/gdb/c-exp.y
@@ -1398,7 +1398,7 @@ void
 yyerror (msg)
      char *msg;
 {
-  error ("Invalid syntax in expression.");
+  error (msg ? msg : "Invalid syntax in expression.");
 }
 
 /* Table mapping opcodes into strings for printing operators
diff --git a/gdb/configure.in b/gdb/configure.in
index 92169b067d7..7a1f2dcd095 100644
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -104,6 +104,10 @@ romp)
 	gdb_host=rtbsd
 	;;
 
+rs6000)
+	gdb_host=rs6000
+	;;
+
 a29k)
 	gdb_host=ultra3
 	;;
@@ -242,6 +246,10 @@ ns32k)
 	esac
 	;;
 
+rs6000)
+	gdb_target=rs6000
+	;;
+
 ### unhandled targets
 # altosgas
 # i386v-g