Merge the basics component into libc-bottom-half. (WebAssembly#199)

We no longer have a need to maintain basics as a separate component. Folding it into libc-bottom-half eliminates a fair amount of redundancy.
kildom · Jun 1, 2020 · 753cc43 · 753cc43
1 parent 84c0778
commit 753cc43
Show file tree

Hide file tree

Showing 46 changed files with 84 additions and 298 deletions.
diff --git a/Makefile b/Makefile
@@ -12,21 +12,13 @@ INSTALL_DIR ?= /usr/local
 THREAD_MODEL ?= single
 # yes or no
 BUILD_DLMALLOC ?= yes
-BUILD_LIBC_BOTTOM_HALF ?= yes
 BUILD_LIBC_TOP_HALF ?= yes
 # The directory where we're store intermediate artifacts.
 OBJDIR ?= $(CURDIR)/build
 
 # Check dependencies.
-ifeq ($(BUILD_LIBC_TOP_HALF),yes)
-ifneq ($(BUILD_LIBC_BOTTOM_HALF),yes)
-$(error BUILD_LIBC_TOP_HALF=yes depends on BUILD_LIBC_BOTTOM_HALF=yes)
-endif
-endif
-ifeq ($(BUILD_LIBC_BOTTOM_HALF),yes)
 ifneq ($(BUILD_DLMALLOC),yes)
-$(error BUILD_LIBC_BOTTOM_HALF=yes depends on BUILD_DLMALLOC=yes)
-endif
+$(error build currently depends on BUILD_DLMALLOC=yes)
 endif
 
 # Variables from this point on are not meant to be overridable via the
@@ -39,12 +31,6 @@ MULTIARCH_TRIPLE = wasm32-wasi
 
 # These variables describe the locations of various files and directories in
 # the source tree.
-BASICS_DIR = $(CURDIR)/basics
-BASICS_INC = $(BASICS_DIR)/include
-BASICS_CRT_SOURCES = $(wildcard $(BASICS_DIR)/crt/*.c)
-BASICS_SOURCES = \
-    $(wildcard $(BASICS_DIR)/sources/*.c) \
-    $(wildcard $(BASICS_DIR)/sources/math/*.c)
 DLMALLOC_DIR = $(CURDIR)/dlmalloc
 DLMALLOC_SRC_DIR = $(DLMALLOC_DIR)/src
 DLMALLOC_SOURCES = $(DLMALLOC_SRC_DIR)/dlmalloc.c
@@ -209,25 +195,15 @@ WASM_CFLAGS += --sysroot="$(SYSROOT)"
 # These variables describe the locations of various files and directories in
 # the build tree.
 objs = $(patsubst $(CURDIR)/%.c,$(OBJDIR)/%.o,$(1))
-BASICS_OBJS = $(call objs,$(BASICS_SOURCES))
 DLMALLOC_OBJS = $(call objs,$(DLMALLOC_SOURCES))
 LIBC_BOTTOM_HALF_ALL_OBJS = $(call objs,$(LIBC_BOTTOM_HALF_ALL_SOURCES))
 LIBC_TOP_HALF_ALL_OBJS = $(call objs,$(LIBC_TOP_HALF_ALL_SOURCES))
-LIBC_OBJS := $(BASICS_OBJS)
 ifeq ($(BUILD_DLMALLOC),yes)
 LIBC_OBJS += $(DLMALLOC_OBJS)
 endif
-ifeq ($(BUILD_LIBC_BOTTOM_HALF),yes)
-# Override basics' string.o with libc-bottom-half's.
-LIBC_OBJS := $(filter-out %/string.o,$(LIBC_OBJS))
 # Add libc-bottom-half's objects.
 LIBC_OBJS += $(LIBC_BOTTOM_HALF_ALL_OBJS)
-endif
 ifeq ($(BUILD_LIBC_TOP_HALF),yes)
-# Override libc-bottom-half's string.o with libc-top-half's.
-LIBC_OBJS := $(filter-out %/string.o,$(LIBC_OBJS))
-# Override libc-bottom-half's qsort.o with libc-top-half's.
-LIBC_OBJS := $(filter-out %/qsort.o,$(LIBC_OBJS))
 # libc-top-half is musl.
 LIBC_OBJS += $(LIBC_TOP_HALF_ALL_OBJS)
 endif
@@ -405,7 +381,6 @@ include_dirs:
 	# Install the include files.
 	#
 	mkdir -p "$(SYSROOT_INC)"
-	cp -r "$(BASICS_INC)" "$(SYSROOT)"
 	cp -r "$(LIBC_BOTTOM_HALF_HEADERS_PUBLIC)"/* "$(SYSROOT_INC)"
 
 	# Generate musl's bits/alltypes.h header.
@@ -424,19 +399,13 @@ include_dirs:
 	# Remove selected header files.
 	$(RM) $(patsubst %,$(SYSROOT_INC)/%,$(MUSL_OMIT_HEADERS))
 
-ifeq ($(BUILD_LIBC_BOTTOM_HALF),no)
-CRT_SOURCES = $(BASICS_CRT_SOURCES)
-else
-CRT_SOURCES = $(LIBC_BOTTOM_HALF_CRT_SOURCES)
-endif
-
 startup_files: include_dirs
 	#
 	# Build the startup files.
 	#
 	@mkdir -p "$(OBJDIR)"
 	cd "$(OBJDIR)" && \
-	"$(WASM_CC)" $(WASM_CFLAGS) -c $(CRT_SOURCES) -MD -MP && \
+	"$(WASM_CC)" $(WASM_CFLAGS) -c $(LIBC_BOTTOM_HALF_CRT_SOURCES) -MD -MP && \
 	mkdir -p "$(SYSROOT_LIB)" && \
 	mv *.o "$(SYSROOT_LIB)"
 

diff --git a/basics/crt/crt1.c b/basics/crt/crt1.c
diff --git a/basics/include/__typedef_blksize_t.h b/basics/include/__typedef_blksize_t.h
diff --git a/basics/include/__typedef_gid_t.h b/basics/include/__typedef_gid_t.h
diff --git a/basics/include/__typedef_mode_t.h b/basics/include/__typedef_mode_t.h
diff --git a/basics/include/__typedef_uid_t.h b/basics/include/__typedef_uid_t.h
diff --git a/basics/include/errno.h b/basics/include/errno.h
diff --git a/basics/include/stdlib.h b/basics/include/stdlib.h
diff --git a/basics/include/string.h b/basics/include/string.h
diff --git a/basics/include/sys/stat.h b/basics/include/sys/stat.h
diff --git a/basics/include/sys/types.h b/basics/include/sys/types.h
diff --git a/basics/include/time.h b/basics/include/time.h
diff --git a/basics/sources/string.c b/basics/sources/string.c
diff --git a/expected/wasm32-wasi/predefined-macros.txt b/expected/wasm32-wasi/predefined-macros.txt
@@ -3021,9 +3021,12 @@
 #define __wasi_libc_environ_h 
 #define __wasi_libc_find_relpath_h 
 #define __wasi_libc_h 
+#define __wasilibc___errno_h 
 #define __wasilibc___errno_values_h 
 #define __wasilibc___fd_set_h 
 #define __wasilibc___function___isatty_h 
+#define __wasilibc___functions_malloc_h 
+#define __wasilibc___functions_memcpy_h 
 #define __wasilibc___header_dirent_h 
 #define __wasilibc___header_fcntl_h 
 #define __wasilibc___header_netinet_in_h 
@@ -3036,7 +3039,9 @@
 #define __wasilibc___header_sys_stat_h 
 #define __wasilibc___header_time_h 
 #define __wasilibc___header_unistd_h 
+#define __wasilibc___include_inttypes_h 
 #define __wasilibc___macro_FD_SETSIZE_h 
+#define __wasilibc___macro_PAGESIZE_h 
 #define __wasilibc___mode_t_h 
 #define __wasilibc___seek_h 
 #define __wasilibc___struct_dirent_h 
@@ -3051,42 +3056,37 @@
 #define __wasilibc___struct_sockaddr_in_h 
 #define __wasilibc___struct_sockaddr_storage_h 
 #define __wasilibc___struct_sockaddr_un_h 
+#define __wasilibc___struct_stat_h 
+#define __wasilibc___struct_timespec_h 
 #define __wasilibc___struct_timeval_h 
 #define __wasilibc___struct_tm_h 
 #define __wasilibc___struct_tms_h 
 #define __wasilibc___typedef_DIR_h 
+#define __wasilibc___typedef_blkcnt_t_h 
+#define __wasilibc___typedef_blksize_t_h 
+#define __wasilibc___typedef_clock_t_h 
 #define __wasilibc___typedef_clockid_t_h 
+#define __wasilibc___typedef_dev_t_h 
 #define __wasilibc___typedef_fd_set_h 
+#define __wasilibc___typedef_gid_t_h 
 #define __wasilibc___typedef_in_addr_t_h 
 #define __wasilibc___typedef_in_port_t_h 
+#define __wasilibc___typedef_ino_t_h 
+#define __wasilibc___typedef_mode_t_h 
 #define __wasilibc___typedef_nfds_t_h 
+#define __wasilibc___typedef_nlink_t_h 
+#define __wasilibc___typedef_off_t_h 
 #define __wasilibc___typedef_sa_family_t_h 
 #define __wasilibc___typedef_sigset_t_h 
 #define __wasilibc___typedef_socklen_t_h 
+#define __wasilibc___typedef_ssize_t_h 
+#define __wasilibc___typedef_suseconds_t_h 
+#define __wasilibc___typedef_time_t_h 
+#define __wasilibc___typedef_uid_t_h 
 #define __wasm 1
 #define __wasm32 1
 #define __wasm32__ 1
 #define __wasm__ 1
-#define __wasm_basics___errno_h 
-#define __wasm_basics___functions_malloc_h 
-#define __wasm_basics___functions_memcpy_h 
-#define __wasm_basics___include_inttypes_h 
-#define __wasm_basics___macro_PAGESIZE_h 
-#define __wasm_basics___struct_stat_h 
-#define __wasm_basics___struct_timespec_h 
-#define __wasm_basics___typedef_blkcnt_t_h 
-#define __wasm_basics___typedef_blksize_t_h 
-#define __wasm_basics___typedef_clock_t_h 
-#define __wasm_basics___typedef_dev_t_h 
-#define __wasm_basics___typedef_gid_t_h 
-#define __wasm_basics___typedef_ino_t_h 
-#define __wasm_basics___typedef_mode_t_h 
-#define __wasm_basics___typedef_nlink_t_h 
-#define __wasm_basics___typedef_off_t_h 
-#define __wasm_basics___typedef_ssize_t_h 
-#define __wasm_basics___typedef_suseconds_t_h 
-#define __wasm_basics___typedef_time_t_h 
-#define __wasm_basics___typedef_uid_t_h 
 #define _tolower(a) ((a)|0x20)
 #define _toupper(a) ((a)&0x5f)
 #define acos(x) __tg_real_complex(acos, (x))

diff --git a/libc-bottom-half/README.md b/libc-bottom-half/README.md
@@ -16,5 +16,4 @@ libc rather than to be a layer on top of libc.
 
 [libpreopen]: https://github.com/musec/libpreopen
 
-The WASI libc "bottom half" depends on the basics and dlmalloc components of
-wasi-libc.
+The WASI libc lower half currently depends on the dlmalloc component.
diff --git a/libc-bottom-half/cloudlibc/src/libc/stdlib/qsort.c b/libc-bottom-half/cloudlibc/src/libc/stdlib/qsort.c
diff --git a/basics/include/__errno.h → libc-bottom-half/headers/public/__errno.h b/basics/include/__errno.h → libc-bottom-half/headers/public/__errno.h
@@ -1,5 +1,5 @@
-#ifndef __wasm_basics___errno_h
-#define __wasm_basics___errno_h
+#ifndef __wasilibc___errno_h
+#define __wasilibc___errno_h
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/basics/include/__functions_malloc.h → ...-half/headers/public/__functions_malloc.h b/basics/include/__functions_malloc.h → ...-half/headers/public/__functions_malloc.h
@@ -1,5 +1,5 @@
-#ifndef __wasm_basics___functions_malloc_h
-#define __wasm_basics___functions_malloc_h
+#ifndef __wasilibc___functions_malloc_h
+#define __wasilibc___functions_malloc_h
 
 #define __need_size_t
 #define __need_wchar_t

diff --git a/basics/include/__functions_memcpy.h → ...-half/headers/public/__functions_memcpy.h b/basics/include/__functions_memcpy.h → ...-half/headers/public/__functions_memcpy.h
@@ -1,5 +1,5 @@
-#ifndef __wasm_basics___functions_memcpy_h
-#define __wasm_basics___functions_memcpy_h
+#ifndef __wasilibc___functions_memcpy_h
+#define __wasilibc___functions_memcpy_h
 
 #define __need_size_t
 #define __need_NULL

diff --git a/basics/include/__header_inttypes.h → ...m-half/headers/public/__header_inttypes.h b/basics/include/__header_inttypes.h → ...m-half/headers/public/__header_inttypes.h
@@ -1,5 +1,5 @@
-#ifndef __wasm_basics___include_inttypes_h
-#define __wasm_basics___include_inttypes_h
+#ifndef __wasilibc___include_inttypes_h
+#define __wasilibc___include_inttypes_h
 
 #include <stdint.h>
 

diff --git a/basics/include/__macro_PAGESIZE.h → ...om-half/headers/public/__macro_PAGESIZE.h b/basics/include/__macro_PAGESIZE.h → ...om-half/headers/public/__macro_PAGESIZE.h
@@ -1,5 +1,5 @@
-#ifndef __wasm_basics___macro_PAGESIZE_h
-#define __wasm_basics___macro_PAGESIZE_h
+#ifndef __wasilibc___macro_PAGESIZE_h
+#define __wasilibc___macro_PAGESIZE_h
 
 /*
  * The page size in WebAssembly is fixed at 64 KiB. If this ever changes,