Signed-off-by: Mao Han <han_...@c-sky.com>
---
 libelf/ChangeLog |  4 +++
 libelf/elf.h     | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 98 insertions(+), 2 deletions(-)

diff --git a/libelf/ChangeLog b/libelf/ChangeLog
index d9b7749..d3bdac3 100644
--- a/libelf/ChangeLog
+++ b/libelf/ChangeLog
@@ -1,3 +1,7 @@
+2019-04-01  Mao Han  <han_...@c-sky.com>
+
+       * elf.h: Update from glibc.
+
 2019-03-07  Mark Wielaard  <m...@klomp.org>
 
        * elf32_updatefile.c (updatemmap): Use posix_memalign instead of
diff --git a/libelf/elf.h b/libelf/elf.h
index 75043bc..01648bd 100644
--- a/libelf/elf.h
+++ b/libelf/elf.h
@@ -1,5 +1,5 @@
 /* This file defines standard ELF types, structures, and macros.
-   Copyright (C) 1995-2018 Free Software Foundation, Inc.
+   Copyright (C) 1995-2019 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -360,8 +360,9 @@ typedef struct
 #define EM_RISCV       243     /* RISC-V */
 
 #define EM_BPF         247     /* Linux BPF -- in-kernel virtual machine */
+#define EM_CSKY                252     /* C-SKY */
 
-#define EM_NUM         248
+#define EM_NUM         253
 
 /* Old spellings/synonyms.  */
 
@@ -808,6 +809,9 @@ typedef struct
 #define NT_ARM_SYSTEM_CALL     0x404   /* ARM system call number */
 #define NT_ARM_SVE     0x405           /* ARM Scalable Vector Extension
                                           registers */
+#define NT_VMCOREDD    0x700           /* Vmcore Device Dump Note.  */
+#define NT_MIPS_DSP    0x800           /* MIPS DSP ASE registers.  */
+#define NT_MIPS_FP_MODE        0x801           /* MIPS floating-point mode.  */
 
 /* Legal values for the note segment descriptor types for object files.  */
 
@@ -1214,6 +1218,9 @@ typedef struct
 #define AT_L3_CACHESIZE                46
 #define AT_L3_CACHEGEOMETRY    47
 
+#define AT_MINSIGSTKSZ         51 /* Stack needed for signal delivery
+                                     (AArch64).  */
+
 /* Note section contents.  Each entry in the note section begins with
    a header of a fixed form.  */
 
@@ -3015,6 +3022,81 @@ enum
 /* Keep this the last entry.  */
 #define R_ARM_NUM              256
 
