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/moxie | |
| parent | 9c5f41df36176d86afa65fc9b69b8fd6f6044547 (diff) | |
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/moxie')
| -rw-r--r-- | sim/moxie/ChangeLog | 4 | ||||
| -rw-r--r-- | sim/moxie/config.in | 2 | ||||
| -rwxr-xr-x | sim/moxie/configure | 14 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sim/moxie/ChangeLog b/sim/moxie/ChangeLog index bcdc1fa9ab..f509fc019e 100644 --- a/sim/moxie/ChangeLog +++ b/sim/moxie/ChangeLog @@ -1,3 +1,7 @@ +2015-03-16 Mike Frysinger <vapier@gentoo.org> + + * config.in, configure: Regenerate. + 2015-03-14 Mike Frysinger <vapier@gentoo.org> * Makefile.in (SIM_EXTRA_CLEAN): Delete. diff --git a/sim/moxie/config.in b/sim/moxie/config.in index b367e1429a..6003e581c6 100644 --- a/sim/moxie/config.in +++ b/sim/moxie/config.in @@ -159,3 +159,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/moxie/configure b/sim/moxie/configure index 1542765a4c..ccfdb77169 100755 --- a/sim/moxie/configure +++ b/sim/moxie/configure @@ -8281,6 +8281,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. @@ -12363,7 +12365,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12366 "configure" +#line 12368 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12469,7 +12471,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12472 "configure" +#line 12474 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12950,14 +12952,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 ;; |