diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog
index b48bc124fd..48099c3afe 100644
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@@ -1,3 +1,15 @@
+Mon Oct 27 12:43:54 1997  Doug Evans  <devans@canuck.cygnus.com>
+
+	* sem-ops.h (U{DIV,MOD}[BHSD]I): Use unsigned division.
+
+Fri Oct  3 09:28:00 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* configure: Regenerated to track ../common/aclocal.m4 changes.
+
+Wed Sep 24 17:38:57 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* configure: Regenerated to track ../common/aclocal.m4 changes.
+
 Tue Sep 23 11:04:38 1997  Andrew Cagney  <cagney@b1.cygnus.com>
 
 	* configure: Regenerated to track ../common/aclocal.m4 changes.
diff --git a/sim/m32r/sem-ops.h b/sim/m32r/sem-ops.h
index 6ae08a5020..5f101b102f 100644
--- a/sim/m32r/sem-ops.h
+++ b/sim/m32r/sem-ops.h
@@ -31,9 +31,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define SUBBI(x, y) ((x) - (y))
 #define MULBI(x, y) ((x) * (y))
 #define DIVBI(x, y) ((BI) (x) / (BI) (y))
-#define UDIVBI(x, y) ((BI) (x) / (BI) (y))
+#define UDIVBI(x, y) ((UBI) (x) / (UBI) (y))
 #define MODBI(x, y) ((BI) (x) % (BI) (y))
-#define UMODBI(x, y) ((BI) (x) % (BI) (y))
+#define UMODBI(x, y) ((UBI) (x) % (UBI) (y))
 #define SRABI(x, y) ((BI) (x) >> (y))
 #define SRLBI(x, y) ((UBI) (x) >> (y))
 #define SHLBI(x, y) ((UBI) (x) << (y))
@@ -62,9 +62,9 @@ extern BI ROLBI PARAMS ((BI, int));
 #define SUBQI(x, y) ((x) - (y))
 #define MULQI(x, y) ((x) * (y))
 #define DIVQI(x, y) ((QI) (x) / (QI) (y))
-#define UDIVQI(x, y) ((QI) (x) / (QI) (y))
+#define UDIVQI(x, y) ((UQI) (x) / (UQI) (y))
 #define MODQI(x, y) ((QI) (x) % (QI) (y))
-#define UMODQI(x, y) ((QI) (x) % (QI) (y))
+#define UMODQI(x, y) ((UQI) (x) % (UQI) (y))
 #define SRAQI(x, y) ((QI) (x) >> (y))
 #define SRLQI(x, y) ((UQI) (x) >> (y))
 #define SHLQI(x, y) ((UQI) (x) << (y))
@@ -93,9 +93,9 @@ extern QI ROLQI PARAMS ((QI, int));
 #define SUBHI(x, y) ((x) - (y))
 #define MULHI(x, y) ((x) * (y))
 #define DIVHI(x, y) ((HI) (x) / (HI) (y))
-#define UDIVHI(x, y) ((HI) (x) / (HI) (y))
+#define UDIVHI(x, y) ((UHI) (x) / (UHI) (y))
 #define MODHI(x, y) ((HI) (x) % (HI) (y))
-#define UMODHI(x, y) ((HI) (x) % (HI) (y))
+#define UMODHI(x, y) ((UHI) (x) % (UHI) (y))
 #define SRAHI(x, y) ((HI) (x) >> (y))
 #define SRLHI(x, y) ((UHI) (x) >> (y))
 #define SHLHI(x, y) ((UHI) (x) << (y))
@@ -124,9 +124,9 @@ extern HI ROLHI PARAMS ((HI, int));
 #define SUBSI(x, y) ((x) - (y))
 #define MULSI(x, y) ((x) * (y))
 #define DIVSI(x, y) ((SI) (x) / (SI) (y))
-#define UDIVSI(x, y) ((SI) (x) / (SI) (y))
+#define UDIVSI(x, y) ((USI) (x) / (USI) (y))
 #define MODSI(x, y) ((SI) (x) % (SI) (y))
-#define UMODSI(x, y) ((SI) (x) % (SI) (y))
+#define UMODSI(x, y) ((USI) (x) % (USI) (y))
 #define SRASI(x, y) ((SI) (x) >> (y))
 #define SRLSI(x, y) ((USI) (x) >> (y))
 #define SHLSI(x, y) ((USI) (x) << (y))
@@ -156,9 +156,9 @@ extern DI ADDDI PARAMS ((DI, DI));
 extern DI SUBDI PARAMS ((DI, DI));
 extern DI MULDI PARAMS ((DI, DI));
 extern DI DIVDI PARAMS ((DI, DI));
-extern DI UDIVDI PARAMS ((DI, DI));
+extern UDI UDIVDI PARAMS ((UDI, UDI));
 extern DI MODDI PARAMS ((DI, DI));
-extern DI UMODDI PARAMS ((DI, DI));
+extern UDI UMODDI PARAMS ((UDI, UDI));
 extern DI SRADI PARAMS ((DI, int));
 extern UDI SRLDI PARAMS ((UDI, int));
 extern UDI SHLDI PARAMS ((UDI, int));
@@ -187,9 +187,9 @@ extern int GEUDI PARAMS ((UDI, UDI));
 #define SUBDI(x, y) ((x) - (y))
 #define MULDI(x, y) ((x) * (y))
 #define DIVDI(x, y) ((DI) (x) / (DI) (y))
-#define UDIVDI(x, y) ((DI) (x) / (DI) (y))
+#define UDIVDI(x, y) ((UDI) (x) / (UDI) (y))
 #define MODDI(x, y) ((DI) (x) % (DI) (y))
-#define UMODDI(x, y) ((DI) (x) % (DI) (y))
+#define UMODDI(x, y) ((UDI) (x) % (UDI) (y))
 #define SRADI(x, y) ((DI) (x) >> (y))
 #define SRLDI(x, y) ((UDI) (x) >> (y))
 #define SHLDI(x, y) ((UDI) (x) << (y))