From fc713baba3ee9428f90d02646a4dcdf4283b9640 Mon Sep 17 00:00:00 2001 From: Jonas 'Sortie' Termansen Date: Thu, 13 Feb 2014 20:26:38 +0100 Subject: [PATCH] Rename libc-sortix to libk. --- kernel/Makefile | 2 +- libc/Makefile | 32 ++++++++++++++++---------------- libc/sortix/.gitignore | 0 libc/sortix/assert/.gitignore | 0 libc/sortix/aux/.gitignore | 0 libc/sortix/ctype/.gitignore | 0 libc/sortix/dirent/.gitignore | 0 libc/sortix/errno/.gitignore | 0 libc/sortix/fnmatch/.gitignore | 0 libc/sortix/init/.gitignore | 0 libc/sortix/inttypes/.gitignore | 0 libc/sortix/signal/.gitignore | 0 libc/sortix/stdio/.gitignore | 0 libc/sortix/stdlib/.gitignore | 0 libc/sortix/string/.gitignore | 1 - libc/sortix/time/.gitignore | 0 libc/sortix/timespec/.gitignore | 0 libc/sortix/wchar/.gitignore | 0 libc/sortix/wctype/.gitignore | 0 19 files changed, 17 insertions(+), 18 deletions(-) delete mode 100644 libc/sortix/.gitignore delete mode 100644 libc/sortix/assert/.gitignore delete mode 100644 libc/sortix/aux/.gitignore delete mode 100644 libc/sortix/ctype/.gitignore delete mode 100644 libc/sortix/dirent/.gitignore delete mode 100644 libc/sortix/errno/.gitignore delete mode 100644 libc/sortix/fnmatch/.gitignore delete mode 100644 libc/sortix/init/.gitignore delete mode 100644 libc/sortix/inttypes/.gitignore delete mode 100644 libc/sortix/signal/.gitignore delete mode 100644 libc/sortix/stdio/.gitignore delete mode 100644 libc/sortix/stdlib/.gitignore delete mode 100644 libc/sortix/string/.gitignore delete mode 100644 libc/sortix/time/.gitignore delete mode 100644 libc/sortix/timespec/.gitignore delete mode 100644 libc/sortix/wchar/.gitignore delete mode 100644 libc/sortix/wctype/.gitignore diff --git a/kernel/Makefile b/kernel/Makefile index 67220ab0..24128bbd 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -68,7 +68,7 @@ CRTN_OBJ:=$(CPU)/crtn.o LIBS=\ -nostdlib \ --lc-sortix \ +-lk \ -lgcc \ OBJS=\ diff --git a/libc/Makefile b/libc/Makefile index 09ef93ea..1dc1f045 100644 --- a/libc/Makefile +++ b/libc/Makefile @@ -550,17 +550,17 @@ $(CRTOBJ) \ HEADERS:=$(shell find include -type d) -SORTIXOBJS:=$(addprefix sortix/,$(FREEOBJS)) -SORTIXCPPFLAGS:=$(CPPFLAGS) -D__is_sortix_kernel -SORTIXFLAGS:=$(FLAGS) -ffreestanding -SORTIXCFLAGS:=$(CFLAGS) -SORTIXCXXFLAGS:=$(CXXFLAGS) +LIBK_OBJS:=$(FREEOBJS:.o=.libk.o) +LIBK_CPPFLAGS:=$(CPPFLAGS) -D__is_sortix_kernel +LIBK_FLAGS:=$(FLAGS) -ffreestanding +LIBK_CFLAGS:=$(CFLAGS) +LIBK_CXXFLAGS:=$(CXXFLAGS) ifeq ($(HOST),x86_64-sortix) - SORTIXFLAGS:=$(SORTIXFLAGS) -mno-red-zone + LIBK_FLAGS:=$(LIBK_FLAGS) -mno-red-zone endif BINS=libc.a libdl.a libg.a libpthread.a librt.a $(CRTOBJ) -BINSKERNEL=libc-sortix.a +BINSKERNEL=libk.a INSTALLLIBS:=$(addprefix $(DESTDIR)$(LIBDIR)/,$(BINS)) INSTALLLIBSKERNEL:=$(addprefix $(DESTDIR)$(LIBDIR)/,$(BINSKERNEL)) @@ -578,15 +578,15 @@ FORCE: libc.a: $(OBJS) $(HOSTAR) rcs $@ $(OBJS) -libc-sortix.a: $(SORTIXOBJS) - $(HOSTAR) rcs $@ $(SORTIXOBJS) - libdl.a: $(HOSTAR) rcs $@ libg.a: $(HOSTAR) rcs $@ +libk.a: $(LIBK_OBJS) + $(HOSTAR) rcs $@ $(LIBK_OBJS) + libpthread.a: $(HOSTAR) rcs $@ @@ -603,7 +603,7 @@ crtn.o: $(CPUDIR)/crtn.o ln -f $< $@ # header preprocessing -$(OBJS) $(SORTIXOBJS): $(HEADERS) +$(OBJS) $(LIBK_OBJS): $(HEADERS) headers: @@ -617,12 +617,12 @@ headers: %.o: %.S $(HOSTCXX) -c $< -o $@ $(CPPFLAGS) $(FLAGS) $(CFLAGS) -# libc-sortix -sortix/%.o: %.c - $(HOSTCC) -c $< -o $@ $(SORTIXCPPFLAGS) $(SORTIXFLAGS) $(SORTIXCFLAGS) +# libk +%.libk.o: %.c + $(HOSTCC) -c $< -o $@ $(LIBK_CPPFLAGS) $(LIBK_FLAGS) $(LIBK_CFLAGS) -sortix/%.o: %.cpp - $(HOSTCXX) -c $< -o $@ $(SORTIXCPPFLAGS) $(SORTIXFLAGS) $(SORTIXCXXFLAGS) +%.libk.o: %.cpp + $(HOSTCXX) -c $< -o $@ $(LIBK_CPPFLAGS) $(LIBK_FLAGS) $(LIBK_CXXFLAGS) clean: rm -f $(wildcard *.o) $(wildcard */*.o) $(wildcard */*/*.o) $(wildcard *.a) diff --git a/libc/sortix/.gitignore b/libc/sortix/.gitignore deleted file mode 100644 index e69de29b..00000000 diff --git a/libc/sortix/assert/.gitignore b/libc/sortix/assert/.gitignore deleted file mode 100644 index e69de29b..00000000 diff --git a/libc/sortix/aux/.gitignore b/libc/sortix/aux/.gitignore deleted file mode 100644 index e69de29b..00000000 diff --git a/libc/sortix/ctype/.gitignore b/libc/sortix/ctype/.gitignore deleted file mode 100644 index e69de29b..00000000 diff --git a/libc/sortix/dirent/.gitignore b/libc/sortix/dirent/.gitignore deleted file mode 100644 index e69de29b..00000000 diff --git a/libc/sortix/errno/.gitignore b/libc/sortix/errno/.gitignore deleted file mode 100644 index e69de29b..00000000 diff --git a/libc/sortix/fnmatch/.gitignore b/libc/sortix/fnmatch/.gitignore deleted file mode 100644 index e69de29b..00000000 diff --git a/libc/sortix/init/.gitignore b/libc/sortix/init/.gitignore deleted file mode 100644 index e69de29b..00000000 diff --git a/libc/sortix/inttypes/.gitignore b/libc/sortix/inttypes/.gitignore deleted file mode 100644 index e69de29b..00000000 diff --git a/libc/sortix/signal/.gitignore b/libc/sortix/signal/.gitignore deleted file mode 100644 index e69de29b..00000000 diff --git a/libc/sortix/stdio/.gitignore b/libc/sortix/stdio/.gitignore deleted file mode 100644 index e69de29b..00000000 diff --git a/libc/sortix/stdlib/.gitignore b/libc/sortix/stdlib/.gitignore deleted file mode 100644 index e69de29b..00000000 diff --git a/libc/sortix/string/.gitignore b/libc/sortix/string/.gitignore deleted file mode 100644 index 8b137891..00000000 --- a/libc/sortix/string/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/libc/sortix/time/.gitignore b/libc/sortix/time/.gitignore deleted file mode 100644 index e69de29b..00000000 diff --git a/libc/sortix/timespec/.gitignore b/libc/sortix/timespec/.gitignore deleted file mode 100644 index e69de29b..00000000 diff --git a/libc/sortix/wchar/.gitignore b/libc/sortix/wchar/.gitignore deleted file mode 100644 index e69de29b..00000000 diff --git a/libc/sortix/wctype/.gitignore b/libc/sortix/wctype/.gitignore deleted file mode 100644 index e69de29b..00000000