From: hainque <hainque@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 1 Sep 2014 13:00:56 +0000 (+0000)
Subject:         * config/vxworksae.h (VXWORKSAE_TARGET_DIR): Rely on
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14f92bf8613f5408023b82199b9b6ea1a6e54af3;p=thirdparty%2Fgcc.git

    * config/vxworksae.h (VXWORKSAE_TARGET_DIR): Rely on
        $WIND_BASE instead of designating a harcoded arbitrary home dir.
        (VXWORKS_ADDITIONAL_CPP_SPEC): Adjust callers.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@214792 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ad35a11f7100..390c89eae73b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-09-01  Olivier Hainque  <hainque@adacore.com>
+
+	* config/vxworksae.h (VXWORKSAE_TARGET_DIR): Rely on
+	$WIND_BASE instead of designating a harcoded arbitrary home dir.
+	(VXWORKS_ADDITIONAL_CPP_SPEC): Adjust callers.
+
 2014-09-01  Richard Biener  <rguenther@suse.de>
 
 	* tree-ssa-sccvn.h (copy_reference_ops_from_ref,
diff --git a/gcc/config/vxworksae.h b/gcc/config/vxworksae.h
index 8f82026d58b4..1708832510ee 100644
--- a/gcc/config/vxworksae.h
+++ b/gcc/config/vxworksae.h
@@ -23,9 +23,8 @@ along with GCC; see the file COPYING3.  If not see
 /* Most of the definitions below this point are versions of the
    vxworks.h definitions, without the -mrtp bits.  */
 
-/* The directory containing the VxWorks AE target headers.  */
-#define VXWORKSAE_TARGET_DIR \
-  "/home/tornado/vxworks-ae/latest/target"
+/* Resolve subdirectory of VxWorks AE target headers.  */
+#define VXWORKSAE_TARGET_DIR(SUBDIR) "%:getenv(WIND_BASE /target" SUBDIR ")"
 
 /* Include target/vThreads/h or target/h (depending on the compilation
    mode), and then target/val/h (in either mode).  The macros defined
@@ -35,10 +34,10 @@ along with GCC; see the file COPYING3.  If not see
 #define VXWORKS_ADDITIONAL_CPP_SPEC "					\
  %{!nostdinc:%{isystem*}}						\
  %{mvthreads:-DVTHREADS=1						\
-	 %{!nostdinc:-isystem " VXWORKSAE_TARGET_DIR "/vThreads/h}}	\
+	 %{!nostdinc:-isystem " VXWORKSAE_TARGET_DIR("/vThreads/h") "}}	\
  %{!mvthreads:-DAE653_BUILD=1						\
-	 %{!nostdinc:-isystem " VXWORKSAE_TARGET_DIR "/h}}		\
- %{!nostdinc:-isystem " VXWORKSAE_TARGET_DIR "/val/h}"
+	 %{!nostdinc:-isystem " VXWORKSAE_TARGET_DIR("/h") "}}		\
+ %{!nostdinc:-isystem " VXWORKSAE_TARGET_DIR("/val/h") "}"
 
 #undef VXWORKS_LIB_SPEC
 #define VXWORKS_LIB_SPEC ""