diff --git a/ChangeLog b/ChangeLog
index 9899cc7457ad45485625dabc40ec36b44589638a..66e9e0120f3dc7effddf3a3674e3db2d1ca2e377 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Apr 22 12:30:10 1998  Michael Meissner  <meissner@cygnus.com>
+
+	* configure.in (target_makefile_frag): If --enable-target-optspace,
+	use -Os to compile target libraries rather than -O2.  Default to
+	using -Os for m32r if --{enable,disable}-target-optspace is not
+	used.
+
 Tue Apr 14 11:33:51 1998  Krister Walfridsson <cato@df.lth.se>
 
 	* configure: Define DEFAULT_M4 by searching PATH.
diff --git a/configure.in b/configure.in
index 21c0b4b6e700b3f4805870328fc949a721fc1139..f66ce6f6842b1a9e283415910ed2ecd7292bca40 100644
--- a/configure.in
+++ b/configure.in
@@ -311,6 +311,24 @@ case "${target}" in
     ;;
 esac
 
+# If --enable-target-optspace always use -Os instead of -O2 to build
+# the target libraries, similarly if it is not specified, use -Os
+# on selected platforms.
+echo "---${enable_target_optspace}:${target}--" 1>&2
+case "${enable_target_optspace}:${target}" in
+  yes:*)
+    target_makefile_frag="${target_makefile_frag} config/mt-ospace"
+    ;;
+  :m32r-*)
+    target_makefile_frag="${target_makefile_frag} config/mt-ospace"
+    ;;
+  no:* | :*)
+    ;;
+  *)
+    echo "*** bad value \"${enable_target_optspace}\" for --enable-target-optspace flag; ignored" 1>&2
+    ;;
+esac
+
 skipdirs=
 gasdir=gas
 use_gnu_ld=