Remove --backup=numbered, to reduce clutter in the sysroot.

Author: sunfishcode

Makefile

@@ -276,8 +276,8 @@ $(SYSROOT_INC):
 	# Install the include files.
 	#
 	mkdir -p "$(SYSROOT_INC)"
-	cp -r --backup=numbered "$(BASICS_INC)" "$(SYSROOT)"
-	cp -r --backup=numbered "$(LIBC_BOTTOM_HALF_HEADERS_PUBLIC)"/* "$(SYSROOT_INC)"
+	cp -r "$(BASICS_INC)" "$(SYSROOT)"
+	cp -r "$(LIBC_BOTTOM_HALF_HEADERS_PUBLIC)"/* "$(SYSROOT_INC)"
 
 	# Generate musl's bits/alltypes.h header.
 	mkdir -p "$(SYSROOT_INC)/bits"
@@ -287,9 +287,9 @@ $(SYSROOT_INC):
 	    > "$(SYSROOT_INC)/bits/alltypes.h"
 
 	# Copy in the bulk of musl's public header files.
-	cp -r --backup=numbered "$(LIBC_TOP_HALF_MUSL_INC)"/* "$(SYSROOT_INC)"
+	cp -r "$(LIBC_TOP_HALF_MUSL_INC)"/* "$(SYSROOT_INC)"
 	# Copy in the musl's "bits" header files.
-	cp -r --backup=numbered "$(LIBC_TOP_HALF_MUSL_DIR)"/arch/generic/bits/* "$(SYSROOT_INC)/bits"
+	cp -r "$(LIBC_TOP_HALF_MUSL_DIR)"/arch/generic/bits/* "$(SYSROOT_INC)/bits"
 	cp -r "$(LIBC_TOP_HALF_MUSL_DIR)"/arch/wasm32/bits/* "$(SYSROOT_INC)/bits"
 
 	# Remove files that aren't headers or that aren't supported yet or that aren't relevant for wasm.

expected/wasm32-wasi/include-all.c

@@ -70,14 +70,10 @@
 #include <cpio.h>
 #include <crypt.h>
 #include <ctype.h>
-#include <dirent.h.~1~>
 #include <dirent.h>
 #include <endian.h>
 #include <err.h>
-#include <errno.h.~1~>
-#include <errno.h.~2~>
 #include <errno.h>
-#include <fcntl.h.~1~>
 #include <fcntl.h>
 #include <features.h>
 #include <fenv.h>
@@ -109,7 +105,6 @@
 #include <netinet/icmp6.h>
 #include <netinet/if_ether.h>
 #include <netinet/igmp.h>
-#include <netinet/in.h.~1~>
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
@@ -119,7 +114,6 @@
 #include <netinet/udp.h>
 #include <netpacket/packet.h>
 #include <nl_types.h>
-#include <poll.h.~1~>
 #include <poll.h>
 #include <pthread.h>
 #include <regex.h>
@@ -136,12 +130,8 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdio_ext.h>
-#include <stdlib.h.~1~>
-#include <stdlib.h.~2~>
 #include <stdlib.h>
 #include <stdnoreturn.h>
-#include <string.h.~1~>
-#include <string.h.~2~>
 #include <string.h>
 #include <strings.h>
 #include <stropts.h>
@@ -150,43 +140,31 @@
 #include <sys/eventfd.h>
 #include <sys/fcntl.h>
 #include <sys/file.h>
-#include <sys/ioctl.h.~1~>
 #include <sys/ioctl.h>
 #include <sys/param.h>
 #include <sys/poll.h>
 #include <sys/random.h>
 #include <sys/reg.h>
-#include <sys/resource.h.~1~>
 #include <sys/resource.h>
-#include <sys/select.h.~1~>
 #include <sys/select.h>
 #include <sys/signal.h>
 #include <sys/signalfd.h>
-#include <sys/socket.h.~1~>
 #include <sys/socket.h>
-#include <sys/stat.h.~1~>
-#include <sys/stat.h.~2~>
 #include <sys/stat.h>
 #include <sys/stropts.h>
 #include <sys/syscall.h>
 #include <sys/sysinfo.h>
 #include <sys/sysmacros.h>
 #include <sys/termios.h>
-#include <sys/time.h.~1~>
 #include <sys/time.h>
 #include <sys/timeb.h>
 #include <sys/timerfd.h>
-#include <sys/times.h.~1~>
 #include <sys/times.h>
 #include <sys/timex.h>
 #include <sys/ttydefaults.h>
-#include <sys/types.h.~1~>
-#include <sys/types.h.~2~>
 #include <sys/types.h>
 #include <sys/ucontext.h>
-#include <sys/uio.h.~1~>
 #include <sys/uio.h>
-#include <sys/un.h.~1~>
 #include <sys/un.h>
 #include <sys/utsname.h>
 #include <sys/xattr.h>
@@ -196,18 +174,14 @@
 #include <termios.h>
 #include <tgmath.h>
 #include <threads.h>
-#include <time.h.~1~>
-#include <time.h.~2~>
 #include <time.h>
 #include <uchar.h>
 #include <ucontext.h>
 #include <ulimit.h>
-#include <unistd.h.~1~>
 #include <unistd.h>
 #include <utime.h>
 #include <values.h>
 #include <wasi.h>
-#include <wchar.h.~1~>
 #include <wchar.h>
 #include <wctype.h>
 #include <wordexp.h>

expected/wasm32-wasi/predefined-macros.txt

@@ -3732,25 +3732,6 @@
 #define __wasilibc___typedef_sa_family_t_h 
 #define __wasilibc___typedef_sigset_t_h 
 #define __wasilibc___typedef_socklen_t_h 
-#define __wasilibc_dirent_h 
-#define __wasilibc_errno_h 
-#define __wasilibc_fcntl_h 
-#define __wasilibc_netinet_in_h 
-#define __wasilibc_poll_h 
-#define __wasilibc_stdlib_h 
-#define __wasilibc_string_h 
-#define __wasilibc_sys_ioctl_h 
-#define __wasilibc_sys_resource_h 
-#define __wasilibc_sys_select_h 
-#define __wasilibc_sys_socket_h 
-#define __wasilibc_sys_stat_h 
-#define __wasilibc_sys_time_h 
-#define __wasilibc_sys_times_h 
-#define __wasilibc_sys_types_h 
-#define __wasilibc_sys_uio_h 
-#define __wasilibc_sys_un_h 
-#define __wasilibc_time_h 
-#define __wasilibc_unistd_h 
 #define __wasm 1
 #define __wasm32 1
 #define __wasm32__ 1
@@ -3772,13 +3753,6 @@
 #define __wasm_basics___typedef_suseconds_t_h 
 #define __wasm_basics___typedef_time_t_h 
 #define __wasm_basics___typedef_uid_t_h 
-#define __wasm_basics_errno_h 
-#define __wasm_basics_stdlib_h 
-#define __wasm_basics_string_h 
-#define __wasm_basics_sys_stat_h 
-#define __wasm_basics_sys_types_h 
-#define __wasm_basics_time_h 
-#define __wasm_basics_wchar_h 
 #define _tolower(a) ((a)|0x20)
 #define _toupper(a) ((a)&0x5f)
 #define acos(x) __tg_real_complex(acos, (x))