sim: dv-cfi: check for log2 support in libm when enabled

The dv-cfi model uses log2() internally, so make sure we automatically
link in libm when required.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog
index 829a44c..de92451 100644 (file)
--- a/sim/bfin/ChangeLog
+++ b/sim/bfin/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-19  Mike Frysinger  <vapier@gentoo.org>
+
+       * configure: Regenerate after common/acinclude.m4 update.
+
 2011-10-17  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac: Change include to common/acinclude.m4.

diff --git a/sim/bfin/configure b/sim/bfin/configure
index 0f6ad86..ffeaf4e 100755 (executable)
--- a/sim/bfin/configure
+++ b/sim/bfin/configure
@@ -5138,6 +5138,54 @@ if test x"$silent" != x"yes"; then
 fi
 fi
 
+case " $hardware " in
+  *" cfi "*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for log2 in -lm" >&5
+$as_echo_n "checking for log2 in -lm... " >&6; }
+if test "${ac_cv_lib_m_log2+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lm  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char log2 ();
+int
+main ()
+{
+return log2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_m_log2=yes
+else
+  ac_cv_lib_m_log2=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_log2" >&5
+$as_echo "$ac_cv_lib_m_log2" >&6; }
+if test "x$ac_cv_lib_m_log2" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBM 1
+_ACEOF
+
+  LIBS="-lm $LIBS"
+
+fi
+;;
+esac
+
 
 for ac_func in getuid getgid geteuid getegid setuid setgid mmap munmap kill pread
 do :

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 3ea3422..b5c5ed4 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-19  Mike Frysinger  <vapier@gentoo.org>
+
+       * acinclude.m4: Call AC_CHECK_LIB when $hardware contains cfi.
+
 2011-10-18  John Wehle  <john@feith.com>  (tiny patch)
 
        * sim-profile.c (profile_info): Only print the title once.

diff --git a/sim/common/acinclude.m4 b/sim/common/acinclude.m4
index 11398f5..9979746 100644 (file)
--- a/sim/common/acinclude.m4
+++ b/sim/common/acinclude.m4
@@ -623,7 +623,11 @@ if test "$sim_hw_p" != yes; then
 fi
 if test x"$silent" != x"yes"; then
   echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
-fi])dnl
+fi])
+dnl Some devices require extra libraries.
+case " $hardware " in
+  *" cfi "*) AC_CHECK_LIB(m, log2);;
+esac
 ])
 AC_SUBST(sim_hw_cflags)
 AC_SUBST(sim_hw_objs)

diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog
index 7c10bef..49bda69 100644 (file)
--- a/sim/cris/ChangeLog
+++ b/sim/cris/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-19  Mike Frysinger  <vapier@gentoo.org>
+
+       * configure: Regenerate after common/acinclude.m4 update.
+
 2011-10-17  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac: Change include to common/acinclude.m4.

diff --git a/sim/cris/configure b/sim/cris/configure
index c83f0fa..ff122be 100755 (executable)
--- a/sim/cris/configure
+++ b/sim/cris/configure
@@ -5007,6 +5007,54 @@ if test x"$silent" != x"yes"; then
 fi
 fi
 
+case " $hardware " in
+  *" cfi "*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for log2 in -lm" >&5
+$as_echo_n "checking for log2 in -lm... " >&6; }
+if test "${ac_cv_lib_m_log2+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lm  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char log2 ();
+int
+main ()
+{
+return log2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_m_log2=yes
+else
+  ac_cv_lib_m_log2=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_log2" >&5
+$as_echo "$ac_cv_lib_m_log2" >&6; }
+if test "x$ac_cv_lib_m_log2" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBM 1
+_ACEOF
+
+  LIBS="-lm $LIBS"
+
+fi
+;;
+esac
+
 
 # The default model shouldn't matter as long as there's a BFD.
 

diff --git a/sim/lm32/ChangeLog b/sim/lm32/ChangeLog
index 1dd5e64..d7e561c 100755 (executable)
--- a/sim/lm32/ChangeLog
+++ b/sim/lm32/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-19  Mike Frysinger  <vapier@gentoo.org>
+
+       * configure: Regenerate after common/acinclude.m4 update.
+
 2011-10-17  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac: Change include to common/acinclude.m4.

diff --git a/sim/lm32/configure b/sim/lm32/configure
index d4f6045..54a5c5a 100755 (executable)
--- a/sim/lm32/configure
+++ b/sim/lm32/configure
@@ -5003,6 +5003,54 @@ if test x"$silent" != x"yes"; then
 fi
 fi
 
