| Index: fusl/src/internal/dynlink.h
|
| diff --git a/fusl/src/internal/dynlink.h b/fusl/src/internal/dynlink.h
|
| index 48890b2db50ec5bc6178b506964c6eb900f6bdb4..aa1ac26cf156f212f91451c65e492a1788cfc83b 100644
|
| --- a/fusl/src/internal/dynlink.h
|
| +++ b/fusl/src/internal/dynlink.h
|
| @@ -10,48 +10,48 @@ typedef Elf32_Ehdr Ehdr;
|
| typedef Elf32_Phdr Phdr;
|
| typedef Elf32_Sym Sym;
|
| #define R_TYPE(x) ((x)&255)
|
| -#define R_SYM(x) ((x)>>8)
|
| +#define R_SYM(x) ((x) >> 8)
|
| #else
|
| typedef Elf64_Ehdr Ehdr;
|
| typedef Elf64_Phdr Phdr;
|
| typedef Elf64_Sym Sym;
|
| #define R_TYPE(x) ((x)&0x7fffffff)
|
| -#define R_SYM(x) ((x)>>32)
|
| +#define R_SYM(x) ((x) >> 32)
|
| #endif
|
|
|
| /* These enum constants provide unmatchable default values for
|
| * any relocation type the arch does not use. */
|
| enum {
|
| - REL_NONE = 0,
|
| - REL_SYMBOLIC = -100,
|
| - REL_GOT,
|
| - REL_PLT,
|
| - REL_RELATIVE,
|
| - REL_OFFSET,
|
| - REL_OFFSET32,
|
| - REL_COPY,
|
| - REL_SYM_OR_REL,
|
| - REL_DTPMOD,
|
| - REL_DTPOFF,
|
| - REL_TPOFF,
|
| - REL_TPOFF_NEG,
|
| - REL_TLSDESC,
|
| - REL_FUNCDESC,
|
| - REL_FUNCDESC_VAL,
|
| + REL_NONE = 0,
|
| + REL_SYMBOLIC = -100,
|
| + REL_GOT,
|
| + REL_PLT,
|
| + REL_RELATIVE,
|
| + REL_OFFSET,
|
| + REL_OFFSET32,
|
| + REL_COPY,
|
| + REL_SYM_OR_REL,
|
| + REL_DTPMOD,
|
| + REL_DTPOFF,
|
| + REL_TPOFF,
|
| + REL_TPOFF_NEG,
|
| + REL_TLSDESC,
|
| + REL_FUNCDESC,
|
| + REL_FUNCDESC_VAL,
|
| };
|
|
|
| struct fdpic_loadseg {
|
| - uintptr_t addr, p_vaddr, p_memsz;
|
| + uintptr_t addr, p_vaddr, p_memsz;
|
| };
|
|
|
| struct fdpic_loadmap {
|
| - unsigned short version, nsegs;
|
| - struct fdpic_loadseg segs[];
|
| + unsigned short version, nsegs;
|
| + struct fdpic_loadseg segs[];
|
| };
|
|
|
| struct fdpic_dummy_loadmap {
|
| - unsigned short version, nsegs;
|
| - struct fdpic_loadseg segs[1];
|
| + unsigned short version, nsegs;
|
| + struct fdpic_loadseg segs[1];
|
| };
|
|
|
| #include "reloc.h"
|
| @@ -69,14 +69,12 @@ struct fdpic_dummy_loadmap {
|
| #endif
|
|
|
| #if !DL_FDPIC
|
| -#define IS_RELATIVE(x,s) ( \
|
| - (R_TYPE(x) == REL_RELATIVE) || \
|
| - (R_TYPE(x) == REL_SYM_OR_REL && !R_SYM(x)) )
|
| +#define IS_RELATIVE(x, s) \
|
| + ((R_TYPE(x) == REL_RELATIVE) || (R_TYPE(x) == REL_SYM_OR_REL && !R_SYM(x)))
|
| #else
|
| -#define IS_RELATIVE(x,s) ( ( \
|
| - (R_TYPE(x) == REL_FUNCDESC_VAL) || \
|
| - (R_TYPE(x) == REL_SYMBOLIC) ) \
|
| - && (((s)[R_SYM(x)].st_info & 0xf) == STT_SECTION) )
|
| +#define IS_RELATIVE(x, s) \
|
| + (((R_TYPE(x) == REL_FUNCDESC_VAL) || (R_TYPE(x) == REL_SYMBOLIC)) && \
|
| + (((s)[R_SYM(x)].st_info & 0xf) == STT_SECTION))
|
| #endif
|
|
|
| #ifndef NEED_MIPS_GOT_RELOCS
|
| @@ -90,7 +88,7 @@ struct fdpic_dummy_loadmap {
|
| #define AUX_CNT 32
|
| #define DYN_CNT 32
|
|
|
| -typedef void (*stage2_func)(unsigned char *, size_t *);
|
| -typedef _Noreturn void (*stage3_func)(size_t *);
|
| +typedef void (*stage2_func)(unsigned char*, size_t*);
|
| +typedef _Noreturn void (*stage3_func)(size_t*);
|
|
|
| #endif
|
|
|