diff options
| -rw-r--r-- | newlib/ChangeLog | 9 | ||||
| -rw-r--r-- | newlib/Makefile.am | 1 | ||||
| -rw-r--r-- | newlib/Makefile.in | 1 | ||||
| -rw-r--r-- | newlib/libc/machine/sh/Makefile.am | 2 | ||||
| -rw-r--r-- | newlib/libc/machine/sh/Makefile.in | 2 |
5 files changed, 13 insertions, 2 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog index e1af1bda3..ab231a5ee 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,12 @@ +2006-06-05 Jeff Johnston <jjohnstn@redhat.com> + + * Makefile.am (AM_MAKEFLAGS): Pass CCASFLAGS. + * Makefile.in: Regenerated. + * libc/machine/sh/Makefile.am (AM_CCASFLAGS): Remove + extraneous CFLAGS reference now that CCASFLAGS are being extended + properly via multilib. + * libc/machine/sh/Makefile.in: Regenerated. + 2006-06-02 Shaun Jackman <sjackman@gmail.com> * libc/unix/sigset.c: Undefine sigfillset, sigdelset, and diff --git a/newlib/Makefile.am b/newlib/Makefile.am index 0ac00a347..55f43bcae 100644 --- a/newlib/Makefile.am +++ b/newlib/Makefile.am @@ -26,6 +26,7 @@ AM_MAKEFLAGS = \ "AR_FLAGS=$(AR_FLAGS)" \ "CC_FOR_BUILD=$(CC_FOR_BUILD)" \ "CFLAGS=$(CFLAGS)" \ + "CCASFLAGS=$(CCASFLAGS)" \ "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \ "INSTALL=$(INSTALL)" \ diff --git a/newlib/Makefile.in b/newlib/Makefile.in index 4fa946b73..e99331993 100644 --- a/newlib/Makefile.in +++ b/newlib/Makefile.in @@ -277,6 +277,7 @@ AM_MAKEFLAGS = \ "AR_FLAGS=$(AR_FLAGS)" \ "CC_FOR_BUILD=$(CC_FOR_BUILD)" \ "CFLAGS=$(CFLAGS)" \ + "CCASFLAGS=$(CCASFLAGS)" \ "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \ "INSTALL=$(INSTALL)" \ diff --git a/newlib/libc/machine/sh/Makefile.am b/newlib/libc/machine/sh/Makefile.am index b44cd8d48..adf81a5d1 100644 --- a/newlib/libc/machine/sh/Makefile.am +++ b/newlib/libc/machine/sh/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -AM_CCASFLAGS = $(INCLUDES) $(CFLAGS) +AM_CCASFLAGS = $(INCLUDES) noinst_LIBRARIES = lib.a diff --git a/newlib/libc/machine/sh/Makefile.in b/newlib/libc/machine/sh/Makefile.in index dd56b12b6..67bf721b6 100644 --- a/newlib/libc/machine/sh/Makefile.in +++ b/newlib/libc/machine/sh/Makefile.in @@ -192,7 +192,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ AUTOMAKE_OPTIONS = cygnus INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -AM_CCASFLAGS = $(INCLUDES) $(CFLAGS) +AM_CCASFLAGS = $(INCLUDES) noinst_LIBRARIES = lib.a @SH64_FALSE@lib_a_SOURCES = memcpy.S memset.S setjmp.S strcpy.S strlen.S strcmp.S @SH64_TRUE@lib_a_SOURCES = memcpy.S memset.S setjmp.S strcpy.S strlen.S strcmp.S strncpy.S |