+case " $hardware " in
+  *" cfi "*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for log2 in -lm" >&5
+$as_echo_n "checking for log2 in -lm... " >&6; }
+if test "${ac_cv_lib_m_log2+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lm  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char log2 ();
+int
+main ()
+{
+return log2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_m_log2=yes
+else
+  ac_cv_lib_m_log2=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_log2" >&5
+$as_echo "$ac_cv_lib_m_log2" >&6; }
+if test "x$ac_cv_lib_m_log2" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBM 1
+_ACEOF
+
+  LIBS="-lm $LIBS"
+
+fi
+;;
+esac
+
 
 
 ac_sources="$sim_link_files"

diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog
index 39caeef..617ec1e 100644 (file)
--- a/sim/m68hc11/ChangeLog
+++ b/sim/m68hc11/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-19  Mike Frysinger  <vapier@gentoo.org>
+
+       * configure: Regenerate after common/acinclude.m4 update.
+
 2011-10-17  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac: Change include to common/acinclude.m4.

diff --git a/sim/m68hc11/configure b/sim/m68hc11/configure
index 3d44c5e..450cb76 100755 (executable)
--- a/sim/m68hc11/configure
+++ b/sim/m68hc11/configure
@@ -5022,6 +5022,54 @@ if test x"$silent" != x"yes"; then
 fi
 fi
 
+case " $hardware " in
+  *" cfi "*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for log2 in -lm" >&5
+$as_echo_n "checking for log2 in -lm... " >&6; }
+if test "${ac_cv_lib_m_log2+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lm  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char log2 ();
+int
+main ()
+{
+return log2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_m_log2=yes
+else
+  ac_cv_lib_m_log2=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_log2" >&5
+$as_echo "$ac_cv_lib_m_log2" >&6; }
+if test "x$ac_cv_lib_m_log2" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBM 1
+_ACEOF
+
+  LIBS="-lm $LIBS"
+
+fi
+;;
+esac
+
 
 for ac_header in string.h strings.h stdlib.h stdlib.h fcntl.h
 do :

diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index ddfd7c2..2a60839 100644 (file)
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-19  Mike Frysinger  <vapier@gentoo.org>
+
+       * configure: Regenerate after common/acinclude.m4 update.
+
 2011-10-17  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac: Change include to common/acinclude.m4.

diff --git a/sim/mips/configure b/sim/mips/configure
index af372a2..b3ebb49 100755 (executable)
--- a/sim/mips/configure
+++ b/sim/mips/configure
@@ -5602,6 +5602,54 @@ if test x"$silent" != x"yes"; then
 fi
 fi
 
+case " $hardware " in
+  *" cfi "*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for log2 in -lm" >&5
+$as_echo_n "checking for log2 in -lm... " >&6; }
+if test "${ac_cv_lib_m_log2+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lm  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char log2 ();
+int
+main ()
+{
+return log2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_m_log2=yes
+else
+  ac_cv_lib_m_log2=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_log2" >&5
+$as_echo "$ac_cv_lib_m_log2" >&6; }
+if test "x$ac_cv_lib_m_log2" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBM 1
+_ACEOF
+
+  LIBS="-lm $LIBS"
+
+fi
+;;
+esac
+
 
 
 

diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog
index b33ee2a..cc2cbb1 100644 (file)
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-19  Mike Frysinger  <vapier@gentoo.org>
+
+       * configure: Regenerate after common/acinclude.m4 update.
+
 2011-10-17  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac: Change include to common/acinclude.m4.

diff --git a/sim/mn10300/configure b/sim/mn10300/configure
index 59b9b61..488dce9 100755 (executable)
--- a/sim/mn10300/configure
+++ b/sim/mn10300/configure
@@ -5131,6 +5131,54 @@ if test x"$silent" != x"yes"; then
 fi
 fi
 
+case " $hardware " in
+  *" cfi "*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for log2 in -lm" >&5
+$as_echo_n "checking for log2 in -lm... " >&6; }
+if test "${ac_cv_lib_m_log2+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lm  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char log2 ();
+int
+main ()
+{
+return log2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_m_log2=yes
+else
+  ac_cv_lib_m_log2=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_log2" >&5
+$as_echo "$ac_cv_lib_m_log2" >&6; }
+if test "x$ac_cv_lib_m_log2" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBM 1
+_ACEOF
+
+  LIBS="-lm $LIBS"
+
+fi
+;;
+esac
+
 
 for ac_func in time chmod utime fork execve execv chown
 do :