re-enable vdso clock_gettime on arm (32-bit) with workaround

[musl] / ldso / dynlink.c

diff --git a/ldso/dynlink.c b/ldso/dynlink.c
index cc67795..03f5fd5 100644 (file)
--- a/ldso/dynlink.c
+++ b/ldso/dynlink.c
@@ -210,7 +210,8 @@ static void decode_vec(size_t *v, size_t *a, size_t cnt)
        size_t i;
        for (i=0; i<cnt; i++) a[i] = 0;
        for (; v[0]; v+=2) if (v[0]-1<cnt-1) {
-               a[0] |= 1UL<<v[0];
+               if (v[0] < 8*sizeof(long))
+                       a[0] |= 1UL<<v[0];
                a[v[0]] = v[1];
        }
 }
@@ -515,6 +516,23 @@ static void do_relocs(struct dso *dso, size_t *rel, size_t rel_size, size_t stri
        }
 }
 
+static void do_relr_relocs(struct dso *dso, size_t *relr, size_t relr_size)
+{
+       unsigned char *base = dso->base;
+       size_t *reloc_addr;
+       for (; relr_size; relr++, relr_size-=sizeof(size_t))
+               if ((relr[0]&1) == 0) {
+                       reloc_addr = laddr(dso, relr[0]);
+                       *reloc_addr++ += (size_t)base;
+               } else {
+                       int i = 0;
+                       for (size_t bitmap=relr[0]; (bitmap>>=1); i++)
+                               if (bitmap&1)
+                                       reloc_addr[i] += (size_t)base;
+                       reloc_addr += 8*sizeof(size_t)-1;
+               }
+}
+
 static void redo_lazy_relocs()
 {
        struct dso *p = lazy_head, *next;
@@ -868,7 +886,7 @@ static int fixup_rpath(struct dso *p, char *buf, size_t buf_size)
                case ENOENT:
                case ENOTDIR:
                case EACCES:
-                       break;
+                       return 0;
                default:
                        return -1;
                }
@@ -1357,6 +1375,8 @@ static void reloc_all(struct dso *p)
                        2+(dyn[DT_PLTREL]==DT_RELA));
                do_relocs(p, laddr(p, dyn[DT_REL]), dyn[DT_RELSZ], 2);
                do_relocs(p, laddr(p, dyn[DT_RELA]), dyn[DT_RELASZ], 3);
+               if (!DL_FDPIC)
+                       do_relr_relocs(p, laddr(p, dyn[DT_RELR]), dyn[DT_RELRSZ]);
 
                if (head != &ldso && p->relro_start != p->relro_end) {
                        long ret = __syscall(SYS_mprotect, laddr(p, p->relro_start),