From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 9 Jan 2016 01:27:46 +0000 (-0500)
Subject: sim: stop configuring common subdir
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5295724cdc94a09713b021728b02163dad128e9e;p=binutils-gdb.git

sim: stop configuring common subdir

Now that cconfig.h doesn't exist, there's no need to build in the common
subdir anymore.  We leave the configure/Makefile files in there as there
is a helper for developers to generate the nltvals.def file.  Once that
gets cleaned up in the future though, we can drop the build logic too.
---

diff --git a/sim/ChangeLog b/sim/ChangeLog
index 93a6ee7c6c4..30eee38ba57 100644
--- a/sim/ChangeLog
+++ b/sim/ChangeLog
@@ -1,3 +1,10 @@
+2016-01-09  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac: Delete sim_common check and the
+	AC_CONFIG_SUBDIRS(common) call.
+	* configure: Regenerate.
+	* configure.tgt (sim_common): Delete the variable.
+
 2016-01-09  Mike Frysinger  <vapier@gentoo.org>
 
 	* .gitignore: Delete /common/cconfig.h entry.
diff --git a/sim/configure b/sim/configure
index 3447321ffa7..2729e698171 100755
--- a/sim/configure
+++ b/sim/configure
@@ -663,7 +663,6 @@ ppc
 ft32
 v850
 testsuite
-common
 igen'
 
 # Initialize some variables set by options.
@@ -3622,7 +3621,6 @@ if test "${enable_sim}" != no; then
 
 
 
-sim_common=yes
 sim_igen=no
 sim_arch=
 case "${target}" in
@@ -3827,19 +3825,11 @@ subdirs="$subdirs aarch64"
 
        sim_igen=yes
        ;;
-   *)
-       # No simulator subdir, so the subdir "common" isn't needed.
-       sim_common=no
-       ;;
 esac
 
 
    subdirs="$subdirs testsuite"
 
-   if test "$sim_common" = yes; then
-      subdirs="$subdirs common"
-
-   fi
    if test "$sim_igen" = yes; then
       subdirs="$subdirs igen"
 
diff --git a/sim/configure.ac b/sim/configure.ac
index 39f9c6e179a..22db00f734c 100644
--- a/sim/configure.ac
+++ b/sim/configure.ac
@@ -43,9 +43,6 @@ m4_define([SIM_ARCH], [
 if test "${enable_sim}" != no; then
    sinclude(configure.tgt)
    AC_CONFIG_SUBDIRS(testsuite)
-   if test "$sim_common" = yes; then
-      AC_CONFIG_SUBDIRS(common)
-   fi
    if test "$sim_igen" = yes; then
       AC_CONFIG_SUBDIRS(igen)
    fi
diff --git a/sim/configure.tgt b/sim/configure.tgt
index 83f6cb2e2ad..c958fb31747 100644
--- a/sim/configure.tgt
+++ b/sim/configure.tgt
@@ -11,7 +11,6 @@ dnl the shell level, so use sinclude(...) to pull it in.
 dnl glue to avoid code duplication at top level
 m4_ifndef([SIM_ARCH], [AC_DEFUN([SIM_ARCH],[sim_arch=$1])])
 
-sim_common=yes
 sim_igen=no
 sim_arch=
 case "${target}" in
@@ -102,9 +101,5 @@ case "${target}" in
        SIM_ARCH(v850)
        sim_igen=yes
        ;;
-   *)
-       # No simulator subdir, so the subdir "common" isn't needed.
-       sim_common=no
-       ;;
 esac
 AC_SUBST(sim_arch)