github
/
amiga-gcc
mirror of https://github.com/bebbo/amiga-gcc.git
1
0
Fork 0
Code Releases Activity

no longer add complex math files to libnix/clib2 libm.a, instead create a lib__m__.a to be used by the compiler as fallback

This commit is contained in:
bebbo 2019-04-15 19:19:42 +02:00
parent 2de6d2d480
commit 41e774a605
1 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Makefile
View File

@ -759,11 +759,6 @@ $(BUILD)/libnix/_done: $(BUILD)/newlib/_done $(BUILD)/ndk-include_ndk $(BUILD)/n
@if [ ! -e $(PREFIX)/lib/gcc/m68k-amigaos/$(GCC_VERSION)/libgcc.a ]; then $(PREFIX)/bin/m68k-amigaos-ar rcs $(PREFIX)/lib/gcc/m68k-amigaos/$(GCC_VERSION)/libgcc.a; fi
$(L0)"make libnix"$(L1) $(MAKE) -C $(BUILD)/libnix -f $(PWD)/projects/libnix/Makefile.gcc6 root=$(PWD)/projects/libnix all $(L2)
$(L0)"install libnix"$(L1) $(MAKE) -C $(BUILD)/libnix -f $(PWD)/projects/libnix/Makefile.gcc6 root=$(PWD)/projects/libnix install $(L2)
@cd $(BUILD)/newlib/complex && $(PREFIX)/bin/m68k-amigaos-ar rcs $(PREFIX)/m68k-amigaos/libnix/lib/libm.a $(COMPLEX_FILES)
@cd $(BUILD)/newlib/complex/libb && $(PREFIX)/bin/m68k-amigaos-ar rcs $(PREFIX)/m68k-amigaos/libnix/lib/libb/libm.a $(COMPLEX_FILES)
@cd $(BUILD)/newlib/complex/libm020 && $(PREFIX)/bin/m68k-amigaos-ar rcs $(PREFIX)/m68k-amigaos/libnix/lib/libm020/libm.a $(COMPLEX_FILES)
@cd $(BUILD)/newlib/complex/libm020/libb && $(PREFIX)/bin/m68k-amigaos-ar rcs $(PREFIX)/m68k-amigaos/libnix/lib/libm020/libb/libm.a $(COMPLEX_FILES)
@cd $(BUILD)/newlib/complex/libm020/libb32 && $(PREFIX)/bin/m68k-amigaos-ar rcs $(PREFIX)/m68k-amigaos/libnix/lib/libm020/libb32/libm.a $(COMPLEX_FILES)
@rsync --delete -a projects/libnix/sources/headers/* $(PREFIX)/m68k-amigaos/libnix/include/
@echo "done" >$@
@ -798,11 +793,6 @@ $(BUILD)/clib2/_done: projects/clib2/LICENSE $(shell find 2>/dev/null projects/c
@mkdir -p $(PREFIX)/m68k-amigaos/clib2
@rsync -a $(BUILD)/clib2/include $(PREFIX)/m68k-amigaos/clib2
@rsync -a $(BUILD)/clib2/lib $(PREFIX)/m68k-amigaos/clib2
@cd $(BUILD)/newlib/complex && $(PREFIX)/bin/m68k-amigaos-ar rcs $(PREFIX)/m68k-amigaos/clib2/lib/libm.a $(COMPLEX_FILES)
@cd $(BUILD)/newlib/complex/libb && $(PREFIX)/bin/m68k-amigaos-ar rcs $(PREFIX)/m68k-amigaos/clib2/lib/libb/libm.a $(COMPLEX_FILES)
@cd $(BUILD)/newlib/complex/libm020 && $(PREFIX)/bin/m68k-amigaos-ar rcs $(PREFIX)/m68k-amigaos/clib2/lib/libm020/libm.a $(COMPLEX_FILES)
@cd $(BUILD)/newlib/complex/libm020/libb && $(PREFIX)/bin/m68k-amigaos-ar rcs $(PREFIX)/m68k-amigaos/clib2/lib/libm020/libb/libm.a $(COMPLEX_FILES)
@cd $(BUILD)/newlib/complex/libm020/libb32 && $(PREFIX)/bin/m68k-amigaos-ar rcs $(PREFIX)/m68k-amigaos/clib2/lib/libm020/libb32/libm.a $(COMPLEX_FILES)
@echo "done" >$@
projects/clib2/LICENSE:
@ -889,11 +879,6 @@ NEWLIB_FILES = $(shell find 2>/dev/null projects/newlib-cygwin/newlib -type f)
.PHONY: newlib
newlib: $(BUILD)/newlib/_done
COMPLEX_FILES = lib_a-cabs.o lib_a-cacosf.o lib_a-cacosl.o lib_a-casin.o lib_a-casinhl.o lib_a-catanh.o lib_a-ccos.o lib_a-ccoshl.o lib_a-cephes_subrl.o lib_a-cimag.o lib_a-clog10.o lib_a-conj.o lib_a-cpowf.o lib_a-cprojl.o lib_a-csin.o lib_a-csinhl.o lib_a-csqrtl.o lib_a-ctanhf.o \
lib_a-cabsf.o lib_a-cacosh.o lib_a-carg.o lib_a-casinf.o lib_a-casinl.o lib_a-catanhf.o lib_a-ccosf.o lib_a-ccosl.o lib_a-cexp.o lib_a-cimagf.o lib_a-clog10f.o lib_a-conjf.o lib_a-cpowl.o lib_a-creal.o lib_a-csinf.o lib_a-csinl.o lib_a-ctan.o lib_a-ctanhl.o \
lib_a-cabsl.o lib_a-cacoshf.o lib_a-cargf.o lib_a-casinh.o lib_a-catan.o lib_a-catanhl.o lib_a-ccosh.o lib_a-cephes_subr.o lib_a-cexpf.o lib_a-cimagl.o lib_a-clogf.o lib_a-conjl.o lib_a-cproj.o lib_a-crealf.o lib_a-csinh.o lib_a-csqrt.o lib_a-ctanf.o lib_a-ctanl.o \
lib_a-cacos.o lib_a-cacoshl.o lib_a-cargl.o lib_a-casinhf.o lib_a-catanf.o lib_a-catanl.o lib_a-ccoshf.o lib_a-cephes_subrf.o lib_a-cexpl.o lib_a-clog.o lib_a-clogl.o lib_a-cpow.o lib_a-cprojf.o lib_a-creall.o lib_a-csinhf.o lib_a-csqrtf.o lib_a-ctanh.o
$(BUILD)/newlib/_done: $(BUILD)/newlib/newlib/libc.a
@echo "done" >$@
@ -901,16 +886,7 @@ $(BUILD)/newlib/newlib/libc.a: $(BUILD)/newlib/newlib/Makefile $(BUILD)/ndk-incl
@rsync -a $(PWD)/projects/newlib-cygwin/newlib/libc/include/ $(PREFIX)/m68k-amigaos/sys-include
$(L0)"make newlib"$(L1) $(MAKE) -C $(BUILD)/newlib/newlib $(L2)
$(L0)"install newlib"$(L1) $(MAKE) -C $(BUILD)/newlib/newlib install $(L2)
@mkdir -p $(BUILD)/newlib/complex
@cd $(BUILD)/newlib/complex && $(PREFIX)/bin/m68k-amigaos-ar x $(PREFIX)/m68k-amigaos/lib/libm.a $(COMPLEX_FILES)
@mkdir -p $(BUILD)/newlib/complex/libb
@cd $(BUILD)/newlib/complex/libb && $(PREFIX)/bin/m68k-amigaos-ar x $(PREFIX)/m68k-amigaos/lib/libb/libm.a $(COMPLEX_FILES)
@mkdir -p $(BUILD)/newlib/complex/libm020
@cd $(BUILD)/newlib/complex/libm020 && $(PREFIX)/bin/m68k-amigaos-ar x $(PREFIX)/m68k-amigaos/lib/libm020/libm.a $(COMPLEX_FILES)
@mkdir -p $(BUILD)/newlib/complex/libm020/libb
@cd $(BUILD)/newlib/complex/libm020/libb && $(PREFIX)/bin/m68k-amigaos-ar x $(PREFIX)/m68k-amigaos/lib/libm020/libb/libm.a $(COMPLEX_FILES)
@mkdir -p $(BUILD)/newlib/complex/libm020/libb32
@cd $(BUILD)/newlib/complex/libm020/libb32 && $(PREFIX)/bin/m68k-amigaos-ar x $(PREFIX)/m68k-amigaos/lib/libm020/libb32/libm.a $(COMPLEX_FILES)
@for x in $$(find $(PREFIX)/m68k-amigaos/lib/* -name libm.a); do ln -sf $$x $${x%*m.a}__m__.a; done
@touch $@
ifeq (,$(wildcard $(BUILD)/gcc/_done))