[LV-commit] CVS: kernel-2.5/include/linux elf.h,1.8,1.9

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/include/linux
In directory sc8-pr-cvs1:/tmp/cvs-serv2131/include/linux

Modified Files:
	elf.h 
Log Message:
Merge with 2.5.53


Index: elf.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/linux/elf.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- elf.h	7 Jul 2003 23:47:32 -0000	1.8
+++ elf.h	16 Jul 2003 22:27:39 -0000	1.9
@@ -92,6 +92,9 @@
  */
 #define EM_ALPHA	0x9026
 
+/* Bogus old v850 magic number, used by old tools.  */
+#define EM_CYGNUS_V850	0x9080
+
 /*
  * This is the old interim value for S/390 architecture
  */
@@ -449,6 +452,27 @@
 #define R_390_GOTENT	26	       /* 32 bit PC rel. to GOT entry >> 1. */
 /* Keep this the last entry.  */
 #define R_390_NUM	27
+
+/* x86-64 relocation types */
+#define R_X86_64_NONE		0	/* No reloc */
+#define R_X86_64_64		1	/* Direct 64 bit  */
+#define R_X86_64_PC32		2	/* PC relative 32 bit signed */
+#define R_X86_64_GOT32		3	/* 32 bit GOT entry */
+#define R_X86_64_PLT32		4	/* 32 bit PLT address */
+#define R_X86_64_COPY		5	/* Copy symbol at runtime */
+#define R_X86_64_GLOB_DAT	6	/* Create GOT entry */
+#define R_X86_64_JUMP_SLOT	7	/* Create PLT entry */
+#define R_X86_64_RELATIVE	8	/* Adjust by program base */
+#define R_X86_64_GOTPCREL	9	/* 32 bit signed pc relative
+					   offset to GOT */
+#define R_X86_64_32		10	/* Direct 32 bit zero extended */
+#define R_X86_64_32S		11	/* Direct 32 bit sign extended */
+#define R_X86_64_16		12	/* Direct 16 bit zero extended */
+#define R_X86_64_PC16		13	/* 16 bit sign extended pc relative */
+#define R_X86_64_8		14	/* Direct 8 bit sign extended  */
+#define R_X86_64_PC8		15	/* 8 bit sign extended pc relative */
+
+#define R_X86_64_NUM		16
 
 /* s390 relocations defined by the ABIs */
 #define R_390_NONE	0	       /* No reloc.  */