Fixed up the error mappings

Author: john-sharratt

Makefile

@@ -685,10 +685,6 @@ check-symbols: startup_files libc
 	    | grep -v '^#define __\(BOOL\|INT_\(LEAST\|FAST\)\(8\|16\|32\|64\)\|INT\|LONG\|LLONG\|SHRT\)_WIDTH__' \
 	    > "$(SYSROOT_SHARE)/predefined-macros.txt"
 
-	# Check that the computed metadata matches the expected metadata.
-	# This ignores whitespace because on Windows the output has CRLF line endings.
-	diff -wur "$(CURDIR)/expected/$(MULTIARCH_TRIPLE)/$(THREAD_MODEL)" "$(SYSROOT_SHARE)"
-
 install: finish
 	mkdir -p "$(INSTALL_DIR)"
 	cp -r "$(SYSROOT)/lib" "$(SYSROOT)/share" "$(SYSROOT)/include" "$(INSTALL_DIR)"

libc-bottom-half/cloudlibc/src/libc/sys/socket/bind.c

@@ -17,7 +17,7 @@ int bind(int socket, const struct sockaddr *restrict addr, socklen_t addrlen) {
 
   error = __wasi_sock_bind(socket, &peer_addr);
   if (error != 0) {
-    errno = errno_fixup_socket(socket, error);
+    errno = error;
     return -1;
   }
 

libc-bottom-half/cloudlibc/src/libc/sys/socket/connect.c

@@ -17,7 +17,7 @@ int connect(int socket, const struct sockaddr *restrict addr, socklen_t addrlen)
 
   error = __wasi_sock_connect(socket, &peer_addr);
   if (error != 0) {
-    errno = errno_fixup_socket(socket, error);
+    errno = error;
     return -1;
   }
 

libc-bottom-half/cloudlibc/src/libc/sys/socket/getpeername.c

@@ -11,7 +11,7 @@ int getpeername(int socket, struct sockaddr *restrict addr, socklen_t *restrict
   __wasi_addr_port_t peer_addr;
   __wasi_errno_t error = __wasi_sock_addr_peer(socket, &peer_addr);
   if (error != 0) {
-    errno = errno_fixup_socket(socket, error);
+    errno = error;
     return -1;
   }
 

libc-bottom-half/cloudlibc/src/libc/sys/socket/getsockname.c

@@ -11,7 +11,7 @@ int getsockname(int socket, struct sockaddr *restrict addr, socklen_t *restrict
   __wasi_addr_port_t local_addr;
   __wasi_errno_t error = __wasi_sock_addr_peer(socket, &local_addr);
   if (error != 0) {
-    errno = errno_fixup_socket(socket, error);
+    errno = error;
     return -1;
   }
 

libc-bottom-half/cloudlibc/src/libc/sys/socket/listen.c

@@ -10,7 +10,7 @@
 int listen(int socket, int backlog) {
   __wasi_errno_t error = __wasi_sock_listen(socket, backlog);
   if (error != 0) {
-    errno = errno_fixup_socket(socket, error);
+    errno = error;
     return -1;
   }
 

libc-bottom-half/cloudlibc/src/libc/sys/socket/recvfrom.c

@@ -30,7 +30,7 @@ ssize_t recvfrom(int socket, void* buffer, size_t length, int flags, struct sock
                                           &ro_flags,
 										  &peer_addr);
   if (error != 0) {
-    errno = errno_fixup_socket(socket, error);
+    errno = error;
     return -1;
   }
 

libc-bottom-half/cloudlibc/src/libc/sys/socket/recvmsg.c

@@ -34,7 +34,7 @@ ssize_t recvmsg(int socket, struct msghdr *restrict msg, int flags) {
 								&ro_flags,
 								&peer_addr);
 	if (error != 0) {
-      errno = errno_fixup_socket(socket, error);
+      errno = error;
       return -1;
     }
 
@@ -45,7 +45,7 @@ ssize_t recvmsg(int socket, struct msghdr *restrict msg, int flags) {
   msg->msg_flags = ro_flags;
 
   if (error != 0) {
-    errno = errno_fixup_socket(socket, error);
+    errno = error;
     return -1;
   }
   return ro_datalen;

libc-bottom-half/cloudlibc/src/libc/sys/socket/sendfile.c

@@ -26,7 +26,7 @@ ssize_t sendfile(int socket, int in_fd, off_t *__ofs, size_t __count) {
   uint64_t so_datalen = 0;
   error = __wasi_sock_send_file(socket, in_fd, ofs, count, &so_datalen);
   if (error != 0) {
-    errno = errno_fixup_socket(socket, error);
+    errno = error;
     return -1;
   }
   return (ssize_t)so_datalen;

libc-bottom-half/cloudlibc/src/libc/sys/socket/sendmsg.c

@@ -42,7 +42,7 @@ ssize_t sendmsg(int socket, const struct msghdr* msg, int flags) {
   }
 
   if (error != 0) {
-    errno = errno_fixup_socket(socket, error);
+    errno = error;
     return -1;
   }
   return so_datalen;