libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

newlib: simplify nds32 automake checks 

This code is a bit more convoluted than it needs to be.  GPR_SOURCES
is never set to anything, and the automake checks use negative logic
to add the SP & DP source files to dedicated variables that are only
expanded once.  Get rid of the unused variable, use normal boolean
logic, and collapse the source settings into a single variable.
This commit is contained in:
Mike Frysinger 2022-02-07 01:15:00 -05:00
parent 8fff0aac0a
commit 953ba1e6d1
2 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
newlib/libm/machine/nds32/Makefile.am
View File

@ -3,21 +3,18 @@
AM_CPPFLAGS = -I $(abs_newlib_basedir)/libm/common $(NEWLIB_CFLAGS) \
$(CROSS_CFLAGS) $(TARGET_CFLAGS)
if HAS_NDS32_FPU_SP_FALSE
GPR_SOURCES =
else
FPU_SP_SOURCES = wf_sqrt.S
src =
if HAS_NDS32_FPU_SP
src += wf_sqrt.S
endif
if HAS_NDS32_FPU_DP_FALSE
else
FPU_DP_SOURCES = w_sqrt.S
if HAS_NDS32_FPU_DP
src += w_sqrt.S
endif
LIB_SOURCES = $(GPR_SOURCES) $(FPU_SP_SOURCES) $(FPU_DP_SOURCES)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(LIB_SOURCES)
lib_a_SOURCES = $(src)
lib_a_CFLAGS = $(AM_CFLAGS)
noinst_DATA =

18
newlib/libm/machine/nds32/Makefile.in
View File

@ -89,6 +89,8 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@HAS_NDS32_FPU_SP_TRUE@am__append_1 = wf_sqrt.S
@HAS_NDS32_FPU_DP_TRUE@am__append_2 = w_sqrt.S
subdir = machine/nds32
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
@ -116,11 +118,10 @@ am__v_AR_0 = @echo " AR " $@;
am__v_AR_1 =
lib_a_AR = $(AR) $(ARFLAGS)
lib_a_LIBADD =
am__objects_1 =
@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)
@HAS_NDS32_FPU_SP_TRUE@am__objects_1 = wf_sqrt.$(OBJEXT)
@HAS_NDS32_FPU_DP_TRUE@am__objects_2 = w_sqrt.$(OBJEXT)
am__objects_3 = $(am__objects_1) $(am__objects_2)
am_lib_a_OBJECTS = $(am__objects_3)
lib_a_OBJECTS = $(am_lib_a_OBJECTS)
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@ -328,12 +329,9 @@ top_srcdir = @top_srcdir@
AM_CPPFLAGS = -I $(abs_newlib_basedir)/libm/common $(NEWLIB_CFLAGS) \
$(CROSS_CFLAGS) $(TARGET_CFLAGS)
@HAS_NDS32_FPU_SP_FALSE@GPR_SOURCES =
@HAS_NDS32_FPU_SP_TRUE@FPU_SP_SOURCES = wf_sqrt.S
@HAS_NDS32_FPU_DP_TRUE@FPU_DP_SOURCES = w_sqrt.S
LIB_SOURCES = $(GPR_SOURCES) $(FPU_SP_SOURCES) $(FPU_DP_SOURCES)
src = $(am__append_1) $(am__append_2)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(LIB_SOURCES)
lib_a_SOURCES = $(src)
lib_a_CFLAGS = $(AM_CFLAGS)
noinst_DATA =
all: all-am