diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c5945726800..dfe7c91b396 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,8 @@
 2009-11-25  Jakub Jelinek  <jakub@redhat.com>
 
+	* config/rs6000/sysv4.opt (mregnames): Change Var to rs6000_regnames.
+	* config/rs6000/sysv4.h (TARGET_REGNAMES): Define.
+
 	* print-rtl.c (print_rtx): When printing newline, append
 	print_rtx_head and indentation after the newline.
 
diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
index 5377b474da5..8d19ad7ad63 100644
--- a/gcc/config/rs6000/sysv4.h
+++ b/gcc/config/rs6000/sysv4.h
@@ -63,6 +63,7 @@ extern enum rs6000_sdata_type rs6000_sdata;
 #define	TARGET_NO_PROTOTYPE	(! TARGET_PROTOTYPE)
 #define	TARGET_NO_TOC		(! TARGET_TOC)
 #define	TARGET_NO_EABI		(! TARGET_EABI)
+#define	TARGET_REGNAMES		rs6000_regnames
 
 #ifdef HAVE_AS_REL16
 #undef TARGET_SECURE_PLT
diff --git a/gcc/config/rs6000/sysv4.opt b/gcc/config/rs6000/sysv4.opt
index 428417ec4a8..29f3bdf75e9 100644
--- a/gcc/config/rs6000/sysv4.opt
+++ b/gcc/config/rs6000/sysv4.opt
@@ -91,7 +91,7 @@ Target Report Var(TARGET_NO_BITFIELD_WORD)
 Allow bit-fields to cross word boundaries
 
 mregnames
-Target Var(TARGET_REGNAMES)
+Target Var(rs6000_regnames)
 Use alternate register names
 
 ;; This option does nothing and only exists because the compiler
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2bb037b44c5..acc9be109ad 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-25  Jakub Jelinek  <jakub@redhat.com>
+
+	* gcc.target/powerpc/regnames-1.c: New test.
+
 2009-11-25  Eric Botcazou  <ebotcazou@adacore.com>
             John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/regnames-1.c b/gcc/testsuite/gcc.target/powerpc/regnames-1.c
new file mode 100644
index 00000000000..c814083c6e3
--- /dev/null
+++ b/gcc/testsuite/gcc.target/powerpc/regnames-1.c
@@ -0,0 +1,8 @@
+/* { dg-do compile { target powerpc*-*-linux* } */
+/* { dg-options "-mregnames" } */
+
+register double f17 asm ("f17");
+double foo (void)
+{
+  return f17;
+}