diff options
| author | Jeff Johnston <jjohnstn@redhat.com> | 2008-01-21 21:29:17 +0300 |
|---|---|---|
| committer | Jeff Johnston <jjohnstn@redhat.com> | 2008-01-21 21:29:17 +0300 |
| commit | cece11c51136d98591c93c52e8ec44839cc719dd (patch) | |
| tree | 4cf7382dd13ca0f36620bf962b4c1e971091a7b0 | |
| parent | 755f6f8f650d467aaa8b76570f76515fb357041d (diff) | |
2008-01-21 Neal H. Walfield <neal@gnu.org>
* Makefile.am (crt1.o): Use correct source.
* Makefile.in: Regenerated.
| -rw-r--r-- | newlib/ChangeLog | 6 | ||||
| -rw-r--r-- | newlib/Makefile.am | 4 | ||||
| -rw-r--r-- | newlib/Makefile.in | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog index a154816c4..8934f79cd 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,8 @@ +2008-01-21 Neal H. Walfield <neal@gnu.org> + + * Makefile.am (crt1.o): Use correct source. + * Makefile.in: Regenerated. + 2008-01-15 Eric Blake <ebb9@byu.net> * libc/string/Makefile.am (ELIX_2_SOURCES): Fix definition. @@ -28,6 +33,7 @@ (CHEWOUT_FILES): Build documentation for memmem. * libc/string/strings.tex: Include new docs. +>>>>>>> 1.1116 2008-01-08 Jeff Johnston <jjohnstn@redhat.com> * libc/machine/m68k/memcpy.S: Remove % from register references diff --git a/newlib/Makefile.am b/newlib/Makefile.am index a68b180f3..f9d1eb53a 100644 --- a/newlib/Makefile.am +++ b/newlib/Makefile.am @@ -181,8 +181,8 @@ $(CRT0_DIR)$(CRT0): ; @true crt1.o: $(CRT1_DIR)$(CRT1) rm -f $@ - ln $(CRT0_DIR)$(CRT0) $@ >/dev/null 2>/dev/null \ - || cp $(CRT0_DIR)$(CRT0) $@ + ln $< $@ >/dev/null 2>/dev/null \ + || cp $< $@ $(CRT1_DIR)$(CRT1): ; @true diff --git a/newlib/Makefile.in b/newlib/Makefile.in index abc19379d..798d46468 100644 --- a/newlib/Makefile.in +++ b/newlib/Makefile.in @@ -848,8 +848,8 @@ $(CRT0_DIR)$(CRT0): ; @true crt1.o: $(CRT1_DIR)$(CRT1) rm -f $@ - ln $(CRT0_DIR)$(CRT0) $@ >/dev/null 2>/dev/null \ - || cp $(CRT0_DIR)$(CRT0) $@ + ln $< $@ >/dev/null 2>/dev/null \ + || cp $< $@ $(CRT1_DIR)$(CRT1): ; @true |