From 791608d3fc5f71423eb0017009a28c5711d434df Mon Sep 17 00:00:00 2001 From: Joel Dice Date: Thu, 11 Jan 2024 12:01:30 -0700 Subject: [PATCH] move generated bindings per review feedback Since these files aren't part of cloudlibc, no reason to put them under the cloudlibc directory. Signed-off-by: Joel Dice --- Makefile | 7 ++----- .../src/libc/sys/wasi => sources}/preview2.c | 0 .../sys/wasi => sources}/preview2_component_type.o | Bin 3 files changed, 2 insertions(+), 5 deletions(-) rename libc-bottom-half/{cloudlibc/src/libc/sys/wasi => sources}/preview2.c (100%) rename libc-bottom-half/{cloudlibc/src/libc/sys/wasi => sources}/preview2_component_type.o (100%) diff --git a/Makefile b/Makefile index 5778f799b..709cc684e 100644 --- a/Makefile +++ b/Makefile @@ -83,10 +83,7 @@ ifeq ($(WASI_SNAPSHOT), preview1) # Omit source files not relevant to WASI Preview 1. As we introduce files # supporting `wasi-sockets` for `wasm32-wasi-preview2`, we'll add those files to # this list. -LIBC_BOTTOM_HALF_OMIT_SOURCES := \ - $(addprefix $(LIBC_BOTTOM_HALF_CLOUDLIBC_SRC)/libc/sys/, \ - wasi/preview2.c \ - ) +LIBC_BOTTOM_HALF_OMIT_SOURCES := $(LIBC_BOTTOM_HALF_SOURCES)/preview2.c LIBC_BOTTOM_HALF_ALL_SOURCES := $(filter-out $(LIBC_BOTTOM_HALF_OMIT_SOURCES),$(LIBC_BOTTOM_HALF_ALL_SOURCES)) # Omit preview2.h from include-all.c test. INCLUDE_ALL_CLAUSES := -not -name preview2.h @@ -889,7 +886,7 @@ bindings: $(BINDING_WORK_DIR)/wasi-cli $(BINDING_WORK_DIR)/wit-bindgen --rename wasi:cli/terminal-stderr@0.2.0-rc-2023-12-05=terminal_stderr \ ./wasi-cli/wit && \ mv preview2.h ../../libc-bottom-half/headers/public/ && \ - mv preview2.c preview2_component_type.o ../../libc-bottom-half/cloudlibc/src/libc/sys/wasi/ + mv preview2.c preview2_component_type.o ../../libc-bottom-half/sources clean: $(RM) -r "$(BINDING_WORK_DIR)" diff --git a/libc-bottom-half/cloudlibc/src/libc/sys/wasi/preview2.c b/libc-bottom-half/sources/preview2.c similarity index 100% rename from libc-bottom-half/cloudlibc/src/libc/sys/wasi/preview2.c rename to libc-bottom-half/sources/preview2.c diff --git a/libc-bottom-half/cloudlibc/src/libc/sys/wasi/preview2_component_type.o b/libc-bottom-half/sources/preview2_component_type.o similarity index 100% rename from libc-bottom-half/cloudlibc/src/libc/sys/wasi/preview2_component_type.o rename to libc-bottom-half/sources/preview2_component_type.o