+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,
/* 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
#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 ""