sim: drop targ-vals.def->nltvals.def indirection

We don't have alternative nltvals.def files, so always symlinking
the targ-vals.def file to it doesn't gain us anything.  It does
make the build more complicated though and a pain to convert to
something newer (like automake).  Drop the symlinking entirely.

In the future, we'll want to explode this file anyways into the
respective arch dirs so things can be selected dynamically at
runtime, so it's not like we'll be bringing this back.

5 files changed, 16 insertions, 18 deletions

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 3e619376d4..a19e56ed85 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,5 +1,16 @@
 2016-01-10  Mike Frysinger  <vapier@gentoo.org>
 
+	* acinclude.m4 (SIM_AC_COMMON): Delete sim_link_files and
+	sim_link_links.
+	(SIM_AC_OUTPUT): Delete AC_LINK_FILES call.
+	* gentmap.c: Change targ-vals.def include to nltvals.def.
+	* Make-common.in (gentmap): Change targ-vals.def to
+	$(srccom)/nltvals.def.
+	(distclean): Delete rm -f targ-vals.def.
+	* Makefile.in: Update comment.
+
+2016-01-10  Mike Frysinger  <vapier@gentoo.org>
+
 	* acinclude.m4 (SIM_AC_COMMON): Call SIM_AC_OPTION_INLINE.
 	(SIM_AC_OPTION_INLINE): Rename default_sim_inline to sim_inline
 	and always set -DDEFAULT_INLINE.  Delete AC_ARG_ENABLE 4th arg.
diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index 458bf4bf5a..72b095a964 100644
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -293,7 +293,7 @@ run$(EXEEXT): $(SIM_RUN_OBJS) libsim.a $(LIBDEPS)
 # devo/libremote because this directory would contain more than just
 # a library).
 
-gentmap: Makefile $(srccom)/gentmap.c targ-vals.def
+gentmap: Makefile $(srccom)/gentmap.c $(srccom)/nltvals.def
 	$(CC_FOR_BUILD) $(srccom)/gentmap.c -o gentmap $(BUILD_CFLAGS) $(NL_TARGET)
 
 targ-vals.h targ-map.c: stamp-tvals
@@ -526,7 +526,6 @@ distclean mostlyclean maintainer-clean realclean: clean $(SIM_EXTRA_DISTCLEAN)
 	rm -f TAGS
 	rm -f Makefile config.cache config.log config.status .gdbinit
 	rm -f config.h stamp-h
-	rm -f targ-vals.def
 
 .c.o:
 	$(COMPILE) $<
diff --git a/sim/common/Makefile.in b/sim/common/Makefile.in
index 0f934ce048..a05f50767a 100644
--- a/sim/common/Makefile.in
+++ b/sim/common/Makefile.in
@@ -75,7 +75,7 @@ all:
 # This file is shipped with distributions so we build in the source dir.
 # Use `make headers' to rebuild.
 # Note: If gdb releases begin to contain target header files (not a good idea,
-# but if they did ...), targ-vals.def coud be generated at build time.
+# but if they did ...), nltvals.def coud be generated at build time.
 # An alternative is to slurp in the tables at runtime.
 .PHONY: headers
 headers:
diff --git a/sim/common/acinclude.m4 b/sim/common/acinclude.m4
index 0b027fdc07..d5b4b98794 100644
--- a/sim/common/acinclude.m4
+++ b/sim/common/acinclude.m4
@@ -236,17 +236,6 @@ AC_TYPE_SIGNAL
 dnl Detect exe extension
 AC_EXEEXT
 
-dnl These are available to append to as desired.
-sim_link_files=
-sim_link_links=
-
-# targ-vals.def points to the libc macro description file.
-case "${target}" in
-*-*-*) TARG_VALS_DEF=../common/nltvals.def ;;
-esac
-sim_link_files="${sim_link_files} ${TARG_VALS_DEF}"
-sim_link_links="${sim_link_links} targ-vals.def"
-
 ]) dnl End of SIM_AC_COMMON
 
 
@@ -838,7 +827,6 @@ dnl the target's fragment at the appropriate points.
 
 AC_DEFUN([SIM_AC_OUTPUT],
 [
-AC_LINK_FILES($sim_link_files, $sim_link_links)
 dnl Make @cgen_breaks@ non-null only if the sim uses CGEN.
 cgen_breaks=""
 if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then
diff --git a/sim/common/gentmap.c b/sim/common/gentmap.c
index 669a7e5801..a606fad0e4 100644
--- a/sim/common/gentmap.c
+++ b/sim/common/gentmap.c
@@ -11,21 +11,21 @@ struct tdefs {
 
 static struct tdefs sys_tdefs[] = {
 #define sys_defs
-#include "targ-vals.def"
+#include "nltvals.def"
 #undef sys_defs
   { 0, 0 }
 };
 
 static struct tdefs errno_tdefs[] =  {
 #define errno_defs
-#include "targ-vals.def"
+#include "nltvals.def"
 #undef errno_defs
   { 0, 0 }
 };
 
 static struct tdefs open_tdefs[] = {
 #define open_defs
-#include "targ-vals.def"
+#include "nltvals.def"
 #undef open_defs
   { 0, 0 }
 };