!473 规避dlclose中删除tls的问题

Merge pull request !473 from dhy308/gl-fix_dlclose_tls

porting/linux/user/ldso/dynlink.c

@@ -3124,6 +3124,11 @@ static int do_dlclose(struct dso *p)
 		d->fini_next = p->fini_next;
 	}
 
+	/* empty tls image */
+	if (p->tls.size != 0) {
+		p->tls.image = NULL;
+	}
+
 	/* remove dso from global dso list */
 	if (p == tail) {
 		tail = p->prev;
@@ -3146,10 +3151,14 @@ static int do_dlclose(struct dso *p)
 	if (p->deps != no_deps)
 		internal_free(p->deps);
 	unmap_library(p);
+
 	if (p->parents) {
 		internal_free(p->parents);
 	}
-	internal_free(p);
+
+	if (p->tls.size == 0) {
+		internal_free(p);
+	}
 
 	return 0;
 }

porting/linux/user/src/env/__init_tls.c

@@ -52,7 +52,9 @@ void *__copy_tls(unsigned char *mem)
 
 	for (i=1, p=libc.tls_head; p; i++, p=p->next) {
 		dtv[i] = (uintptr_t)(mem + p->offset) + DTP_OFFSET;
-		memcpy(mem + p->offset, p->image, p->len);
+		if (p->image) {
+			memcpy(mem + p->offset, p->image, p->len);
+		}
 	}
 #else
 	dtv = (uintptr_t *)mem;
@@ -63,7 +65,9 @@ void *__copy_tls(unsigned char *mem)
 
 	for (i=1, p=libc.tls_head; p; i++, p=p->next) {
 		dtv[i] = (uintptr_t)(mem - p->offset) + DTP_OFFSET;
-		memcpy(mem - p->offset, p->image, p->len);
+		if (p->image) {
+			memcpy(mem - p->offset, p->image, p->len);
+		}
 	}
 #endif
 	dtv[0] = libc.tls_cnt;