PERFORCE change 58768 for review

[Doug Rabson]

http://perforce.freebsd.org/chv.cgi?CH=58768

Change 58768 by dfr at dfr_home on 2004/08/03 08:20:10

	Relocation definitions have moved to <machine/elf.h>.

Affected files ...

.. //depot/projects/kse/libexec/rtld-elf/amd64/reloc.c#5 edit
.. //depot/projects/kse/libexec/rtld-elf/i386/reloc.c#11 edit
.. //depot/projects/kse/libexec/rtld-elf/ia64/reloc.c#7 edit

Differences ...

==== //depot/projects/kse/libexec/rtld-elf/amd64/reloc.c#5 (text+ko) ====

@@ -48,15 +48,6 @@
 #include "debug.h"
 #include "rtld.h"
 
-#define R_X86_64_DTPMOD64	16 /* ID of module containing symbol */
-#define R_X86_64_DTPOFF64	17 /* Offset in TLS block */
-#define R_X86_64_TPOFF64	18 /* Offset in static TLS block */
-#define R_X86_64_TLSGD		19 /* PC relative offset to GD GOT entry */
-#define R_X86_64_TLSLD		20 /* PC relative offset to LD GOT entry */
-#define R_X86_64_DTPOFF32	21 /* Offset in TLS block */
-#define R_X86_64_GOTTPOFF	22 /* PC relative offset to IE GOT entry */
-#define R_X86_64_TPOFF32	23 /* Offset in static TLS block */
-
 /*
  * Process the special R_X86_64_COPY relocations in the main program.  These
  * copy data from a shared object into a region in the main program's BSS

==== //depot/projects/kse/libexec/rtld-elf/i386/reloc.c#11 (text+ko) ====

@@ -49,31 +49,6 @@
 #include "debug.h"
 #include "rtld.h"
 
-#ifndef R_386_TLS_TPOFF
-
-#define	R_386_TLS_TPOFF		14 /* Negative offset in static TLS block */
-#define	R_386_TLS_IE		15 /* Absolute address of GOT for -ve static TLS */
-#define	R_386_TLS_GOTIE		16 /* GOT entry for negative static TLS block */
-#define	R_386_TLS_LE		17 /* Negative offset relative to static TLS */
-#define	R_386_TLS_GD		18 /* 32 bit offset to GOT (index,off) pair */
-#define	R_386_TLS_LDM		19 /* 32 bit offset to GOT (index,zero) pair */
-#define	R_386_TLS_GD_32		24 /* 32 bit offset to GOT (index,off) pair */
-#define	R_386_TLS_GD_PUSH	25 /* pushl instruction for Sun ABI GD sequence */
-#define	R_386_TLS_GD_CALL	26 /* call instruction for Sun ABI GD sequence */
-#define	R_386_TLS_GD_POP	27 /* popl instruction for Sun ABI GD sequence */
-#define	R_386_TLS_LDM_32	28 /* 32 bit offset to GOT (index,zero) pair */
-#define	R_386_TLS_LDM_PUSH	29 /* pushl instruction for Sun ABI LD sequence */
-#define	R_386_TLS_LDM_CALL	30 /* call instruction for Sun ABI LD sequence */
-#define	R_386_TLS_LDM_POP	31 /* popl instruction for Sun ABI LD sequence */
-#define	R_386_TLS_LDO_32	32 /* 32 bit offset from start of TLS block */
-#define	R_386_TLS_IE_32		33 /* 32 bit offset to GOT static TLS offset entry */
-#define	R_386_TLS_LE_32		34 /* 32 bit offset within static TLS block */
-#define	R_386_TLS_DTPMOD32	35 /* GOT entry containing TLS index */
-#define	R_386_TLS_DTPOFF32	36 /* GOT entry containing TLS offset */
-#define	R_386_TLS_TPOFF32	37 /* GOT entry of -ve static TLS offset */
-
-#endif
-
 /*
  * Process the special R_386_COPY relocations in the main program.  These
  * copy data from a shared object into a region in the main program's BSS

==== //depot/projects/kse/libexec/rtld-elf/ia64/reloc.c#7 (text+ko) ====

@@ -48,28 +48,6 @@
 #include "debug.h"
 #include "rtld.h"
 
-#ifndef R_IA64_TPREL14
-
-#define R_IA64_TPREL14			0x91
-#define R_IA64_TPREL22			0x92
-#define R_IA64_TPREL64I			0x93
-#define R_IA64_TPREL64MSB		0x96
-#define R_IA64_TPREL64LSB		0x97
-#define R_IA64_LTOFF_TPREL22		0x9a
-#define R_IA64_DTPMOD64MSB		0xa6
-#define R_IA64_DTPMOD64LSB		0xa7
-#define R_IA64_LTOFF_DTPMOD22		0xaa
-#define R_IA64_DTPREL14			0xb1
-#define R_IA64_DTPREL22			0xb2
-#define R_IA64_DTPREL64I		0xb3
-#define R_IA64_DTPREL32MSB		0xb4
-#define R_IA64_DTPREL32LSB		0xb5
-#define R_IA64_DTPREL64MSB		0xb6
-#define R_IA64_DTPREL64LSB		0xb7
-#define R_IA64_LTOFF_DTPREL22		0xba
-
-#endif
-
 extern Elf_Dyn _DYNAMIC;
 
 /*