diff options
| author | Rich Felker <dalias@aerifal.cx> | 2014-06-16 03:09:07 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2014-06-16 03:09:07 -0400 |
| commit | bfa09700b927c99cff5263483c1d7a4d1fe766e5 (patch) | |
| tree | 2cb41b425402212a2916e00d3108edd045552664 /arch/arm | |
| parent | 4e5c7a2176773c9a1564c6603240337b3ad6b496 (diff) | |
| download | musl-bfa09700b927c99cff5263483c1d7a4d1fe766e5.zip musl-bfa09700b927c99cff5263483c1d7a4d1fe766e5.tar.gz musl-bfa09700b927c99cff5263483c1d7a4d1fe766e5.tar.bz2 | |
dynamic linker: permit error returns from arch-specific reloc function
the immediate motivation is supporting TLSDESC relocations which
require allocation and thus may fail (unless we pre-allocate), but
this mechanism should also be used for throwing an error on
unsupported or invalid relocation types, and perhaps in certain cases,
for reporting when a relocation is not satisfiable.
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/reloc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/reloc.h b/arch/arm/reloc.h index 264b7ab..27c606d 100644 --- a/arch/arm/reloc.h +++ b/arch/arm/reloc.h @@ -19,7 +19,7 @@ #define IS_COPY(x) ((x)==R_ARM_COPY) #define IS_PLT(x) ((x)==R_ARM_JUMP_SLOT) -static inline void do_single_reloc( +static inline int do_single_reloc( struct dso *self, unsigned char *base_addr, size_t *reloc_addr, int type, size_t addend, Sym *sym, size_t sym_size, @@ -51,6 +51,7 @@ static inline void do_single_reloc( : self->tls_offset + 8; break; } + return 0; } #define NO_LEGACY_INITFINI |