aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Hainque <hainque@adacore.com>2020-10-20 15:15:51 +0000
committerOlivier Hainque <hainque@adacore.com>2020-10-27 16:28:04 +0000
commitf6b710fc6f93db3ce2fda08e025c3badac7996b0 (patch)
tree432b6eb10234f96fe23fce99b4b19bc22c937cbb
parent7fdedf8a8e8f586cd943c17b16b2dc404b90d8db (diff)
downloadgcc-f6b710fc6f93db3ce2fda08e025c3badac7996b0.zip
gcc-f6b710fc6f93db3ce2fda08e025c3badac7996b0.tar.gz
gcc-f6b710fc6f93db3ce2fda08e025c3badac7996b0.tar.bz2
Extract VX_CPU_PREFIX up into config/vxworks.h
Move VX_CPU_PREFIX to a place where it can be reused by multiple target ports. 2020-10-21 Olivier Hainque <hainque@adacore.com> gcc/ * config/vxworks.h (VX_CPU_PREFIX): #define here. * config/rs6000/vxworks.h: Remove #definition.
-rw-r--r--gcc/config/rs6000/vxworks.h12
-rw-r--r--gcc/config/vxworks.h12
2 files changed, 12 insertions, 12 deletions
diff --git a/gcc/config/rs6000/vxworks.h b/gcc/config/rs6000/vxworks.h
index c5c3248..9dabdab 100644
--- a/gcc/config/rs6000/vxworks.h
+++ b/gcc/config/rs6000/vxworks.h
@@ -97,18 +97,6 @@ along with GCC; see the file COPYING3. If not see
} \
while (0)
-/* Specific CPU macro definitions expected by the system headers,
- inferred from -mcpu requests by the user. Different versions of
- VxWorks expect different forms of macros, such as
-
- -D_VX_CPU=_VX_PPC403 on Vx7 and some variants of Vx6,
- -DCPU=PPC403 on all Vx6 and earlier. */
-
-#if TARGET_VXWORKS7
-#define VX_CPU_PREFIX "_VX_"
-#else
-#define VX_CPU_PREFIX ""
-#endif
#define VX_CPUDEF(CPUID) \
":-D" VX_CPU_PREFIX "CPU=" VX_CPU_PREFIX #CPUID
diff --git a/gcc/config/vxworks.h b/gcc/config/vxworks.h
index b7e5970..e2ce22b 100644
--- a/gcc/config/vxworks.h
+++ b/gcc/config/vxworks.h
@@ -265,6 +265,18 @@ extern void vxworks_asm_out_destructor (rtx symbol, int priority);
} \
while (0)
+/* For specific CPU macro definitions expected by the system headers,
+ different versions of VxWorks expect different forms of macros,
+ such as "_VX_CPU=..." on Vx7 and some variants of Vx6, or "CPU=..."
+ on all Vx6 and earlier. Setup a common prefix macro here, that
+ arch specific ports can reuse. */
+
+#if TARGET_VXWORKS7
+#define VX_CPU_PREFIX "_VX_"
+#else
+#define VX_CPU_PREFIX ""
+#endif
+
#define VXWORKS_KIND VXWORKS_KIND_NORMAL
/* The diab linker does not handle .gnu_attribute sections. */