aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Johnston <jjohnstn@redhat.com>2002-03-06 23:14:17 +0000
committerJeff Johnston <jjohnstn@redhat.com>2002-03-06 23:14:17 +0000
commit2a606041a1d6e841ebe7c3158e12bd6d6ad1b51e (patch)
tree56cd45ced57e96db08ef3e165999626f03d0b920
parentb7410006b900f996e5cca6a977f0ca20cfa216fb (diff)
downloadnewlib-2a606041a1d6e841ebe7c3158e12bd6d6ad1b51e.zip
newlib-2a606041a1d6e841ebe7c3158e12bd6d6ad1b51e.tar.gz
newlib-2a606041a1d6e841ebe7c3158e12bd6d6ad1b51e.tar.bz2
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.
-rw-r--r--newlib/ChangeLog6
-rw-r--r--newlib/libc/machine/i386/Makefile.am2
-rw-r--r--newlib/libc/machine/i386/Makefile.in2
3 files changed, 8 insertions, 2 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index e284022..e0ddb7d 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 20f7520..d48f3ae 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 ada1506..c037e8d 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 = \