diff options
author | Mike Frysinger <vapier@gentoo.org> | 2021-12-30 22:32:09 +0300 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2022-01-19 03:12:02 +0300 |
commit | 71086e8b2d70c1e71a8372f35d9901505fc72905 (patch) | |
tree | 420e7b4c1499ffd4a6289fd88b7c7e24146fba41 /newlib/libm/machine | |
parent | ff539cc0f9ba4e52682a2647e4347ead4f2f8787 (diff) |
newlib: delete (most) redundant lib_a_CCASFLAGS=$(AM_CCASFLAGS)
Since automake already sets per-library CCASFLAGS to $(AM_CCASFLAGS)
by default, there's no need to explicitly set it here.
Many of these dirs don't have .S files in the first place, so the rule
doesn't even do anything. That can easily be seen when Makefile.in has
no changes as a result.
For the dirs with .S files, the custom rules are the same as the pattern
.S.o rules, so this is a nice cleanup.
The only dir that was adding extra flags (newlib/libc/machine/mn10300/)
to the per-library setting can have it moved to the global AM_CCASFLAGS
since the subdir only has one target. Although the setting just adds
extra debugging flags, so maybe it should be deleted in general.
There are a few dirs that we leave the redundant setting in place. This
is to workaround an automake limitation in subdirs that support building
with & w/out libtool:
https://www.gnu.org/software/automake/manual/html_node/Objects-created-both-with-libtool-and-without.html
Diffstat (limited to 'newlib/libm/machine')
-rw-r--r-- | newlib/libm/machine/aarch64/Makefile.am | 1 | ||||
-rw-r--r-- | newlib/libm/machine/aarch64/Makefile.in | 1 | ||||
-rw-r--r-- | newlib/libm/machine/arm/Makefile.am | 1 | ||||
-rw-r--r-- | newlib/libm/machine/arm/Makefile.in | 1 | ||||
-rw-r--r-- | newlib/libm/machine/mips/Makefile.am | 1 | ||||
-rw-r--r-- | newlib/libm/machine/mips/Makefile.in | 1 | ||||
-rw-r--r-- | newlib/libm/machine/nds32/Makefile.am | 1 | ||||
-rw-r--r-- | newlib/libm/machine/nds32/Makefile.in | 21 | ||||
-rw-r--r-- | newlib/libm/machine/powerpc/Makefile.am | 1 | ||||
-rw-r--r-- | newlib/libm/machine/powerpc/Makefile.in | 1 | ||||
-rw-r--r-- | newlib/libm/machine/pru/Makefile.am | 1 | ||||
-rw-r--r-- | newlib/libm/machine/pru/Makefile.in | 1 | ||||
-rw-r--r-- | newlib/libm/machine/riscv/Makefile.am | 1 | ||||
-rw-r--r-- | newlib/libm/machine/riscv/Makefile.in | 1 | ||||
-rw-r--r-- | newlib/libm/machine/sparc/Makefile.am | 1 | ||||
-rw-r--r-- | newlib/libm/machine/sparc/Makefile.in | 1 | ||||
-rw-r--r-- | newlib/libm/machine/spu/Makefile.am | 1 | ||||
-rw-r--r-- | newlib/libm/machine/spu/Makefile.in | 1 | ||||
-rw-r--r-- | newlib/libm/machine/x86_64/Makefile.am | 1 | ||||
-rw-r--r-- | newlib/libm/machine/x86_64/Makefile.in | 1 |
20 files changed, 2 insertions, 38 deletions
diff --git a/newlib/libm/machine/aarch64/Makefile.am b/newlib/libm/machine/aarch64/Makefile.am index f6bf8875e..b2ad4ecc4 100644 --- a/newlib/libm/machine/aarch64/Makefile.am +++ b/newlib/libm/machine/aarch64/Makefile.am @@ -50,7 +50,6 @@ LIB_SOURCES = \ noinst_LIBRARIES = lib.a lib_a_SOURCES = $(LIB_SOURCES) lib_a_CFLAGS = $(AM_CFLAGS) -lib_a_CCASFLAGS = $(AM_CCASFLAGS) noinst_DATA = include $(srcdir)/../../../Makefile.shared diff --git a/newlib/libm/machine/aarch64/Makefile.in b/newlib/libm/machine/aarch64/Makefile.in index fd860f440..828b863ec 100644 --- a/newlib/libm/machine/aarch64/Makefile.in +++ b/newlib/libm/machine/aarch64/Makefile.in @@ -349,7 +349,6 @@ LIB_SOURCES = \ noinst_LIBRARIES = lib.a lib_a_SOURCES = $(LIB_SOURCES) lib_a_CFLAGS = $(AM_CFLAGS) -lib_a_CCASFLAGS = $(AM_CCASFLAGS) noinst_DATA = # diff --git a/newlib/libm/machine/arm/Makefile.am b/newlib/libm/machine/arm/Makefile.am index ec71e1d08..b030bd157 100644 --- a/newlib/libm/machine/arm/Makefile.am +++ b/newlib/libm/machine/arm/Makefile.am @@ -40,7 +40,6 @@ LIB_SOURCES = \ noinst_LIBRARIES = lib.a lib_a_SOURCES = $(LIB_SOURCES) lib_a_CFLAGS = $(AM_CFLAGS) -lib_a_CCASFLAGS = $(AM_CCASFLAGS) noinst_DATA = include $(srcdir)/../../../Makefile.shared diff --git a/newlib/libm/machine/arm/Makefile.in b/newlib/libm/machine/arm/Makefile.in index 44a71a7bc..52a043286 100644 --- a/newlib/libm/machine/arm/Makefile.in +++ b/newlib/libm/machine/arm/Makefile.in @@ -333,7 +333,6 @@ LIB_SOURCES = \ noinst_LIBRARIES = lib.a lib_a_SOURCES = $(LIB_SOURCES) lib_a_CFLAGS = $(AM_CFLAGS) -lib_a_CCASFLAGS = $(AM_CCASFLAGS) noinst_DATA = # diff --git a/newlib/libm/machine/mips/Makefile.am b/newlib/libm/machine/mips/Makefile.am index eb6db78e9..4fe79397c 100644 --- a/newlib/libm/machine/mips/Makefile.am +++ b/newlib/libm/machine/mips/Makefile.am @@ -11,7 +11,6 @@ LIB_SOURCES = \ noinst_LIBRARIES = lib.a lib_a_SOURCES = $(LIB_SOURCES) lib_a_CFLAGS = $(AM_CFLAGS) -lib_a_CCASFLAGS = $(AM_CCASFLAGS) noinst_DATA = include $(srcdir)/../../../Makefile.shared diff --git a/newlib/libm/machine/mips/Makefile.in b/newlib/libm/machine/mips/Makefile.in index e39ab2d4d..10816e914 100644 --- a/newlib/libm/machine/mips/Makefile.in +++ b/newlib/libm/machine/mips/Makefile.in @@ -295,7 +295,6 @@ LIB_SOURCES = \ noinst_LIBRARIES = lib.a lib_a_SOURCES = $(LIB_SOURCES) lib_a_CFLAGS = $(AM_CFLAGS) -lib_a_CCASFLAGS = $(AM_CCASFLAGS) noinst_DATA = # diff --git a/newlib/libm/machine/nds32/Makefile.am b/newlib/libm/machine/nds32/Makefile.am index 8439fbb0b..ee3af7243 100644 --- a/newlib/libm/machine/nds32/Makefile.am +++ b/newlib/libm/machine/nds32/Makefile.am @@ -19,7 +19,6 @@ LIB_SOURCES = $(GPR_SOURCES) $(FPU_SP_SOURCES) $(FPU_DP_SOURCES) noinst_LIBRARIES = lib.a lib_a_SOURCES = $(LIB_SOURCES) lib_a_CFLAGS = $(AM_CFLAGS) -lib_a_CCASFLAGS = $(AM_CCASFLAGS) noinst_DATA = include $(srcdir)/../../../Makefile.shared diff --git a/newlib/libm/machine/nds32/Makefile.in b/newlib/libm/machine/nds32/Makefile.in index 967637c38..ec448232f 100644 --- a/newlib/libm/machine/nds32/Makefile.in +++ b/newlib/libm/machine/nds32/Makefile.in @@ -113,8 +113,8 @@ am__v_AR_1 = lib_a_AR = $(AR) $(ARFLAGS) lib_a_LIBADD = am__objects_1 = -@HAS_NDS32_FPU_SP_TRUE@am__objects_2 = lib_a-wf_sqrt.$(OBJEXT) -@HAS_NDS32_FPU_DP_TRUE@am__objects_3 = lib_a-w_sqrt.$(OBJEXT) +@HAS_NDS32_FPU_SP_TRUE@am__objects_2 = wf_sqrt.$(OBJEXT) +@HAS_NDS32_FPU_DP_TRUE@am__objects_3 = w_sqrt.$(OBJEXT) am__objects_4 = $(am__objects_1) $(am__objects_2) $(am__objects_3) am_lib_a_OBJECTS = $(am__objects_4) lib_a_OBJECTS = $(am_lib_a_OBJECTS) @@ -133,10 +133,6 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = am__depfiles_maybe = -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 = CPPASCOMPILE = $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) AM_V_CPPAS = $(am__v_CPPAS_@AM_V@) @@ -302,7 +298,6 @@ LIB_SOURCES = $(GPR_SOURCES) $(FPU_SP_SOURCES) $(FPU_DP_SOURCES) noinst_LIBRARIES = lib.a lib_a_SOURCES = $(LIB_SOURCES) lib_a_CFLAGS = $(AM_CFLAGS) -lib_a_CCASFLAGS = $(AM_CCASFLAGS) noinst_DATA = # @@ -375,18 +370,6 @@ distclean-compile: .S.obj: $(AM_V_CPPAS)$(CPPASCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -lib_a-wf_sqrt.o: wf_sqrt.S - $(AM_V_CPPAS)$(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CCASFLAGS) $(CCASFLAGS) -c -o lib_a-wf_sqrt.o `test -f 'wf_sqrt.S' || echo '$(srcdir)/'`wf_sqrt.S - -lib_a-wf_sqrt.obj: wf_sqrt.S - $(AM_V_CPPAS)$(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CCASFLAGS) $(CCASFLAGS) -c -o lib_a-wf_sqrt.obj `if test -f 'wf_sqrt.S'; then $(CYGPATH_W) 'wf_sqrt.S'; else $(CYGPATH_W) '$(srcdir)/wf_sqrt.S'; fi` - -lib_a-w_sqrt.o: w_sqrt.S - $(AM_V_CPPAS)$(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CCASFLAGS) $(CCASFLAGS) -c -o lib_a-w_sqrt.o `test -f 'w_sqrt.S' || echo '$(srcdir)/'`w_sqrt.S - -lib_a-w_sqrt.obj: w_sqrt.S - $(AM_V_CPPAS)$(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CCASFLAGS) $(CCASFLAGS) -c -o lib_a-w_sqrt.obj `if test -f 'w_sqrt.S'; then $(CYGPATH_W) 'w_sqrt.S'; else $(CYGPATH_W) '$(srcdir)/w_sqrt.S'; fi` - ID: $(am__tagged_files) $(am__define_uniq_tagged_files); mkid -fID $$unique tags: tags-am diff --git a/newlib/libm/machine/powerpc/Makefile.am b/newlib/libm/machine/powerpc/Makefile.am index 48bfe150b..bd5cf0b19 100644 --- a/newlib/libm/machine/powerpc/Makefile.am +++ b/newlib/libm/machine/powerpc/Makefile.am @@ -11,7 +11,6 @@ LIB_SOURCES = \ noinst_LIBRARIES = lib.a lib_a_SOURCES = $(LIB_SOURCES) lib_a_CFLAGS = $(AM_CFLAGS) -lib_a_CCASFLAGS = $(AM_CCASFLAGS) noinst_DATA = include $(srcdir)/../../../Makefile.shared diff --git a/newlib/libm/machine/powerpc/Makefile.in b/newlib/libm/machine/powerpc/Makefile.in index c53e6981f..b4b7ee55e 100644 --- a/newlib/libm/machine/powerpc/Makefile.in +++ b/newlib/libm/machine/powerpc/Makefile.in @@ -295,7 +295,6 @@ LIB_SOURCES = \ noinst_LIBRARIES = lib.a lib_a_SOURCES = $(LIB_SOURCES) lib_a_CFLAGS = $(AM_CFLAGS) -lib_a_CCASFLAGS = $(AM_CCASFLAGS) noinst_DATA = # diff --git a/newlib/libm/machine/pru/Makefile.am b/newlib/libm/machine/pru/Makefile.am index d93797d84..d7402a6e9 100644 --- a/newlib/libm/machine/pru/Makefile.am +++ b/newlib/libm/machine/pru/Makefile.am @@ -10,7 +10,6 @@ LIB_SOURCES = \ noinst_LIBRARIES = lib.a lib_a_SOURCES = $(LIB_SOURCES) lib_a_CFLAGS = $(AM_CFLAGS) -lib_a_CCASFLAGS = $(AM_CCASFLAGS) noinst_DATA = include $(srcdir)/../../../Makefile.shared diff --git a/newlib/libm/machine/pru/Makefile.in b/newlib/libm/machine/pru/Makefile.in index c37df7a6e..b00186f0b 100644 --- a/newlib/libm/machine/pru/Makefile.in +++ b/newlib/libm/machine/pru/Makefile.in @@ -293,7 +293,6 @@ LIB_SOURCES = \ noinst_LIBRARIES = lib.a lib_a_SOURCES = $(LIB_SOURCES) lib_a_CFLAGS = $(AM_CFLAGS) -lib_a_CCASFLAGS = $(AM_CCASFLAGS) noinst_DATA = # diff --git a/newlib/libm/machine/riscv/Makefile.am b/newlib/libm/machine/riscv/Makefile.am index a6e688b83..0b8775dff 100644 --- a/newlib/libm/machine/riscv/Makefile.am +++ b/newlib/libm/machine/riscv/Makefile.am @@ -23,7 +23,6 @@ LIB_SOURCES = \ noinst_LIBRARIES = lib.a lib_a_SOURCES = $(LIB_SOURCES) lib_a_CFLAGS = $(AM_CFLAGS) -lib_a_CCASFLAGS = $(AM_CCASFLAGS) noinst_DATA = include $(srcdir)/../../../Makefile.shared diff --git a/newlib/libm/machine/riscv/Makefile.in b/newlib/libm/machine/riscv/Makefile.in index fb5e23d0f..f01f82e77 100644 --- a/newlib/libm/machine/riscv/Makefile.in +++ b/newlib/libm/machine/riscv/Makefile.in @@ -322,7 +322,6 @@ LIB_SOURCES = \ noinst_LIBRARIES = lib.a lib_a_SOURCES = $(LIB_SOURCES) lib_a_CFLAGS = $(AM_CFLAGS) -lib_a_CCASFLAGS = $(AM_CCASFLAGS) noinst_DATA = # diff --git a/newlib/libm/machine/sparc/Makefile.am b/newlib/libm/machine/sparc/Makefile.am index 61ab46cb7..7faf09f3d 100644 --- a/newlib/libm/machine/sparc/Makefile.am +++ b/newlib/libm/machine/sparc/Makefile.am @@ -12,7 +12,6 @@ LIB_SOURCES = \ noinst_LIBRARIES = lib.a lib_a_SOURCES = $(LIB_SOURCES) lib_a_CFLAGS = $(AM_CFLAGS) -lib_a_CCASFLAGS = $(AM_CCASFLAGS) noinst_DATA = include $(srcdir)/../../../Makefile.shared diff --git a/newlib/libm/machine/sparc/Makefile.in b/newlib/libm/machine/sparc/Makefile.in index cc4b66f2d..e37cc3463 100644 --- a/newlib/libm/machine/sparc/Makefile.in +++ b/newlib/libm/machine/sparc/Makefile.in @@ -296,7 +296,6 @@ LIB_SOURCES = \ noinst_LIBRARIES = lib.a lib_a_SOURCES = $(LIB_SOURCES) lib_a_CFLAGS = $(AM_CFLAGS) -lib_a_CCASFLAGS = $(AM_CCASFLAGS) noinst_DATA = # diff --git a/newlib/libm/machine/spu/Makefile.am b/newlib/libm/machine/spu/Makefile.am index f3688bb4c..338a8cc0a 100644 --- a/newlib/libm/machine/spu/Makefile.am +++ b/newlib/libm/machine/spu/Makefile.am @@ -30,7 +30,6 @@ LIB_SOURCES = \ noinst_LIBRARIES = lib.a lib_a_SOURCES = $(LIB_SOURCES) lib_a_CFLAGS = $(AM_CFLAGS) -lib_a_CCASFLAGS = $(AM_CCASFLAGS) noinst_DATA = include $(srcdir)/../../../Makefile.shared diff --git a/newlib/libm/machine/spu/Makefile.in b/newlib/libm/machine/spu/Makefile.in index 6ccfbabca..0cbac1728 100644 --- a/newlib/libm/machine/spu/Makefile.in +++ b/newlib/libm/machine/spu/Makefile.in @@ -371,7 +371,6 @@ LIB_SOURCES = \ noinst_LIBRARIES = lib.a lib_a_SOURCES = $(LIB_SOURCES) lib_a_CFLAGS = $(AM_CFLAGS) -lib_a_CCASFLAGS = $(AM_CCASFLAGS) noinst_DATA = # diff --git a/newlib/libm/machine/x86_64/Makefile.am b/newlib/libm/machine/x86_64/Makefile.am index 0f132118e..44f5b0244 100644 --- a/newlib/libm/machine/x86_64/Makefile.am +++ b/newlib/libm/machine/x86_64/Makefile.am @@ -18,7 +18,6 @@ else noinst_LIBRARIES = lib.a lib_a_SOURCES = $(LIB_SOURCES) lib_a_CFLAGS = $(AM_CFLAGS) -lib_a_CCASFLAGS = $(AM_CCASFLAGS) noinst_DATA = endif # USE_LIBTOOL diff --git a/newlib/libm/machine/x86_64/Makefile.in b/newlib/libm/machine/x86_64/Makefile.in index f17a80bf8..c72f454f3 100644 --- a/newlib/libm/machine/x86_64/Makefile.in +++ b/newlib/libm/machine/x86_64/Makefile.in @@ -346,7 +346,6 @@ libx86_64_la_LDFLAGS = -Xcompiler -nostdlib @USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a @USE_LIBTOOL_FALSE@lib_a_SOURCES = $(LIB_SOURCES) @USE_LIBTOOL_FALSE@lib_a_CFLAGS = $(AM_CFLAGS) -@USE_LIBTOOL_FALSE@lib_a_CCASFLAGS = $(AM_CCASFLAGS) # # documentation rules |