commit e69ae844dcc978f68761e4bc44fc5543717b9684
author Rich Felker <dalias@aerifal.cx> Sat Jul 20 18:26:17 2013 -0400
committer Rich Felker <dalias@aerifal.cx> Sat Jul 20 18:26:17 2013 -0400
tree 2fcdc230795ede5df7e96568b75de04a8138508c
parent ce8a99578254242a89adbde1cbbf0f34daeec79b

add support for init_array/fini_array ctors/dtors to dynamic linker

src/ldso/dynlink.c

diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c
index 1d5e297..dbf404e 100644
--- a/src/ldso/dynlink.c
+++ b/src/ldso/dynlink.c
@@ -696,7 +696,13 @@
 	for (p=fini_head; p; p=p->fini_next) {
 		if (!p->constructed) continue;
 		decode_vec(p->dynv, dyn, DYN_CNT);
-		((void (*)(void))(p->base + dyn[DT_FINI]))();
+		if (dyn[0] & (1<<DT_FINI_ARRAY)) {
+			size_t n = dyn[DT_FINI_ARRAYSZ]/sizeof(size_t);
+			size_t *fn = (void *)(p->base + dyn[DT_FINI_ARRAY]);
+			while (n--) ((void (*)(void))*fn++)();
+		}
+		if (dyn[0] & (1<<DT_FINI))
+			((void (*)(void))(p->base + dyn[DT_FINI]))();
 	}
 }
 
@@ -712,12 +718,17 @@
 		if (p->constructed) continue;
 		p->constructed = 1;
 		decode_vec(p->dynv, dyn, DYN_CNT);
-		if (dyn[0] & (1<<DT_FINI)) {
+		if (dyn[0] & ((1<<DT_FINI) | (1<<DT_FINI_ARRAY))) {
 			p->fini_next = fini_head;
 			fini_head = p;
 		}
 		if (dyn[0] & (1<<DT_INIT))
 			((void (*)(void))(p->base + dyn[DT_INIT]))();
+		if (dyn[0] & (1<<DT_INIT_ARRAY)) {
+			size_t n = dyn[DT_INIT_ARRAYSZ]/sizeof(size_t);
+			size_t *fn = (void *)(p->base + dyn[DT_INIT_ARRAY]);
+			while (n--) ((void (*)(void))*fn++)();
+		}
 		if (!need_locking && libc.threads_minus_1) {
 			need_locking = 1;
 			pthread_mutex_lock(&init_fini_lock);