diff options
| author | Rich Felker <dalias@aerifal.cx> | 2013-07-22 14:08:33 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2013-07-22 14:08:33 -0400 |
| commit | 1da53dad278f98b7712ac002162afaa8815ba580 (patch) | |
| tree | 31629639333932714d99aa6d566d8dc2d73d540f | |
| parent | 4e3c6b430382b152e783454a31f9a884223ce77f (diff) | |
| download | musl-1da53dad278f98b7712ac002162afaa8815ba580.tar.gz musl-1da53dad278f98b7712ac002162afaa8815ba580.tar.xz musl-1da53dad278f98b7712ac002162afaa8815ba580.zip | |
disable legacy init/fini processing on ARM
since the old, poorly-thought-out musl approach to init/fini arrays on ARM (when it was the only arch that needed them) was to put the code in crti/crtn and have the legacy _init/_fini code run the arrays, adding proper init/fini array support caused the arrays to get processed twice on ARM. I'm not sure skipping legacy init/fini processing is the best solution to the problem, but it works, and it shouldn't break anything since the legacy init/fini system was never used for ARM EABI.
| -rw-r--r-- | arch/arm/reloc.h | 2 | ||||
| -rw-r--r-- | src/ldso/dynlink.c | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/reloc.h b/arch/arm/reloc.h index 9ca0b48c..264b7ab2 100644 --- a/arch/arm/reloc.h +++ b/arch/arm/reloc.h @@ -52,3 +52,5 @@ static inline void do_single_reloc( break; } } + +#define NO_LEGACY_INITFINI diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c index 3a0bf95d..b5e4b72f 100644 --- a/src/ldso/dynlink.c +++ b/src/ldso/dynlink.c @@ -702,8 +702,10 @@ static void do_fini() size_t *fn = (size_t *)(p->base + dyn[DT_FINI_ARRAY])+n; while (n--) ((void (*)(void))*--fn)(); } +#ifndef NO_LEGACY_INITFINI if (dyn[0] & (1<<DT_FINI)) ((void (*)(void))(p->base + dyn[DT_FINI]))(); +#endif } } @@ -723,8 +725,10 @@ static void do_init_fini(struct dso *p) p->fini_next = fini_head; fini_head = p; } +#ifndef NO_LEGACY_INITFINI if (dyn[0] & (1<<DT_INIT)) ((void (*)(void))(p->base + dyn[DT_INIT]))(); +#endif 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]); |