diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index e284022b0..e0ddb7d34 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,9 @@
+2002-03-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+        * libc/machine/i386/Makefile.am: Add $(oext) for setjmp
+        object so it works for shared library or statici library.
+        * libc/machine/i386/Makefile.in: Regenerated.
+
 Wed Mar  6 10:24:26 2002  J"orn Rennecke <joern.rennecke@superh.com>
 
 	* Makefile.am (lib_a_SOURCES, SH64 case): Add memcpy.S, memset.S
diff --git a/newlib/libc/machine/i386/Makefile.am b/newlib/libc/machine/i386/Makefile.am
index 20f75203f..d48f3ae1c 100644
--- a/newlib/libc/machine/i386/Makefile.am
+++ b/newlib/libc/machine/i386/Makefile.am
@@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = cygnus
 INCLUDES = -I $(newlib_basedir)/libm/common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
 if MACH_ADD_SETJMP
-mach_add_obj=setjmp.o
+mach_add_obj=setjmp.$(oext)
 else
 mach_add_obj=
 endif
diff --git a/newlib/libc/machine/i386/Makefile.in b/newlib/libc/machine/i386/Makefile.in
index ada150680..c037e8d65 100644
--- a/newlib/libc/machine/i386/Makefile.in
+++ b/newlib/libc/machine/i386/Makefile.in
@@ -86,7 +86,7 @@ sys_dir = @sys_dir@
 AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = -I $(newlib_basedir)/libm/common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-@MACH_ADD_SETJMP_TRUE@mach_add_obj = @MACH_ADD_SETJMP_TRUE@setjmp.o
+@MACH_ADD_SETJMP_TRUE@mach_add_obj = @MACH_ADD_SETJMP_TRUE@setjmp.$(oext)
 @MACH_ADD_SETJMP_FALSE@mach_add_obj = 
 
 LIB_SOURCES = \