diff --git a/sim/ChangeLog b/sim/ChangeLog index 93a6ee7c6c..30eee38ba5 100644 --- a/sim/ChangeLog +++ b/sim/ChangeLog @@ -1,3 +1,10 @@ +2016-01-09 Mike Frysinger + + * 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 * .gitignore: Delete /common/cconfig.h entry. diff --git a/sim/configure b/sim/configure index 3447321ffa..2729e69817 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 39f9c6e179..22db00f734 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 83f6cb2e2a..c958fb3174 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)