diff options
| -rw-r--r-- | include/elf.h | 38 | ||||
| -rw-r--r-- | ldso/ldso/bfin/dl-debug.h | 20 | ||||
| -rw-r--r-- | ldso/ldso/bfin/dl-startup.h | 2 | ||||
| -rw-r--r-- | ldso/ldso/bfin/elfinterp.c | 6 |
4 files changed, 33 insertions, 33 deletions
diff --git a/include/elf.h b/include/elf.h index 16a697271..0da4bf7a7 100644 --- a/include/elf.h +++ b/include/elf.h @@ -1266,26 +1266,26 @@ typedef struct #define R_386_NUM 38 /* Blackfin specific definitions. */ -#define R_BFIN_unused0 0x00 -#define R_BFIN_pcrel5m2 0x01 -#define R_BFIN_unused1 0x02 -#define R_BFIN_pcrel10 0x03 -#define R_BFIN_pcrel12_jump 0x04 -#define R_BFIN_rimm16 0x05 -#define R_BFIN_luimm16 0x06 -#define R_BFIN_huimm16 0x07 -#define R_BFIN_pcrel12_jump_s 0x08 -#define R_BFIN_pcrel24_jump_x 0x09 -#define R_BFIN_pcrel24 0x0a -#define R_BFIN_unusedb 0x0b -#define R_BFIN_unusedc 0x0c -#define R_BFIN_pcrel24_jump_l 0x0d -#define R_BFIN_pcrel24_call_x 0x0e +#define R_BFIN_UNUSED0 0x00 +#define R_BFIN_PCREL5M2 0x01 +#define R_BFIN_UNUSED1 0x02 +#define R_BFIN_PCREL10 0x03 +#define R_BFIN_PCREL12_JUMP 0x04 +#define R_BFIN_RIMM16 0x05 +#define R_BFIN_LUIMM16 0x06 +#define R_BFIN_HUIMM16 0x07 +#define R_BFIN_PCREL12_JUMP_S 0x08 +#define R_BFIN_PCREL24_JUMP_X 0x09 +#define R_BFIN_PCREL24 0x0a +#define R_BFIN_UNUSEDB 0x0b +#define R_BFIN_UNUSEDC 0x0c +#define R_BFIN_PCREL24_JUMP_L 0x0d +#define R_BFIN_PCREL24_CALL_X 0x0e #define R_BFIN_var_eq_symb 0x0f -#define R_BFIN_byte_data 0x10 -#define R_BFIN_byte2_data 0x11 -#define R_BFIN_byte4_data 0x12 -#define R_BFIN_pcrel11 0x13 +#define R_BFIN_BYTE_DATA 0x10 +#define R_BFIN_BYTE2_DATA 0x11 +#define R_BFIN_BYTE4_DATA 0x12 +#define R_BFIN_PCREL11 0x13 #define R_BFIN_GOT17M4 0x14 #define R_BFIN_GOTHI 0x15 diff --git a/ldso/ldso/bfin/dl-debug.h b/ldso/ldso/bfin/dl-debug.h index 9dd316240..3ba0a9832 100644 --- a/ldso/ldso/bfin/dl-debug.h +++ b/ldso/ldso/bfin/dl-debug.h @@ -31,16 +31,16 @@ static const char *_dl_reltypes_tab[] = { - [0] "R_BFIN_unused0", "R_BFIN_pcrel5m2", - [2] "R_BFIN_unused1", "R_BFIN_pcrel10", - [4] "R_BFIN_pcrel12_jump", "R_BFIN_rimm16", - [6] "R_BFIN_luimm16", "R_BFIN_huimm16", - [8] "R_BFIN_pcrel12_jump_s","R_BFIN_pcrel24_jump_x", - [10] "R_BFIN_pcrel24", "R_BFIN_unusedb", - [12] "R_BFIN_unusedc", "R_BFIN_pcrel24_jump_l", - [14] "R_BFIN_pcrel24_call_x","R_BFIN_var_eq_symb", - [16] "R_BFIN_byte_data", "R_BFIN_byte2_data", "R_BFIN_byte4_data", - [19] "R_BFIN_pcrel11", + [0] "R_BFIN_UNUSED0", "R_BFIN_PCREL5M2", + [2] "R_BFIN_UNUSED1", "R_BFIN_PCREL10", + [4] "R_BFIN_PCREL12_JUMP", "R_BFIN_RIMM16", + [6] "R_BFIN_LUIMM16", "R_BFIN_HUIMM16", + [8] "R_BFIN_PCREL12_JUMP_S","R_BFIN_PCREL24_JUMP_X", + [10] "R_BFIN_PCREL24", "R_BFIN_UNUSEDB", + [12] "R_BFIN_UNUSEDC", "R_BFIN_PCREL24_JUMP_L", + [14] "R_BFIN_PCREL24_CALL_X","R_BFIN_var_eq_symb", + [16] "R_BFIN_BYTE_DATA", "R_BFIN_BYTE2_DATA", "R_BFIN_BYTE4_DATA", + [19] "R_BFIN_PCREL11", [20] "R_BFIN_GOT17M4", "R_BFIN_GOTHI", "R_BFIN_GOTLO", [23] "R_BFIN_FUNCDESC", diff --git a/ldso/ldso/bfin/dl-startup.h b/ldso/ldso/bfin/dl-startup.h index f54c5647f..550b9bcba 100644 --- a/ldso/ldso/bfin/dl-startup.h +++ b/ldso/ldso/bfin/dl-startup.h @@ -111,7 +111,7 @@ struct elf32_fdpic_loadmap; */ #define PERFORM_BOOTSTRAP_RELOC(RELP,REL,SYMBOL,LOAD,SYMTAB) \ switch(ELF32_R_TYPE((RELP)->r_info)){ \ - case R_BFIN_byte4_data: \ + case R_BFIN_BYTE4_DATA: \ *(REL) += (SYMBOL); \ break; \ case R_BFIN_FUNCDESC_VALUE: \ diff --git a/ldso/ldso/bfin/elfinterp.c b/ldso/ldso/bfin/elfinterp.c index 345e470dc..c771507be 100644 --- a/ldso/ldso/bfin/elfinterp.c +++ b/ldso/ldso/bfin/elfinterp.c @@ -206,9 +206,9 @@ _dl_do_reloc (struct elf_resolve *tpnt,struct dyn_elf *scope, old_val = 0; #endif switch (reloc_type) { - case R_BFIN_unused0: + case R_BFIN_UNUSED0: break; - case R_BFIN_byte4_data: + case R_BFIN_BYTE4_DATA: if ((long)reloc_addr_packed & 3) reloc_value = reloc_addr_packed->v += symbol_addr; else @@ -293,7 +293,7 @@ _dl_do_lazy_reloc (struct elf_resolve *tpnt, old_val = (unsigned long)reloc_addr->entry_point; #endif switch (reloc_type) { - case R_BFIN_unused0: + case R_BFIN_UNUSED0: break; case R_BFIN_FUNCDESC_VALUE: funcval = *reloc_addr; |