diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2015-03-14 23:41:25 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-03-16 01:23:52 -0400 |
| commit | ae7d0cac8ce971f7108d270c1d3f8481919b1e86 (patch) | |
| tree | 922127997fda3de2483ed896fba8ae88576bba5e /sim/arm | |
| parent | 9c5f41df36176d86afa65fc9b69b8fd6f6044547 (diff) | |
| download | binutils-ae7d0cac8ce971f7108d270c1d3f8481919b1e86.zip binutils-ae7d0cac8ce971f7108d270c1d3f8481919b1e86.tar.gz binutils-ae7d0cac8ce971f7108d270c1d3f8481919b1e86.tar.bz2 | |
sim: rename tconfig.in to tconfig.h
Rather than manually include tconfig.h when we think we'll need it (which
is error prone as it can define symbols we expect from config.h), have it
be included directly by config.h. Since we know we have to include that
header everywhere already, this will make sure tconfig.h isn't missed.
It should also be fine as tconfig.h is supposed to be simple and only set
up a few core defines for the target.
This allows us to stop symlinking it in place all the time and just use
it straight out of the respective source directory.
Diffstat (limited to 'sim/arm')
| -rw-r--r-- | sim/arm/ChangeLog | 6 | ||||
| -rw-r--r-- | sim/arm/config.in | 2 | ||||
| -rwxr-xr-x | sim/arm/configure | 14 | ||||
| -rw-r--r-- | sim/arm/tconfig.h (renamed from sim/arm/tconfig.in) | 0 |
4 files changed, 12 insertions, 10 deletions
diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog index bd4ddf2..94bd72f 100644 --- a/sim/arm/ChangeLog +++ b/sim/arm/ChangeLog @@ -1,3 +1,9 @@ +2015-03-16 Mike Frysinger <vapier@gentoo.org> + + * config.in, configure: Regenerate. + * tconfig.in: Rename file ... + * tconfig.h: ... here. + 2015-03-14 Mike Frysinger <vapier@gentoo.org> * Makefile.in (SIM_EXTRA_CFLAGS): Add diff --git a/sim/arm/config.in b/sim/arm/config.in index 5fed8c1..5ded703 100644 --- a/sim/arm/config.in +++ b/sim/arm/config.in @@ -144,3 +144,5 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE + +#include "tconfig.h" diff --git a/sim/arm/configure b/sim/arm/configure index 9ee8a77..4e0221e 100755 --- a/sim/arm/configure +++ b/sim/arm/configure @@ -8271,6 +8271,8 @@ else fi + + # Some of the common include files depend on bfd.h, and bfd.h checks # that config.h is included first by testing that the PACKAGE macro # is defined. @@ -12353,7 +12355,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12356 "configure" +#line 12358 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12459,7 +12461,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12462 "configure" +#line 12464 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12940,14 +12942,6 @@ _ACEOF sim_link_files= sim_link_links= -sim_link_links=tconfig.h -if test -f ${srcdir}/tconfig.in -then - sim_link_files=tconfig.in -else - sim_link_files=../common/tconfig.in -fi - # targ-vals.def points to the libc macro description file. case "${target}" in *-*-*) TARG_VALS_DEF=../common/nltvals.def ;; diff --git a/sim/arm/tconfig.in b/sim/arm/tconfig.h index 04f702d..04f702d 100644 --- a/sim/arm/tconfig.in +++ b/sim/arm/tconfig.h |