Fixed the compile issues after the upstream merge

Author: john-sharratt

expected/wasm32-wasi/posix/defined-symbols.txt

@@ -117,7 +117,6 @@ __hwcap
 __inet_aton
 __inhibit_ptc
 __init_ssp
-__init_tls
 __init_tp
 __intscan
 __invtrigl_R

expected/wasm32-wasi/posix/undefined-symbols.txt

@@ -152,3 +152,4 @@ __trunctfsf2
 __unordtf2
 __wasm_call_ctors
 __wasm_init_tls
+main

expected/wasm32-wasi/single/defined-symbols.txt

@@ -117,7 +117,6 @@ __hwcap
 __inet_aton
 __inhibit_ptc
 __init_ssp
-__init_tls
 __init_tp
 __intscan
 __invtrigl_R

expected/wasm64-wasi/posix/defined-symbols.txt

@@ -117,7 +117,6 @@ __hwcap
 __inet_aton
 __inhibit_ptc
 __init_ssp
-__init_tls
 __init_tp
 __intscan
 __invtrigl_R

expected/wasm64-wasi/single/defined-symbols.txt

@@ -116,7 +116,6 @@ __hwcap
 __inet_aton
 __inhibit_ptc
 __init_ssp
-__init_tls
 __init_tp
 __intscan
 __invtrigl_R

libc-top-half/musl/src/env/__init_tls.c

@@ -106,11 +106,7 @@ void *__copy_tls(unsigned char *mem)
 #endif
 }
 
-<<<<<<< HEAD
-
-=======
 #ifdef __wasilibc_unmodified_upstream
->>>>>>> a00bf32 (threads: implement init of TLS and stack pointer (#342))
 #if ULONG_MAX == 0xffffffff
 typedef Elf32_Phdr Phdr;
 #else
@@ -193,9 +189,6 @@ void __init_tls(size_t *aux)
 	if (__init_tp(__copy_tls(mem)) < 0)
 		a_crash();
 }
-<<<<<<< HEAD
-=======
 
 weak_alias(static_init_tls, __init_tls);
 #endif
->>>>>>> a00bf32 (threads: implement init of TLS and stack pointer (#342))

libc-top-half/musl/src/env/__reset_tls.c

@@ -4,6 +4,7 @@
 
 void __reset_tls()
 {
+#ifdef __wasilibc_unmodified_upstream
 	pthread_t self = __pthread_self();
 	struct tls_module *p;
 	size_t i, n = self->dtv[0];
@@ -12,4 +13,5 @@ void __reset_tls()
 		memcpy(mem, p->image, p->len);
 		memset(mem+p->len, 0, p->size - p->len);
 	}
+#endif
 }