Move default #define TARGET_VXWORKS7 to vxworks-dummy.h

2018-09-21  Olivier Hainque  <hainque@adacore.com>

	* config/vxworks.h (TARGET_VXWORKS7): Move default definition ...
	* config/vxworks-dummy.h: here.

From-SVN: r264472

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a581fbadfdeab338cbfc2a76eb8909d5d30c276b..d55d0cb35f3b2d413f15d1ca01e2926f50ad38ed 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2018-09-21  Olivier Hainque  <hainque@adacore.com>
+
+       * config/vxworks.h (TARGET_VXWORKS7): Move default definition ...
+       * config/vxworks-dummy.h: here.
+
 2018-09-21  Olivier Hainque  <hainque@adacore.com>
 
         * config.gcc: Prepend vxworks-dummy.h to tm_file for powerpc*

diff --git a/gcc/config/vxworks-dummy.h b/gcc/config/vxworks-dummy.h
index 33ed0c7f58186996582e6b23974f256bc1957fcd..0a7eff9a7fea71c8a488d2baddfd6a107d4946ce 100644 (file)
--- 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
 <http://www.gnu.org/licenses/>.  */
 
-/* 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 86773868ec23f5b76d5b21d003ccbeda4575a51b..c2a0cb44d9a8f37cc5e9d7a44abcaafe2b657051 100644 (file)
--- 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