diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1bb112ff701546a443e95a54be78a374291f86f5..4ce11387b461a0836f8b8a52d5b79660ea501736 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2011-02-21  Joseph Myers  <joseph@codesourcery.com>
+
+	* config/alpha/osf5.opt (mno-mips-tfile): Mark as Target rather
+	than Driver option.
+	* config/hpux11.opt (mt): Likewise.
+	* config/microblaze/microblaze.opt (mxl-mode-xilkernel): Likewise.
+	* config/rs6000/xilinx.opt (mno-clearbss, mppcperflib): Likewise.
+	* config/vax/elf.opt (mno-asm-pic): Likewise.
+	* config/vms/vms.opt (map, mvms-return-codes): Likewise.
+
 2011-02-21  Mike Stump  <mikestump@comcast.net>
 
 	PR target/47822
diff --git a/gcc/config/alpha/osf5.opt b/gcc/config/alpha/osf5.opt
index fc084f3255ae761541b75125bc020f1f600c6487..ba70e7ce9a5f633cf9fed59bc39d8adb9f3c6522 100644
--- a/gcc/config/alpha/osf5.opt
+++ b/gcc/config/alpha/osf5.opt
@@ -28,7 +28,7 @@ K
 Driver
 
 mno-mips-tfile
-Driver RejectNegative
+Target RejectNegative
 
 pthread
 Driver
diff --git a/gcc/config/hpux11.opt b/gcc/config/hpux11.opt
index 507d9b890bd15e9a3c3f3e6e413da7804a6a5614..a7541477f232e277d5e205760b026c6dd88829f3 100644
--- a/gcc/config/hpux11.opt
+++ b/gcc/config/hpux11.opt
@@ -25,7 +25,7 @@
 ; Please try to keep this file in ASCII collating order.
 
 mt
-Driver RejectNegative
+Target RejectNegative
 
 pthread
 Driver
diff --git a/gcc/config/microblaze/microblaze.opt b/gcc/config/microblaze/microblaze.opt
index 488bd9c2bec75b191733d4a2ffc92d5e716d266d..97f316142b6457d6d4e97f289b10af17382a65c5 100644
--- a/gcc/config/microblaze/microblaze.opt
+++ b/gcc/config/microblaze/microblaze.opt
@@ -112,4 +112,4 @@ Target Mask(XL_MODE_NOVECTORS)
 Description for mxl-mode-novectors
 
 mxl-mode-xilkernel
-Driver
+Target
diff --git a/gcc/config/rs6000/xilinx.opt b/gcc/config/rs6000/xilinx.opt
index 6db5ca1e5d6c1c5d68ae243a93afcc2c2f1e569d..da6c0c066c81878729ec789ddd7e5578a3536041 100644
--- a/gcc/config/rs6000/xilinx.opt
+++ b/gcc/config/rs6000/xilinx.opt
@@ -25,9 +25,9 @@
 ; Please try to keep this file in ASCII collating order.
 
 mno-clearbss
-Driver RejectNegative
+Target RejectNegative
 
 mppcperflib
-Driver RejectNegative
+Target RejectNegative
 
 ; This comment is to ensure we retain the blank line above.
diff --git a/gcc/config/vax/elf.opt b/gcc/config/vax/elf.opt
index dcf126ce6f4b3f05dc1d6eb5c10ed6998f7ce47d..6296f75674b52a0627ba049dae07d5365829acb2 100644
--- a/gcc/config/vax/elf.opt
+++ b/gcc/config/vax/elf.opt
@@ -25,6 +25,6 @@
 ; Please try to keep this file in ASCII collating order.
 
 mno-asm-pic
-Driver RejectNegative
+Target RejectNegative
 
 ; This comment is to ensure we retain the blank line above.
diff --git a/gcc/config/vms/vms.opt b/gcc/config/vms/vms.opt
index 620dcf80ce1d4c7994c9d6249790d01c73143d1f..a1713b8115419df5ae44a48730bab295832e251b 100644
--- a/gcc/config/vms/vms.opt
+++ b/gcc/config/vms/vms.opt
@@ -17,7 +17,7 @@
 ; <http://www.gnu.org/licenses/>.
 
 map
-Driver RejectNegative
+Target RejectNegative
 
 mmalloc64
 Target Report Mask(MALLOC64)
@@ -28,4 +28,4 @@ Target RejectNegative Joined Var(vms_debug_main)
 Set name of main routine for the debugger
 
 mvms-return-codes
-Driver RejectNegative
+Target RejectNegative