From 05e73c1c471d06a109226b075443831e5e2d5c6f Mon Sep 17 00:00:00 2001 From: Olivier Hainque Date: Fri, 21 Sep 2018 12:38:57 +0000 Subject: [PATCH] Move default #define TARGET_VXWORKS7 to vxworks-dummy.h 2018-09-21 Olivier Hainque * config/vxworks.h (TARGET_VXWORKS7): Move default definition ... * config/vxworks-dummy.h: here. From-SVN: r264472 --- gcc/ChangeLog | 5 +++++ gcc/config/vxworks-dummy.h | 6 +++++- gcc/config/vxworks.h | 5 ----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a581fba..d55d0cb 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,10 @@ 2018-09-21 Olivier Hainque + * config/vxworks.h (TARGET_VXWORKS7): Move default definition ... + * config/vxworks-dummy.h: here. + +2018-09-21 Olivier Hainque + * config.gcc: Prepend vxworks-dummy.h to tm_file for powerpc* 2018-09-21 Shaokun Zhang diff --git a/gcc/config/vxworks-dummy.h b/gcc/config/vxworks-dummy.h index 33ed0c7..0a7eff9 100644 --- a/gcc/config/vxworks-dummy.h +++ b/gcc/config/vxworks-dummy.h @@ -22,11 +22,15 @@ a copy of the GCC Runtime Library Exception along with this program; see the files COPYING3 and COPYING.RUNTIME respectively. If not, see . */ -/* True if we're targeting VxWorks. */ +/* True if we're targeting VxWorks, then VxWorks7. */ #ifndef TARGET_VXWORKS #define TARGET_VXWORKS 0 #endif +#ifndef TARGET_VXWORKS7 +#define TARGET_VXWORKS7 0 +#endif + /* True if generating code for a VxWorks RTP. */ #ifndef TARGET_VXWORKS_RTP #define TARGET_VXWORKS_RTP false diff --git a/gcc/config/vxworks.h b/gcc/config/vxworks.h index 8677386..c2a0cb4 100644 --- a/gcc/config/vxworks.h +++ b/gcc/config/vxworks.h @@ -23,11 +23,6 @@ along with GCC; see the file COPYING3. If not see #undef TARGET_VXWORKS #define TARGET_VXWORKS 1 -/* If TARGET_VXWORKS7 is undefined, then we're not targeting it. */ -#ifndef TARGET_VXWORKS7 -#define TARGET_VXWORKS7 0 -#endif - /* In kernel mode, VxWorks provides all the libraries itself, as well as the functionality of startup files, etc. In RTP mode, it behaves more like a traditional Unix, with more external files. Most of our specs -- 2.7.4