diff options
| author | Jeff Johnston <jjohnstn@redhat.com> | 2006-04-05 01:33:52 +0400 |
|---|---|---|
| committer | Jeff Johnston <jjohnstn@redhat.com> | 2006-04-05 01:33:52 +0400 |
| commit | 9135a495e3c9c56d0cbf814ba2dd83392f908d52 (patch) | |
| tree | 32b0239c0204542e94f617975ea653f8fcb5eaf5 | |
| parent | 9844664ccfd6398843bb1862ca967e42862f25ca (diff) | |
2006-04-04 Jeff Johnston <jjohnstn@redhat.com>newlib-autotools-branch
* libc/sys/arm/Makefile.am: Add EXTRA sources including
trap.S so that automake will generate a .S.o suffix rule.
* libc/sys/arm/Makefile.in: Regenerated.
| -rw-r--r-- | newlib/ChangeLog | 6 | ||||
| -rw-r--r-- | newlib/libc/sys/arm/Makefile.am | 1 | ||||
| -rw-r--r-- | newlib/libc/sys/arm/Makefile.in | 14 |
3 files changed, 18 insertions, 3 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 70a66270f..511c6b873 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,9 @@ +2006-04-04 Jeff Johnston <jjohnstn@redhat.com> + + * libc/sys/arm/Makefile.am: Add EXTRA sources including + trap.S so that automake will generate a .S.o suffix rule. + * libc/sys/arm/Makefile.in: Regenerated. + 2006-03-30 Jeff Johnston <jjohnstn@redhat.com> * acinclude.m4: Properly add square brackets for diff --git a/newlib/libc/sys/arm/Makefile.am b/newlib/libc/sys/arm/Makefile.am index 9161407dc..d26b260d2 100644 --- a/newlib/libc/sys/arm/Makefile.am +++ b/newlib/libc/sys/arm/Makefile.am @@ -16,6 +16,7 @@ endif lib_a_SOURCES = aeabi_atexit.c lib_a_LIBADD = $(extra_objs) +EXTRA_lib_a_SOURCES = trap.S syscalls.c libcfunc.c lib_a_DEPENDENCIES = $(extra_objs) if MAY_SUPPLY_SYSCALLS diff --git a/newlib/libc/sys/arm/Makefile.in b/newlib/libc/sys/arm/Makefile.in index 6690e6aa3..1b40e5c31 100644 --- a/newlib/libc/sys/arm/Makefile.in +++ b/newlib/libc/sys/arm/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -SOURCES = $(lib_a_SOURCES) +SOURCES = $(lib_a_SOURCES) $(EXTRA_lib_a_SOURCES) srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -63,11 +63,12 @@ lib_a_OBJECTS = $(am_lib_a_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) depcomp = am__depfiles_maybe = +CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS) COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(lib_a_SOURCES) +SOURCES = $(lib_a_SOURCES) $(EXTRA_lib_a_SOURCES) ETAGS = etags CTAGS = ctags ACLOCAL = @ACLOCAL@ @@ -188,13 +189,14 @@ noinst_LIBRARIES = lib.a @MAY_SUPPLY_SYSCALLS_TRUE@extra_objs = libcfunc.o trap.o syscalls.o lib_a_SOURCES = aeabi_atexit.c lib_a_LIBADD = $(extra_objs) +EXTRA_lib_a_SOURCES = trap.S syscalls.c libcfunc.c lib_a_DEPENDENCIES = $(extra_objs) ACLOCAL_AMFLAGS = -I ../../.. CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host all: all-am .SUFFIXES: -.SUFFIXES: .c .o .obj +.SUFFIXES: .S .c .o .obj am--refresh: @: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @@ -242,6 +244,12 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c +.S.o: + $(CCASCOMPILE) -c $< + +.S.obj: + $(CCASCOMPILE) -c `$(CYGPATH_W) '$<'` + .c.o: $(COMPILE) -c $< |