diff options
| author | Olivier Hainque <hainque@adacore.com> | 2014-09-01 13:00:56 +0000 |
|---|---|---|
| committer | Olivier Hainque <hainque@gcc.gnu.org> | 2014-09-01 13:00:56 +0000 |
| commit | 2dbf50660d3bf57471d9d71967a29f0e2427b7a8 (patch) | |
| tree | 65dad1f115092dafc808ea9fc0d3582c4bf5dc83 /gcc | |
| parent | d0ea2922880a77f0e66f155bff1ad4cacdecf678 (diff) | |
| download | gcc-2dbf50660d3bf57471d9d71967a29f0e2427b7a8.zip gcc-2dbf50660d3bf57471d9d71967a29f0e2427b7a8.tar.gz gcc-2dbf50660d3bf57471d9d71967a29f0e2427b7a8.tar.bz2 | |
vxworksae.h (VXWORKSAE_TARGET_DIR): Rely on $WIND_BASE instead of designating a harcoded arbitrary home dir.
* config/vxworksae.h (VXWORKSAE_TARGET_DIR): Rely on
$WIND_BASE instead of designating a harcoded arbitrary home dir.
(VXWORKS_ADDITIONAL_CPP_SPEC): Adjust callers.
From-SVN: r214792
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/config/vxworksae.h | 11 |
2 files changed, 11 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ad35a11..390c89e 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 8f82026..1708832 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 "" |