summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--elf/elf.h8
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9e26f8412a..3da2eca97e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2016-06-28  Richard Henderson  <rth@redhat.com>
 
+	* elf/elf.h (EM_BPF): New.
+	(EM_NUM): Update.
+	(R_BPF_NONE, R_BPF_MAP_FD): New.
+
 	* elf/elf.h (EM_IAMCU, EM_SPU, EM_PDP10, EM_PDP11, EM_ARC_COMPACT,
 	EM_VIDEOCORE, EM_TMM_GPP, EM_NS32K, EM_TPC, EM_SNP1K, EM_ST200,
 	EM_IP2K, EM_MAX, EM_CR, EM_F2MC16, EM_MSP430, EM_BLACKFIN, EM_SE_C33,
diff --git a/elf/elf.h b/elf/elf.h
index 7fc09b9531..b6112d9d55 100644
--- a/elf/elf.h
+++ b/elf/elf.h
@@ -359,7 +359,9 @@ typedef struct
 				/* reserved 225-242 */
 #define EM_RISCV	243	/* RISC-V */
 
-#define EM_NUM		244
+#define EM_BPF		247	/* Linux BPF -- in-kernel virtual machine */
+
+#define EM_NUM		248
 
 /* Old spellings/synonyms.  */
 
@@ -3675,6 +3677,10 @@ enum
 
 #define R_TILEGX_NUM		130
 
+/* BPF specific declarations.  */
+
+#define R_BPF_NONE		0	/* No reloc */
+#define R_BPF_MAP_FD		1	/* Map fd to pointer */
 
 __END_DECLS