From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id 6BC313858D20; Fri, 4 Feb 2022 01:46:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6BC313858D20 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Frysinger To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] newlib: arm & v850: simplify build rules X-Act-Checkin: newlib-cygwin X-Git-Author: Mike Frysinger X-Git-Refname: refs/heads/master X-Git-Oldrev: 4aeba490165bc8585fb1d18037718406c0ec4d5b X-Git-Newrev: 4574c6037853789b69b7cce9a4264448eca24f08 Message-Id: <20220204014656.6BC313858D20@sourceware.org> Date: Fri, 4 Feb 2022 01:46:56 +0000 (GMT) X-BeenThere: newlib-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib GIT logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Feb 2022 01:46:56 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D4574c603785= 3789b69b7cce9a4264448eca24f08 commit 4574c6037853789b69b7cce9a4264448eca24f08 Author: Mike Frysinger Date: Tue Feb 1 00:46:42 2022 -0500 newlib: arm & v850: simplify build rules =20 Let automake manage whether the objects are included in lib.a. This fixes failures after to commit 71086e8b2d70c1e71a8372f35d9901505fc72905 ("newlib: delete (most) redundant lib_a_CCASFLAGS=3D$(AM_CCASFLAGS)") d= ue to automake generating different set of implicit rules, and the code in here assuming the names of the generated objects. Diff: --- newlib/libc/sys/arm/Makefile.am | 10 +---- newlib/libc/sys/arm/Makefile.in | 31 +++++++------- newlib/libc/sys/sysnecv850/Makefile.am | 19 ++------- newlib/libc/sys/sysnecv850/Makefile.in | 78 +++++++++++++++++-------------= ---- 4 files changed, 60 insertions(+), 78 deletions(-) diff --git a/newlib/libc/sys/arm/Makefile.am b/newlib/libc/sys/arm/Makefile= .am index dda6ffb8a..964813725 100644 --- a/newlib/libc/sys/arm/Makefile.am +++ b/newlib/libc/sys/arm/Makefile.am @@ -6,16 +6,10 @@ AM_CCASFLAGS =3D $(AM_CPPFLAGS) =20 noinst_LIBRARIES =3D lib.a =20 +lib_a_SOURCES =3D access.c aeabi_atexit.c if MAY_SUPPLY_SYSCALLS -extra_objs =3D $(lpfx)libcfunc.o $(lpfx)trap.o $(lpfx)syscalls.o -else -extra_objs =3D +lib_a_SOURCES +=3D libcfunc.c trap.S syscalls.c endif - -lib_a_SOURCES =3D access.c aeabi_atexit.c -lib_a_LIBADD =3D $(extra_objs) -EXTRA_lib_a_SOURCES =3D trap.S syscalls.c libcfunc.c -lib_a_DEPENDENCIES =3D $(extra_objs) lib_a_CFLAGS =3D $(AM_CFLAGS) =20 if MAY_SUPPLY_SYSCALLS diff --git a/newlib/libc/sys/arm/Makefile.in b/newlib/libc/sys/arm/Makefile= .in index e7e75814c..84d62e91c 100644 --- a/newlib/libc/sys/arm/Makefile.in +++ b/newlib/libc/sys/arm/Makefile.in @@ -88,6 +88,7 @@ PRE_UNINSTALL =3D : POST_UNINSTALL =3D : build_triplet =3D @build@ host_triplet =3D @host@ +@MAY_SUPPLY_SYSCALLS_TRUE@am__append_1 =3D libcfunc.c trap.S syscalls.c subdir =3D sys/arm ACLOCAL_M4 =3D $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps =3D $(top_srcdir)/../../config/depstand.m4 \ @@ -117,9 +118,12 @@ am__v_AR_ =3D $(am__v_AR_@AM_DEFAULT_V@) am__v_AR_0 =3D @echo " AR " $@; am__v_AR_1 =3D=20 lib_a_AR =3D $(AR) $(ARFLAGS) -@MAY_SUPPLY_SYSCALLS_TRUE@am__DEPENDENCIES_1 =3D $(lpfx)libcfunc.o \ -@MAY_SUPPLY_SYSCALLS_TRUE@ $(lpfx)trap.o $(lpfx)syscalls.o -am_lib_a_OBJECTS =3D lib_a-access.$(OBJEXT) lib_a-aeabi_atexit.$(OBJEXT) +lib_a_LIBADD =3D +@MAY_SUPPLY_SYSCALLS_TRUE@am__objects_1 =3D lib_a-libcfunc.$(OBJEXT) \ +@MAY_SUPPLY_SYSCALLS_TRUE@ trap.$(OBJEXT) \ +@MAY_SUPPLY_SYSCALLS_TRUE@ lib_a-syscalls.$(OBJEXT) +am_lib_a_OBJECTS =3D lib_a-access.$(OBJEXT) lib_a-aeabi_atexit.$(OBJEXT) \ + $(am__objects_1) lib_a_OBJECTS =3D $(am_lib_a_OBJECTS) AM_V_P =3D $(am__v_P_@AM_V@) am__v_P_ =3D $(am__v_P_@AM_DEFAULT_V@) @@ -168,7 +172,7 @@ AM_V_CCLD =3D $(am__v_CCLD_@AM_V@) am__v_CCLD_ =3D $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 =3D @echo " CCLD " $@; am__v_CCLD_1 =3D=20 -SOURCES =3D $(lib_a_SOURCES) $(EXTRA_lib_a_SOURCES) +SOURCES =3D $(lib_a_SOURCES) am__can_run_installinfo =3D \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -342,12 +346,7 @@ top_srcdir =3D @top_srcdir@ AM_CPPFLAGS =3D $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -I$(abs_= newlib_basedir)/libc/machine/arm AM_CCASFLAGS =3D $(AM_CPPFLAGS) noinst_LIBRARIES =3D lib.a -@MAY_SUPPLY_SYSCALLS_FALSE@extra_objs =3D=20 -@MAY_SUPPLY_SYSCALLS_TRUE@extra_objs =3D $(lpfx)libcfunc.o $(lpfx)trap.o $= (lpfx)syscalls.o -lib_a_SOURCES =3D access.c aeabi_atexit.c -lib_a_LIBADD =3D $(extra_objs) -EXTRA_lib_a_SOURCES =3D trap.S syscalls.c libcfunc.c -lib_a_DEPENDENCIES =3D $(extra_objs) +lib_a_SOURCES =3D access.c aeabi_atexit.c $(am__append_1) lib_a_CFLAGS =3D $(AM_CFLAGS) all: all-am =20 @@ -427,18 +426,18 @@ lib_a-aeabi_atexit.o: aeabi_atexit.c lib_a-aeabi_atexit.obj: aeabi_atexit.c $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(= CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-aeabi_atexit.obj `if test -= f 'aeabi_atexit.c'; then $(CYGPATH_W) 'aeabi_atexit.c'; else $(CYGPATH_W) '= $(srcdir)/aeabi_atexit.c'; fi` =20 -lib_a-syscalls.o: syscalls.c - $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(= CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-syscalls.o `test -f 'syscal= ls.c' || echo '$(srcdir)/'`syscalls.c - -lib_a-syscalls.obj: syscalls.c - $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(= CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-syscalls.obj `if test -f 's= yscalls.c'; then $(CYGPATH_W) 'syscalls.c'; else $(CYGPATH_W) '$(srcdir)/sy= scalls.c'; fi` - lib_a-libcfunc.o: libcfunc.c $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(= CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-libcfunc.o `test -f 'libcfu= nc.c' || echo '$(srcdir)/'`libcfunc.c =20 lib_a-libcfunc.obj: libcfunc.c $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(= CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-libcfunc.obj `if test -f 'l= ibcfunc.c'; then $(CYGPATH_W) 'libcfunc.c'; else $(CYGPATH_W) '$(srcdir)/li= bcfunc.c'; fi` =20 +lib_a-syscalls.o: syscalls.c + $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(= CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-syscalls.o `test -f 'syscal= ls.c' || echo '$(srcdir)/'`syscalls.c + +lib_a-syscalls.obj: syscalls.c + $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(= CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-syscalls.obj `if test -f 's= yscalls.c'; then $(CYGPATH_W) 'syscalls.c'; else $(CYGPATH_W) '$(srcdir)/sy= scalls.c'; fi` + mostlyclean-libtool: -rm -f *.lo =20 diff --git a/newlib/libc/sys/sysnecv850/Makefile.am b/newlib/libc/sys/sysne= cv850/Makefile.am index bd8474fcb..874c40b61 100644 --- a/newlib/libc/sys/sysnecv850/Makefile.am +++ b/newlib/libc/sys/sysnecv850/Makefile.am @@ -6,28 +6,15 @@ AM_CCASFLAGS =3D $(AM_CPPFLAGS) =20 noinst_LIBRARIES =3D lib.a =20 +lib_a_SOURCES =3D if MAY_SUPPLY_SYSCALLS -extra_objs =3D $(lpfx)_exit.o $(lpfx)access.o $(lpfx)chmod.o \ - $(lpfx)chown.o $(lpfx)close.o $(lpfx)creat.o $(lpfx)crt1.o \ - $(lpfx)execv.o $(lpfx)execve.o $(lpfx)fork.o $(lpfx)fstat.o \ - $(lpfx)getpid.o $(lpfx)isatty.o $(lpfx)kill.o $(lpfx)lseek.o \ - $(lpfx)open.o $(lpfx)pipe.o $(lpfx)read.o $(lpfx)link.o \ - $(lpfx)sbrk.o $(lpfx)stat.o $(lpfx)time.o $(lpfx)trap.o \ - $(lpfx)unlink.o $(lpfx)utime.o $(lpfx)wait.o $(lpfx)write.o \ - $(lpfx)times.o $(lpfx)gettime.o $(lpfx)rename.o -else -extra_objs =3D -endif - -lib_a_LIBADD =3D $(extra_objs) -EXTRA_lib_a_SOURCES =3D \ +lib_a_SOURCES +=3D \ _exit.c access.c chmod.c chown.c close.c creat.c crt1.c \ execv.c execve.c fork.c fstat.c getpid.c isatty.c \ kill.c lseek.c open.c pipe.c read.c link.c \ sbrk.c stat.c time.c trap.S unlink.c utime.c wait.c write.c \ times.c gettime.c rename.c -lib_a_SOURCES =3D -lib_a_DEPENDENCIES =3D $(extra_objs) +endif lib_a_CFLAGS =3D $(AM_CFLAGS) =20 if MAY_SUPPLY_SYSCALLS diff --git a/newlib/libc/sys/sysnecv850/Makefile.in b/newlib/libc/sys/sysne= cv850/Makefile.in index 734ca6b68..bd19c2fd1 100644 --- a/newlib/libc/sys/sysnecv850/Makefile.in +++ b/newlib/libc/sys/sysnecv850/Makefile.in @@ -88,6 +88,13 @@ PRE_UNINSTALL =3D : POST_UNINSTALL =3D : build_triplet =3D @build@ host_triplet =3D @host@ +@MAY_SUPPLY_SYSCALLS_TRUE@am__append_1 =3D \ +@MAY_SUPPLY_SYSCALLS_TRUE@ _exit.c access.c chmod.c chown.c close.c creat.= c crt1.c \ +@MAY_SUPPLY_SYSCALLS_TRUE@ execv.c execve.c fork.c fstat.c getpid.c isatty= .c \ +@MAY_SUPPLY_SYSCALLS_TRUE@ kill.c lseek.c open.c pipe.c read.c link.c \ +@MAY_SUPPLY_SYSCALLS_TRUE@ sbrk.c stat.c time.c trap.S unlink.c utime.c wa= it.c write.c \ +@MAY_SUPPLY_SYSCALLS_TRUE@ times.c gettime.c rename.c + subdir =3D sys/sysnecv850 ACLOCAL_M4 =3D $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps =3D $(top_srcdir)/../../config/depstand.m4 \ @@ -117,23 +124,37 @@ am__v_AR_ =3D $(am__v_AR_@AM_DEFAULT_V@) am__v_AR_0 =3D @echo " AR " $@; am__v_AR_1 =3D=20 lib_a_AR =3D $(AR) $(ARFLAGS) -@MAY_SUPPLY_SYSCALLS_TRUE@am__DEPENDENCIES_1 =3D $(lpfx)_exit.o \ -@MAY_SUPPLY_SYSCALLS_TRUE@ $(lpfx)access.o $(lpfx)chmod.o \ -@MAY_SUPPLY_SYSCALLS_TRUE@ $(lpfx)chown.o $(lpfx)close.o \ -@MAY_SUPPLY_SYSCALLS_TRUE@ $(lpfx)creat.o $(lpfx)crt1.o \ -@MAY_SUPPLY_SYSCALLS_TRUE@ $(lpfx)execv.o $(lpfx)execve.o \ -@MAY_SUPPLY_SYSCALLS_TRUE@ $(lpfx)fork.o $(lpfx)fstat.o \ -@MAY_SUPPLY_SYSCALLS_TRUE@ $(lpfx)getpid.o $(lpfx)isatty.o \ -@MAY_SUPPLY_SYSCALLS_TRUE@ $(lpfx)kill.o $(lpfx)lseek.o \ -@MAY_SUPPLY_SYSCALLS_TRUE@ $(lpfx)open.o $(lpfx)pipe.o \ -@MAY_SUPPLY_SYSCALLS_TRUE@ $(lpfx)read.o $(lpfx)link.o \ -@MAY_SUPPLY_SYSCALLS_TRUE@ $(lpfx)sbrk.o $(lpfx)stat.o \ -@MAY_SUPPLY_SYSCALLS_TRUE@ $(lpfx)time.o $(lpfx)trap.o \ -@MAY_SUPPLY_SYSCALLS_TRUE@ $(lpfx)unlink.o $(lpfx)utime.o \ -@MAY_SUPPLY_SYSCALLS_TRUE@ $(lpfx)wait.o $(lpfx)write.o \ -@MAY_SUPPLY_SYSCALLS_TRUE@ $(lpfx)times.o $(lpfx)gettime.o \ -@MAY_SUPPLY_SYSCALLS_TRUE@ $(lpfx)rename.o -am_lib_a_OBJECTS =3D +lib_a_LIBADD =3D +@MAY_SUPPLY_SYSCALLS_TRUE@am__objects_1 =3D lib_a-_exit.$(OBJEXT) \ +@MAY_SUPPLY_SYSCALLS_TRUE@ lib_a-access.$(OBJEXT) \ +@MAY_SUPPLY_SYSCALLS_TRUE@ lib_a-chmod.$(OBJEXT) \ +@MAY_SUPPLY_SYSCALLS_TRUE@ lib_a-chown.$(OBJEXT) \ +@MAY_SUPPLY_SYSCALLS_TRUE@ lib_a-close.$(OBJEXT) \ +@MAY_SUPPLY_SYSCALLS_TRUE@ lib_a-creat.$(OBJEXT) \ +@MAY_SUPPLY_SYSCALLS_TRUE@ lib_a-crt1.$(OBJEXT) \ +@MAY_SUPPLY_SYSCALLS_TRUE@ lib_a-execv.$(OBJEXT) \ +@MAY_SUPPLY_SYSCALLS_TRUE@ lib_a-execve.$(OBJEXT) \ +@MAY_SUPPLY_SYSCALLS_TRUE@ lib_a-fork.$(OBJEXT) \ +@MAY_SUPPLY_SYSCALLS_TRUE@ lib_a-fstat.$(OBJEXT) \ +@MAY_SUPPLY_SYSCALLS_TRUE@ lib_a-getpid.$(OBJEXT) \ +@MAY_SUPPLY_SYSCALLS_TRUE@ lib_a-isatty.$(OBJEXT) \ +@MAY_SUPPLY_SYSCALLS_TRUE@ lib_a-kill.$(OBJEXT) \ +@MAY_SUPPLY_SYSCALLS_TRUE@ lib_a-lseek.$(OBJEXT) \ +@MAY_SUPPLY_SYSCALLS_TRUE@ lib_a-open.$(OBJEXT) \ +@MAY_SUPPLY_SYSCALLS_TRUE@ lib_a-pipe.$(OBJEXT) \ +@MAY_SUPPLY_SYSCALLS_TRUE@ lib_a-read.$(OBJEXT) \ +@MAY_SUPPLY_SYSCALLS_TRUE@ lib_a-link.$(OBJEXT) \ +@MAY_SUPPLY_SYSCALLS_TRUE@ lib_a-sbrk.$(OBJEXT) \ +@MAY_SUPPLY_SYSCALLS_TRUE@ lib_a-stat.$(OBJEXT) \ +@MAY_SUPPLY_SYSCALLS_TRUE@ lib_a-time.$(OBJEXT) trap.$(OBJEXT) \ +@MAY_SUPPLY_SYSCALLS_TRUE@ lib_a-unlink.$(OBJEXT) \ +@MAY_SUPPLY_SYSCALLS_TRUE@ lib_a-utime.$(OBJEXT) \ +@MAY_SUPPLY_SYSCALLS_TRUE@ lib_a-wait.$(OBJEXT) \ +@MAY_SUPPLY_SYSCALLS_TRUE@ lib_a-write.$(OBJEXT) \ +@MAY_SUPPLY_SYSCALLS_TRUE@ lib_a-times.$(OBJEXT) \ +@MAY_SUPPLY_SYSCALLS_TRUE@ lib_a-gettime.$(OBJEXT) \ +@MAY_SUPPLY_SYSCALLS_TRUE@ lib_a-rename.$(OBJEXT) +am_lib_a_OBJECTS =3D $(am__objects_1) lib_a_OBJECTS =3D $(am_lib_a_OBJECTS) AM_V_P =3D $(am__v_P_@AM_V@) am__v_P_ =3D $(am__v_P_@AM_DEFAULT_V@) @@ -182,7 +203,7 @@ AM_V_CCLD =3D $(am__v_CCLD_@AM_V@) am__v_CCLD_ =3D $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 =3D @echo " CCLD " $@; am__v_CCLD_1 =3D=20 -SOURCES =3D $(lib_a_SOURCES) $(EXTRA_lib_a_SOURCES) +SOURCES =3D $(lib_a_SOURCES) am__can_run_installinfo =3D \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -356,26 +377,7 @@ top_srcdir =3D @top_srcdir@ AM_CPPFLAGS =3D $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) AM_CCASFLAGS =3D $(AM_CPPFLAGS) noinst_LIBRARIES =3D lib.a -@MAY_SUPPLY_SYSCALLS_FALSE@extra_objs =3D=20 -@MAY_SUPPLY_SYSCALLS_TRUE@extra_objs =3D $(lpfx)_exit.o $(lpfx)access.o $(= lpfx)chmod.o \ -@MAY_SUPPLY_SYSCALLS_TRUE@ $(lpfx)chown.o $(lpfx)close.o $(lpfx)creat.o $(= lpfx)crt1.o \ -@MAY_SUPPLY_SYSCALLS_TRUE@ $(lpfx)execv.o $(lpfx)execve.o $(lpfx)fork.o $(= lpfx)fstat.o \ -@MAY_SUPPLY_SYSCALLS_TRUE@ $(lpfx)getpid.o $(lpfx)isatty.o $(lpfx)kill.o $= (lpfx)lseek.o \ -@MAY_SUPPLY_SYSCALLS_TRUE@ $(lpfx)open.o $(lpfx)pipe.o $(lpfx)read.o $(lpf= x)link.o \ -@MAY_SUPPLY_SYSCALLS_TRUE@ $(lpfx)sbrk.o $(lpfx)stat.o $(lpfx)time.o $(lpf= x)trap.o \ -@MAY_SUPPLY_SYSCALLS_TRUE@ $(lpfx)unlink.o $(lpfx)utime.o $(lpfx)wait.o $(= lpfx)write.o \ -@MAY_SUPPLY_SYSCALLS_TRUE@ $(lpfx)times.o $(lpfx)gettime.o $(lpfx)rename.o - -lib_a_LIBADD =3D $(extra_objs) -EXTRA_lib_a_SOURCES =3D \ - _exit.c access.c chmod.c chown.c close.c creat.c crt1.c \ - execv.c execve.c fork.c fstat.c getpid.c isatty.c \ - kill.c lseek.c open.c pipe.c read.c link.c \ - sbrk.c stat.c time.c trap.S unlink.c utime.c wait.c write.c \ - times.c gettime.c rename.c - -lib_a_SOURCES =3D=20 -lib_a_DEPENDENCIES =3D $(extra_objs) +lib_a_SOURCES =3D $(am__append_1) lib_a_CFLAGS =3D $(AM_CFLAGS) all: all-am