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/h8300 | |
| parent | 9c5f41df36176d86afa65fc9b69b8fd6f6044547 (diff) | |
| download | gdb-ae7d0cac8ce971f7108d270c1d3f8481919b1e86.zip gdb-ae7d0cac8ce971f7108d270c1d3f8481919b1e86.tar.gz gdb-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/h8300')
| -rw-r--r-- | sim/h8300/ChangeLog | 6 | ||||
| -rw-r--r-- | sim/h8300/config.in | 2 | ||||
| -rwxr-xr-x | sim/h8300/configure | 14 | ||||
| -rw-r--r-- | sim/h8300/tconfig.h (renamed from sim/h8300/tconfig.in) | 0 |
4 files changed, 12 insertions, 10 deletions
diff --git a/sim/h8300/ChangeLog b/sim/h8300/ChangeLog index ec21cbf..0ef2344 100644 --- a/sim/h8300/ChangeLog +++ b/sim/h8300/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_RUN_OBJS): Delete. diff --git a/sim/h8300/config.in b/sim/h8300/config.in index e58e199..27216dc 100644 --- a/sim/h8300/config.in +++ b/sim/h8300/config.in @@ -147,3 +147,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/h8300/configure b/sim/h8300/configure index 39185a1..37b2d87 100755 --- a/sim/h8300/configure +++ b/sim/h8300/configure @@ -8270,6 +8270,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. @@ -12352,7 +12354,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12355 "configure" +#line 12357 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12458,7 +12460,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12461 "configure" +#line 12463 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12939,14 +12941,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/h8300/tconfig.in b/sim/h8300/tconfig.h index d9599db..d9599db 100644 --- a/sim/h8300/tconfig.in +++ b/sim/h8300/tconfig.h |