diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7e4af9331ecc816d0a83571a8eed63fbdd62b8f0..5f8a9fe9b91079a616c87cddcae95314a4fc6e1d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-05  Paul Brook  <paul@codesourcery.com>
+
+	* arm.h (ARM_FLAG_VFP): Remove.
+	(ARM_FLAG_ATPCS, CIRRUS_FIX_INVALID_INSNS): Renumber.
+	* netbsd-elf.h (ARM_FLAG_VFP): Remove.
+
 2004-03-05  Paul Brook  <paul@codesourcery.com>
 
 	* function.c (assign_parms): Include pretend alignment offset.
diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h
index 5b85e75cdbfc6707c2443256033706df77b41cb7..4ca25a62dcbd089d052ab97a888a833f4da4c8ff 100644
--- a/gcc/config/arm/arm.h
+++ b/gcc/config/arm/arm.h
@@ -433,14 +433,11 @@ extern GTY(()) rtx aof_pic_label;
    destination is non-Thumb aware.  */
 #define THUMB_FLAG_CALLER_SUPER_INTERWORKING	(1 << 20)
 
-/* Nonzero means target uses VFP FP.  */
-#define ARM_FLAG_VFP		(1 << 21)
-
 /* Nonzero means to use ARM/Thumb Procedure Call Standard conventions.  */
-#define ARM_FLAG_ATPCS		(1 << 22)
+#define ARM_FLAG_ATPCS		(1 << 21)
 
 /* Fix invalid Cirrus instruction combinations by inserting NOPs.  */
-#define CIRRUS_FIX_INVALID_INSNS (1 << 23)
+#define CIRRUS_FIX_INVALID_INSNS (1 << 22)
 
 #define TARGET_APCS_FRAME		(target_flags & ARM_FLAG_APCS_FRAME)
 #define TARGET_POKE_FUNCTION_NAME	(target_flags & ARM_FLAG_POKE)
diff --git a/gcc/config/arm/netbsd-elf.h b/gcc/config/arm/netbsd-elf.h
index e39af2578a60225c5d4338a122ebfcac9d2467dd..c626c9e1299ed2fe7232724468d8bfd823e6e453 100644
--- a/gcc/config/arm/netbsd-elf.h
+++ b/gcc/config/arm/netbsd-elf.h
@@ -39,7 +39,6 @@
    | ARM_FLAG_SOFT_FLOAT		\
    | ARM_FLAG_APCS_FRAME		\
    | ARM_FLAG_ATPCS			\
-   | ARM_FLAG_VFP			\
    | ARM_FLAG_MMU_TRAPS			\
    | TARGET_ENDIAN_DEFAULT)