From b1c9ff1a739e5726416f73b9e528f639df9a2717 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krystian=20Bac=C5=82awski?= Date: Sat, 8 Oct 2016 22:42:48 +0200 Subject: [PATCH] Devise a counterpart for libnix13. From now on nix13 or nix20 will have to be provided explicitely to linker, depending on which Kickstart your application should run on. --- configure | 2 + configure.in | 1 + manifests/bin | 6 +++ manifests/src | 11 ++--- sources/Makefile.in | 3 +- sources/nix20/Makefile.in | 56 +++++++++++++++++++++++++ sources/{nix => nix20}/extra/stricmp.c | 0 sources/{nix => nix20}/extra/strnicmp.c | 0 sources/{nix => nix20}/math/__divsi3.c | 0 sources/{nix => nix20}/math/__mulsi3.c | 0 sources/{nix => nix20}/math/__udivsi3.c | 0 11 files changed, 73 insertions(+), 6 deletions(-) create mode 100644 sources/nix20/Makefile.in rename sources/{nix => nix20}/extra/stricmp.c (100%) rename sources/{nix => nix20}/extra/strnicmp.c (100%) rename sources/{nix => nix20}/math/__divsi3.c (100%) rename sources/{nix => nix20}/math/__mulsi3.c (100%) rename sources/{nix => nix20}/math/__udivsi3.c (100%) diff --git a/configure b/configure index 386e8af..fac5f0d 100755 --- a/configure +++ b/configure @@ -1202,6 +1202,7 @@ trap 'rm -fr `echo "Makefile sources/misc/Makefile sources/nix/Makefile sources/nix13/Makefile + sources/nix20/Makefile sources/nixmain/Makefile sources/nix_main/Makefile sources/socket/Makefile @@ -1297,6 +1298,7 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile sources/misc/Makefile sources/nix/Makefile sources/nix13/Makefile + sources/nix20/Makefile sources/nixmain/Makefile sources/nix_main/Makefile sources/socket/Makefile diff --git a/configure.in b/configure.in index c82860e..75e3bb0 100644 --- a/configure.in +++ b/configure.in @@ -19,6 +19,7 @@ AC_OUTPUT(Makefile sources/misc/Makefile sources/nix/Makefile sources/nix13/Makefile + sources/nix20/Makefile sources/nixmain/Makefile sources/nix_main/Makefile sources/socket/Makefile diff --git a/manifests/bin b/manifests/bin index d8e8442..c46f957 100644 --- a/manifests/bin +++ b/manifests/bin @@ -4,6 +4,7 @@ lib/libb/libm020/libm881/libnix/detach.o lib/libb/libm020/libm881/libnix/libm.a lib/libb/libm020/libm881/libnix/libnix.a lib/libb/libm020/libm881/libnix/libnix13.a +lib/libb/libm020/libm881/libnix/libnix20.a lib/libb/libm020/libm881/libnix/libnix_main.a lib/libb/libm020/libm881/libnix/libnixmain.a lib/libb/libm020/libm881/libnix/libstack.a @@ -13,6 +14,7 @@ lib/libb/libm020/libnix/detach.o lib/libb/libm020/libnix/libm.a lib/libb/libm020/libnix/libnix.a lib/libb/libm020/libnix/libnix13.a +lib/libb/libm020/libnix/libnix20.a lib/libb/libm020/libnix/libnix_main.a lib/libb/libm020/libnix/libnixmain.a lib/libb/libm020/libnix/libstack.a @@ -22,6 +24,7 @@ lib/libb/libnix/detach.o lib/libb/libnix/libm.a lib/libb/libnix/libnix.a lib/libb/libnix/libnix13.a +lib/libb/libnix/libnix20.a lib/libb/libnix/libnix_main.a lib/libb/libnix/libnixmain.a lib/libb/libnix/libstack.a @@ -31,6 +34,7 @@ lib/libm020/libm881/libnix/detach.o lib/libm020/libm881/libnix/libm.a lib/libm020/libm881/libnix/libnix.a lib/libm020/libm881/libnix/libnix13.a +lib/libm020/libm881/libnix/libnix20.a lib/libm020/libm881/libnix/libnix_main.a lib/libm020/libm881/libnix/libnixmain.a lib/libm020/libm881/libnix/libstack.a @@ -40,6 +44,7 @@ lib/libm020/libnix/detach.o lib/libm020/libnix/libm.a lib/libm020/libnix/libnix.a lib/libm020/libnix/libnix13.a +lib/libm020/libnix/libnix20.a lib/libm020/libnix/libnix_main.a lib/libm020/libnix/libnixmain.a lib/libm020/libnix/libstack.a @@ -51,6 +56,7 @@ lib/libnix/libinitr.o lib/libnix/libm.a lib/libnix/libnix.a lib/libnix/libnix13.a +lib/libnix/libnix20.a lib/libnix/libnix_main.a lib/libnix/libnixmain.a lib/libnix/libstack.a diff --git a/manifests/src b/manifests/src index a03ac44..e2c6cc5 100644 --- a/manifests/src +++ b/manifests/src @@ -131,9 +131,7 @@ sysdep/libnix/sources/nix/extra/snprintf.c sysdep/libnix/sources/nix/extra/stat.c sysdep/libnix/sources/nix/extra/stpcpy.c sysdep/libnix/sources/nix/extra/strdup.c -sysdep/libnix/sources/nix/extra/stricmp.c sysdep/libnix/sources/nix/extra/strlower.c -sysdep/libnix/sources/nix/extra/strnicmp.c sysdep/libnix/sources/nix/extra/strupper.c sysdep/libnix/sources/nix/extra/timer.c sysdep/libnix/sources/nix/extra/times.c @@ -151,7 +149,6 @@ sysdep/libnix/sources/nix/math/__adddf3.c sysdep/libnix/sources/nix/math/__addsf3.c sysdep/libnix/sources/nix/math/__divdf3.c sysdep/libnix/sources/nix/math/__divsf3.c -sysdep/libnix/sources/nix/math/__divsi3.c sysdep/libnix/sources/nix/math/__eqdf2.c sysdep/libnix/sources/nix/math/__eqsf2.c sysdep/libnix/sources/nix/math/__extendsfdf2.c @@ -163,13 +160,11 @@ sysdep/libnix/sources/nix/math/__floatsidf.c sysdep/libnix/sources/nix/math/__floatsisf.c sysdep/libnix/sources/nix/math/__muldf3.c sysdep/libnix/sources/nix/math/__mulsf3.c -sysdep/libnix/sources/nix/math/__mulsi3.c sysdep/libnix/sources/nix/math/__negdf2.c sysdep/libnix/sources/nix/math/__negsf2.c sysdep/libnix/sources/nix/math/__subdf3.c sysdep/libnix/sources/nix/math/__subsf3.c sysdep/libnix/sources/nix/math/__truncdfsf2.c -sysdep/libnix/sources/nix/math/__udivsi3.c sysdep/libnix/sources/nix/misc/__request.c sysdep/libnix/sources/nix/misc/bcopy.c sysdep/libnix/sources/nix/misc/bzero.c @@ -284,6 +279,12 @@ sysdep/libnix/sources/nix13/extra/strnicmp.c sysdep/libnix/sources/nix13/math/__divsi3.c sysdep/libnix/sources/nix13/math/__mulsi3.c sysdep/libnix/sources/nix13/math/__udivsi3.c +sysdep/libnix/sources/nix20/Makefile.in +sysdep/libnix/sources/nix20/extra/stricmp.c +sysdep/libnix/sources/nix20/extra/strnicmp.c +sysdep/libnix/sources/nix20/math/__divsi3.c +sysdep/libnix/sources/nix20/math/__mulsi3.c +sysdep/libnix/sources/nix20/math/__udivsi3.c sysdep/libnix/sources/nix_main/Makefile.in sysdep/libnix/sources/nix_main/__nocommandline.c sysdep/libnix/sources/nix_main/_main.c diff --git a/sources/Makefile.in b/sources/Makefile.in index e350662..07bd7f5 100644 --- a/sources/Makefile.in +++ b/sources/Makefile.in @@ -26,7 +26,7 @@ CURDIR = $(shell pwd) MAKELIST=$(MAKE) -f $(CURDIR)/Makefile -SUBDIRS=nixmain nix_main misc math nix nix13 socket stack stubs +SUBDIRS=nixmain nix_main misc math nix nix13 nix20 socket stack stubs all: $(foreach f,$(SUBDIRS),$(CURDIR)/$(f)) for subdir in $(SUBDIRS); do \ @@ -45,6 +45,7 @@ filelists: -cd $(srcdir)/math; $(MAKELIST) SOURCEFILES="*/*.[cSCh]" FLDIR=$(CURDIR)/math $(CURDIR)/math/filelist -cd $(srcdir)/nix; $(MAKELIST) SOURCEFILES="*/*.[cSCh]" FLDIR=$(CURDIR)/nix $(CURDIR)/nix/filelist -cd $(srcdir)/nix13; $(MAKELIST) SOURCEFILES="*/*.[cSCh]" FLDIR=$(CURDIR)/nix13 $(CURDIR)/nix13/filelist + -cd $(srcdir)/nix20; $(MAKELIST) SOURCEFILES="*/*.[cSCh]" FLDIR=$(CURDIR)/nix20 $(CURDIR)/nix20/filelist -cd $(srcdir)/socket; $(MAKELIST) SOURCEFILES="*/*.[cSCh]" FLDIR=$(CURDIR)/socket $(CURDIR)/socket/filelist -cd $(srcdir)/stack; $(MAKELIST) SOURCEFILES="*.c" FLDIR=$(CURDIR)/stack $(CURDIR)/stack/filelist -cd $(srcdir)/stubs; $(MAKE) -f $(CURDIR)/Makefile STUBDIR=$(CURDIR)/stubs libbases/dos.c; \ diff --git a/sources/nix20/Makefile.in b/sources/nix20/Makefile.in new file mode 100644 index 0000000..fb7a352 --- /dev/null +++ b/sources/nix20/Makefile.in @@ -0,0 +1,56 @@ +#### Start of system configuration section. #### + +srcdir = @srcdir@ +VPATH = @srcdir@ + +CC = @CC@ +CPP = @CPP@ +AS = @AS@ + +AR = @AR@ +RANLIB = @RANLIB@ +AWK = @AWK@ + +#### End system configuration section #### + +ifneq ($(TARGET),clean) +include ../../sources/nix20/filelist +endif + +CURDIR = $(shell pwd) + +OPTIONS=-I$(srcdir)/../headers $(CFLAGS) -msmall-code + +REDEF=-D_DOSBase=___DOSBase \ + -D_UtilityBase=___UtilityBase \ + -D_MathIeeeSingBasBase=___MathIeeeSingBasBase \ + -D_MathIeeeSingTransBase=___MathIeeeSingTransBase \ + -D_MathIeeeDoubBasBase=___MathIeeeDoubBasBase \ + -D_MathIeeeDoubTransBase=___MathIeeeDoubTransBase \ + -D_LocaleBase=___LocaleBase + +%.o: %.c + $(CC) $(OPTIONS) -S $^ -o $*.S 2>&1|tee $*.err + $(CPP) -traditional $(REDEF) $*.S -o $*2.S + $(CC) $(OPTIONS) $*2.S -c -o $*.o + -rm $*.S $*2.S + -if test ! -s $*.err; then rm $*.err; fi + +.PHONY: all clean veryclean + +all: libnix20.a + +clean: + -rm -rf $(SUBDIRS) + +veryclean: + -rm -rf * + +$(foreach f,$(SUBDIRS),$(CURDIR)/$(f)): + mkdir $@ + +libnix20.a: $(foreach f,$(SUBDIRS),$(CURDIR)/$(f)) $(OBJECTS) ../../sources/nix20/Makefile ../../sources/nix20/filelist + -rm -f $@ + $(AR) -q $@ $(OBJECTS) + $(RANLIB) $@ + echo "\$$$(V)" >>$@ diff --git a/sources/nix/extra/stricmp.c b/sources/nix20/extra/stricmp.c similarity index 100% rename from sources/nix/extra/stricmp.c rename to sources/nix20/extra/stricmp.c diff --git a/sources/nix/extra/strnicmp.c b/sources/nix20/extra/strnicmp.c similarity index 100% rename from sources/nix/extra/strnicmp.c rename to sources/nix20/extra/strnicmp.c diff --git a/sources/nix/math/__divsi3.c b/sources/nix20/math/__divsi3.c similarity index 100% rename from sources/nix/math/__divsi3.c rename to sources/nix20/math/__divsi3.c diff --git a/sources/nix/math/__mulsi3.c b/sources/nix20/math/__mulsi3.c similarity index 100% rename from sources/nix/math/__mulsi3.c rename to sources/nix20/math/__mulsi3.c diff --git a/sources/nix/math/__udivsi3.c b/sources/nix20/math/__udivsi3.c similarity index 100% rename from sources/nix/math/__udivsi3.c rename to sources/nix20/math/__udivsi3.c