+/* C-SKY */
+#define R_CKCORE_NONE               0  /* no reloc */
+#define R_CKCORE_ADDR32             1  /* direct 32 bit (S + A) */
+#define R_CKCORE_PCRELIMM8BY4       2  /* disp ((S + A - P) >> 2) & 0xff   */
+#define R_CKCORE_PCRELIMM11BY2      3  /* disp ((S + A - P) >> 1) & 0x7ff  */
+#define R_CKCORE_PCREL32            5  /* 32-bit rel (S + A - P)           */
+#define R_CKCORE_PCRELJSR_IMM11BY2  6  /* disp ((S + A - P) >>1) & 0x7ff   */
+#define R_CKCORE_RELATIVE           9  /* 32 bit adjust program base(B + A)*/
+#define R_CKCORE_COPY               10 /* 32 bit adjust by program base    */
+#define R_CKCORE_GLOB_DAT           11 /* off between got and sym (S)      */
+#define R_CKCORE_JUMP_SLOT          12 /* PLT entry (S) */
+#define R_CKCORE_GOTOFF             13 /* offset to GOT (S + A - GOT)      */
+#define R_CKCORE_GOTPC              14 /* PC offset to GOT (GOT + A - P)   */
+#define R_CKCORE_GOT32              15 /* 32 bit GOT entry (G) */
+#define R_CKCORE_PLT32              16 /* 32 bit PLT entry (G) */
+#define R_CKCORE_ADDRGOT            17 /* GOT entry in GLOB_DAT (GOT + G)  */
+#define R_CKCORE_ADDRPLT            18 /* PLT entry in GLOB_DAT (GOT + G)  */
+#define R_CKCORE_PCREL_IMM26BY2     19 /* ((S + A - P) >> 1) & 0x3ffffff   */
+#define R_CKCORE_PCREL_IMM16BY2     20 /* disp ((S + A - P) >> 1) & 0xffff */
+#define R_CKCORE_PCREL_IMM16BY4     21 /* disp ((S + A - P) >> 2) & 0xffff */
+#define R_CKCORE_PCREL_IMM10BY2     22 /* disp ((S + A - P) >> 1) & 0x3ff  */
+#define R_CKCORE_PCREL_IMM10BY4     23 /* disp ((S + A - P) >> 2) & 0x3ff  */
+#define R_CKCORE_ADDR_HI16          24 /* high & low 16 bit ADDR */
+                                        /* ((S + A) >> 16) & 0xffff */
+#define R_CKCORE_ADDR_LO16          25 /* (S + A) & 0xffff */
+#define R_CKCORE_GOTPC_HI16         26 /* high & low 16 bit GOTPC */
+                                        /* ((GOT + A - P) >> 16) & 0xffff */
+#define R_CKCORE_GOTPC_LO16         27 /* (GOT + A - P) & 0xffff */
+#define R_CKCORE_GOTOFF_HI16        28 /* high & low 16 bit GOTOFF */
+                                        /* ((S + A - GOT) >> 16) & 0xffff */
+#define R_CKCORE_GOTOFF_LO16        29 /* (S + A - GOT) & 0xffff */
+#define R_CKCORE_GOT12              30 /* 12 bit disp GOT entry (G) */
+#define R_CKCORE_GOT_HI16           31 /* high & low 16 bit GOT */
+                                        /* (G >> 16) & 0xffff */
+#define R_CKCORE_GOT_LO16           32 /* (G & 0xffff) */
+#define R_CKCORE_PLT12              33 /* 12 bit disp PLT entry (G) */
+#define R_CKCORE_PLT_HI16           34 /* high & low 16 bit PLT */
+                                        /* (G >> 16) & 0xffff */
+#define R_CKCORE_PLT_LO16           35 /* G & 0xffff */
+#define R_CKCORE_ADDRGOT_HI16       36 /* high & low 16 bit ADDRGOT */
+                                        /* (GOT + G * 4) & 0xffff */
+#define R_CKCORE_ADDRGOT_LO16       37 /* (GOT + G * 4) & 0xffff */
+#define R_CKCORE_ADDRPLT_HI16       38 /* high & low 16 bit ADDRPLT */
+                                        /* ((GOT + G * 4) >> 16) & 0xFFFF */
+#define R_CKCORE_ADDRPLT_LO16       39 /* (GOT+G*4) & 0xffff */
+#define R_CKCORE_PCREL_JSR_IMM26BY2 40 /* disp ((S+A-P) >>1) & x3ffffff */
+#define R_CKCORE_TOFFSET_LO16       41 /* (S+A-BTEXT) & 0xffff */
+#define R_CKCORE_DOFFSET_LO16       42 /* (S+A-BTEXT) & 0xffff */
+#define R_CKCORE_PCREL_IMM18BY2     43 /* disp ((S+A-P) >>1) & 0x3ffff */
+#define R_CKCORE_DOFFSET_IMM18      44 /* disp (S+A-BDATA) & 0x3ffff */
+#define R_CKCORE_DOFFSET_IMM18BY2   45 /* disp ((S+A-BDATA)>>1) & 0x3ffff */
+#define R_CKCORE_DOFFSET_IMM18BY4   46 /* disp ((S+A-BDATA)>>2) & 0x3ffff */
+#define R_CKCORE_GOT_IMM18BY4       48 /* disp (G >> 2) */
+#define R_CKCORE_PLT_IMM18BY4       49 /* disp (G >> 2) */
+#define R_CKCORE_PCREL_IMM7BY4      50 /* disp ((S+A-P) >>2) & 0x7f */
+#define R_CKCORE_TLS_LE32           51 /* 32 bit offset to TLS block */
+#define R_CKCORE_TLS_IE32           52
+#define R_CKCORE_TLS_GD32           53
+#define R_CKCORE_TLS_LDM32          54
+#define R_CKCORE_TLS_LDO32          55
+#define R_CKCORE_TLS_DTPMOD32       56
+#define R_CKCORE_TLS_DTPOFF32       57
+#define R_CKCORE_TLS_TPOFF32        58
+
+/* C-SKY elf header definition.  */
+#define EF_CSKY_ABIMASK                    0XF0000000
+#define EF_CSKY_OTHER              0X0FFF0000
+#define EF_CSKY_PROCESSOR          0X0000FFFF
+
+#define EF_CSKY_ABIV1              0X10000000
+#define EF_CSKY_ABIV2              0X20000000
+
+/* C-SKY attributes section.  */
+#define SHT_CSKY_ATTRIBUTES        (SHT_LOPROC + 1)
+
 /* IA-64 specific declarations.  */
 
 /* Processor specific flags for the Ehdr e_flags field.  */
@@ -3915,6 +3997,16 @@ enum
 #define R_METAG_TLS_LE_HI16    60
 #define R_METAG_TLS_LE_LO16    61
 
+/* NDS32 relocations.  */
+#define R_NDS32_NONE           0
+#define R_NDS32_32_RELA        20
+#define R_NDS32_COPY           39
+#define R_NDS32_GLOB_DAT       40
+#define R_NDS32_JMP_SLOT       41
+#define R_NDS32_RELATIVE       42
+#define R_NDS32_TLS_TPOFF      102
+#define R_NDS32_TLS_DESC       119
+
 __END_DECLS
 
 #endif /* elf.h */
-- 
2.7.4

Reply via email to