3 files changed, 15 insertions, 1 deletions
diff --git a/newlib/doc/Makefile.in b/newlib/doc/Makefile.in
index 52f065e51..888607ad1 100644
--- a/newlib/doc/Makefile.in
+++ b/newlib/doc/Makefile.in
@@ -74,6 +74,7 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
diff --git a/newlib/doc/aclocal.m4 b/newlib/doc/aclocal.m4
index a7b261051..ccd3bc67a 100644
--- a/newlib/doc/aclocal.m4
+++ b/newlib/doc/aclocal.m4
@@ -165,6 +165,12 @@ LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
+
+# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
+# use oext, which is set in configure.host based on the target platform.
+OBJEXT=${oext}
+
+AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
diff --git a/newlib/doc/configure b/newlib/doc/configure
index 31abdfb4e..56be3d6b9 100755
--- a/newlib/doc/configure
+++ b/newlib/doc/configure
@@ -1474,6 +1474,12 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
+# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
+# use oext, which is set in configure.host based on the target platform.
+OBJEXT=${oext}
+
+
+
 
 
 
@@ -1496,7 +1502,7 @@ if test "x$cross_compiling" = "xno"; then
   EXEEXT_FOR_BUILD='$(EXEEXT)'
 else
   echo $ac_n "checking for build system executable suffix""... $ac_c" 1>&6
-echo "configure:1500: checking for build system executable suffix" >&5
+echo "configure:1506: checking for build system executable suffix" >&5
 if eval "test \"`echo '$''{'newlib_cv_build_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1700,6 +1706,7 @@ s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
+s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g