Housekeeping on TARGET_OS_CPP_BUILTINS for arm-vxworks

2019-11-14  Jerome Lambourg  <lambourg@adacore.com>

        * config/arm/vxworks.h (TARGET_OS_CPP_BUILTINS): Use
        _VX_CPU instead of CPU and handle arm_arch8.

From-SVN: r278252

gcc/ChangeLog

+2019-11-14  Jerome Lambourg  <lambourg@adacore.com>
+
+	* config/arm/vxworks.h (TARGET_OS_CPP_BUILTINS): Use
+	_VX_CPU instead of CPU and handle arm_arch8.
+
 2019-11-14  Doug Rupp  <rupp@adacore.com>
 	    Olivier Hainque  <hainque@adacore.com>
 	    Jerome Lambourg  <lambourg@adacore.com>

gcc/config/arm/vxworks.h

@@ -43,31 +43,33 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
       builtin_define ("ARMEL");				\
 							\
     if (arm_arch_xscale)				\
-      builtin_define ("CPU=XSCALE");		\
+      builtin_define ("_VX_CPU=XSCALE");		\
+    if (arm_arch8)					\
+      builtin_define ("_VX_CPU=ARMARCH8A");		\
     else if (arm_arch7)					\
       {							\
 	if (!arm_arch_notm)				\
-	  builtin_define ("CPU=ARMARCH7M");	\
+	  builtin_define ("_VX_CPU=ARMARCH7M");		\
 	else if (TARGET_THUMB)				\
-	  builtin_define ("CPU=ARMARCH7_T2");	\
+	  builtin_define ("_VX_CPU=ARMARCH7_T2");	\
 	else						\
-	  builtin_define ("CPU=ARMARCH7");	\
+	  builtin_define ("_VX_CPU=ARMARCH7");		\
       }							\
     else if (arm_arch6)					\
       {							\
 	if (TARGET_THUMB)				\
-	  builtin_define ("CPU=ARMARCH6_T");	\
+	  builtin_define ("_VX_CPU=ARMARCH6_T");	\
 	else						\
-	  builtin_define ("CPU=ARMARCH6");	\
+	  builtin_define ("_VX_CPU=ARMARCH6");		\
       }							\
     else if (arm_arch5t)				\
-	builtin_define ("CPU=ARMARCH5_T");	\
+	builtin_define ("_VX_CPU=ARMARCH5_T");		\
     else if (arm_arch4)					\
       {							\
 	if (TARGET_THUMB)				\
-	  builtin_define ("CPU=ARMARCH4_T");	\
+	  builtin_define ("_VX_CPU=ARMARCH4_T");	\
 	else						\
-	  builtin_define ("CPU=ARMARCH4");	\
+	  builtin_define ("_VX_CPU=ARMARCH4");		\
       }							\
     VXWORKS_OS_CPP_BUILTINS ();				\
     MAYBE_TARGET_BPABI_CPP_BUILTINS ();			\