From ae7d0cac8ce971f7108d270c1d3f8481919b1e86 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 14 Mar 2015 23:41:25 -0400
Subject: 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.
---
 sim/cr16/ChangeLog |  4 ++++
 sim/cr16/config.in |  2 ++
 sim/cr16/configure | 14 ++++----------
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'sim/cr16')

diff --git a/sim/cr16/ChangeLog b/sim/cr16/ChangeLog
index 3a81178..9669379 100644
--- a/sim/cr16/ChangeLog
+++ b/sim/cr16/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_CFLAGS): Add
diff --git a/sim/cr16/config.in b/sim/cr16/config.in
index 5fed8c1..5ded703 100644
--- a/sim/cr16/config.in
+++ b/sim/cr16/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/cr16/configure b/sim/cr16/configure
index b154ae0..c7e82ec 100755
--- a/sim/cr16/configure
+++ b/sim/cr16/configure
@@ -8278,6 +8278,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.
@@ -12360,7 +12362,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12363 "configure"
+#line 12365 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12466,7 +12468,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12469 "configure"
+#line 12471 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12947,14 +12949,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 ;;
-- 
cgit v1.1