Skip to content

Commit 75836f0

Browse files
authored
Update wit-bindgen to 0.48.0 (WebAssembly#684)
This updates from 0.17.0 to 0.48.0. This removes a few headers in the generated header which required further changes in other files to include the headers now as well.
1 parent 161f350 commit 75836f0

File tree

15 files changed

+808
-826
lines changed

15 files changed

+808
-826
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1042,7 +1042,7 @@ BINDING_WORK_DIR ?= build/bindings
10421042
WASI_CLI_URL ?= https://github.com/WebAssembly/wasi-cli/archive/refs/tags/v0.2.0.tar.gz
10431043
# URL from which to retrieve the `wit-bindgen` command used to generate the
10441044
# WASIp2 bindings.
1045-
WIT_BINDGEN_URL ?= https://github.com/bytecodealliance/wit-bindgen/releases/download/wit-bindgen-cli-0.17.0/wit-bindgen-v0.17.0-x86_64-linux.tar.gz
1045+
WIT_BINDGEN_URL ?= https://github.com/bytecodealliance/wit-bindgen/releases/download/v0.48.0/wit-bindgen-0.48.0-x86_64-linux.tar.gz
10461046

10471047
$(BINDING_WORK_DIR)/wasi-cli:
10481048
mkdir -p "$(BINDING_WORK_DIR)"

expected/wasm32-wasip2/defined-symbols.txt

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -618,11 +618,9 @@ fileno
618618
fileno_unlocked
619619
filesystem_borrow_descriptor
620620
filesystem_borrow_directory_entry_stream
621-
filesystem_descriptor_drop_borrow
622621
filesystem_descriptor_drop_own
623622
filesystem_descriptor_stat_free
624623
filesystem_directory_entry_free
625-
filesystem_directory_entry_stream_drop_borrow
626624
filesystem_directory_entry_stream_drop_own
627625
filesystem_filesystem_error_code
628626
filesystem_method_descriptor_advise
@@ -830,7 +828,6 @@ initstate
830828
insque
831829
instance_network_instance_network
832830
io_error_borrow_error
833-
io_error_error_drop_borrow
834831
io_error_error_drop_own
835832
io_error_method_error_to_debug_string
836833
ioctl
@@ -839,7 +836,6 @@ ip_name_lookup_ip_address_free
839836
ip_name_lookup_method_resolve_address_stream_resolve_next_address
840837
ip_name_lookup_method_resolve_address_stream_subscribe
841838
ip_name_lookup_option_ip_address_free
842-
ip_name_lookup_resolve_address_stream_drop_borrow
843839
ip_name_lookup_resolve_address_stream_drop_own
844840
ip_name_lookup_resolve_addresses
845841
ip_name_lookup_result_option_ip_address_error_code_free
@@ -1002,7 +998,6 @@ nearbyintl
1002998
network_borrow_network
1003999
network_ip_address_free
10041000
network_ip_socket_address_free
1005-
network_network_drop_borrow
10061001
network_network_drop_own
10071002
newlocale
10081003
nextafter
@@ -1037,7 +1032,6 @@ poll_list_borrow_pollable_free
10371032
poll_method_pollable_block
10381033
poll_method_pollable_ready
10391034
poll_poll
1040-
poll_pollable_drop_borrow
10411035
poll_pollable_drop_own
10421036
poll_wasip2
10431037
posix_close
@@ -1276,7 +1270,6 @@ strcspn
12761270
strdup
12771271
streams_borrow_input_stream
12781272
streams_borrow_output_stream
1279-
streams_input_stream_drop_borrow
12801273
streams_input_stream_drop_own
12811274
streams_method_input_stream_blocking_read
12821275
streams_method_input_stream_blocking_skip
@@ -1293,7 +1286,6 @@ streams_method_output_stream_splice
12931286
streams_method_output_stream_subscribe
12941287
streams_method_output_stream_write
12951288
streams_method_output_stream_write_zeroes
1296-
streams_output_stream_drop_borrow
12971289
streams_output_stream_drop_own
12981290
streams_result_list_u8_stream_error_free
12991291
streams_result_u64_stream_error_free
@@ -1395,16 +1387,13 @@ tcp_result_u64_error_code_free
13951387
tcp_result_u8_error_code_free
13961388
tcp_result_void_error_code_free
13971389
tcp_setsockopt
1398-
tcp_tcp_socket_drop_borrow
13991390
tcp_tcp_socket_drop_own
14001391
tdelete
14011392
tdestroy
14021393
telldir
14031394
terminal_input_borrow_terminal_input
1404-
terminal_input_terminal_input_drop_borrow
14051395
terminal_input_terminal_input_drop_own
14061396
terminal_output_borrow_terminal_output
1407-
terminal_output_terminal_output_drop_borrow
14081397
terminal_output_terminal_output_drop_own
14091398
terminal_stderr_get_terminal_stderr
14101399
terminal_stderr_option_own_terminal_output_free
@@ -1448,7 +1437,6 @@ udp_borrow_udp_socket
14481437
udp_create_socket_create_udp_socket
14491438
udp_create_socket_result_own_udp_socket_error_code_free
14501439
udp_incoming_datagram_free
1451-
udp_incoming_datagram_stream_drop_borrow
14521440
udp_incoming_datagram_stream_drop_own
14531441
udp_ip_socket_address_free
14541442
udp_list_incoming_datagram_free
@@ -1473,15 +1461,13 @@ udp_method_udp_socket_subscribe
14731461
udp_method_udp_socket_unicast_hop_limit
14741462
udp_option_ip_socket_address_free
14751463
udp_outgoing_datagram_free
1476-
udp_outgoing_datagram_stream_drop_borrow
14771464
udp_outgoing_datagram_stream_drop_own
14781465
udp_result_ip_socket_address_error_code_free
14791466
udp_result_list_incoming_datagram_error_code_free
14801467
udp_result_tuple2_own_incoming_datagram_stream_own_outgoing_datagram_stream_error_code_free
14811468
udp_result_u64_error_code_free
14821469
udp_result_u8_error_code_free
14831470
udp_result_void_error_code_free
1484-
udp_udp_socket_drop_borrow
14851471
udp_udp_socket_drop_own
14861472
uname
14871473
ungetc

libc-bottom-half/cloudlibc/src/common/errors.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#ifdef __wasilibc_use_wasip2
22
#include <wasi/wasip2.h>
33
#include <errno.h>
4+
#include <stdlib.h>
45

56
static void translate_error(filesystem_error_code_t error) {
67
switch (error) {

libc-bottom-half/cloudlibc/src/libc/unistd/pread.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#ifdef __wasilibc_use_wasip2
66
#include <wasi/wasip2.h>
77
#include <wasi/file_utils.h>
8+
#include <string.h>
89
#include <common/errors.h>
910
#else
1011
#include <wasi/api.h>

libc-bottom-half/cloudlibc/src/libc/unistd/read.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <wasi/descriptor_table.h>
88
#include <wasi/file_utils.h>
99
#include <common/errors.h>
10+
#include <string.h>
1011
#else
1112
#include <wasi/api.h>
1213
#endif

0 commit comments

Comments
 (0)