3 files changed, 12 insertions, 4 deletions
diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog
index 94cfe16..32516d2 100644
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@@ -1,3 +1,11 @@
+Thu Mar 26 11:22:31 1998  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* configure.in: Make --enable-sim-common the default.
+	* configure: Re-generate.
+	
+	* sim-main.h (CIA_GET, CIA_SET): Save/restore current instruction
+ 	address into Sate.regs[REG_PC] instead of common struct.
+
 Wed Mar 25 17:42:00 1998  Joyce Janczyn  <janczyn@cygnus.com>
 
 	* mn10300.igen (cmp imm8,An): Do not sign extend imm8 value.
diff --git a/sim/mn10300/configure b/sim/mn10300/configure
index c0d6273..cb8256e 100755
--- a/sim/mn10300/configure
+++ b/sim/mn10300/configure
@@ -1177,7 +1177,7 @@ else
 fi
 done
 
-for ac_hdr in fcntl.h
+for ac_hdr in fcntl.h fpu_control.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -1217,7 +1217,7 @@ else
 fi
 done
 
-for ac_func in getrusage time sigaction
+for ac_func in getrusage time sigaction __setfpucw
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 echo "configure:1224: checking for $ac_func" >&5
@@ -1933,7 +1933,7 @@ if test x"$silent" != x"yes" && test x"$sim_gen" != x""; then
   echo "Setting sim_common = $sim_common" 6>&1
 fi
 else
-  sim_gen=""; mn10300_common="WITHOUT"
+  sim_gen="-DWITH_COMMON=1"; mn10300_common="WITH"
 fi
 
 
diff --git a/sim/mn10300/configure.in b/sim/mn10300/configure.in
index 8aeee59..e729863 100644
--- a/sim/mn10300/configure.in
+++ b/sim/mn10300/configure.in
@@ -29,7 +29,7 @@ AC_ARG_ENABLE(sim-common,
 esac
 if test x"$silent" != x"yes" && test x"$sim_gen" != x""; then
   echo "Setting sim_common = $sim_common" 6>&1
-fi],[sim_gen=""; mn10300_common="WITHOUT"])dnl
+fi],[sim_gen="-DWITH_COMMON=1"; mn10300_common="WITH"])dnl
 AC_SUBST(sim_gen)
 AC_SUBST(mn10300_common)