MFC ia64 psABI conformance changes:

	s/R_IA64_/R_IA_64_/
	s/DT_IA64_/DT_IA_64_/

	libexec/rtld-elf/ia64/reloc.c:1.17,1.18
	libexec/rtld-elf/ia64/rtld_start.S:1.4
	sys/boot/ia64/efi/start.S:1.9,1.10
	sys/ia64/ia64/elf_machdep.c:1.23
	sys/ia64/ia64/genassym.c:1.42
	sys/ia64/ia64/locore.S:1.39
	sys/ia64/include/elf.h:1.12,1.13,1.14
	usr.bin/elfdump/elfdump.c:1.14

4 files changed, 99 insertions, 93 deletions

diff --git a/sys/ia64/ia64/elf_machdep.c b/sys/ia64/ia64/elf_machdep.c
index ccd5083..35b8542 100644
--- a/sys/ia64/ia64/elf_machdep.c
+++ b/sys/ia64/ia64/elf_machdep.c
@@ -182,9 +182,9 @@ elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data,
 		rtype = ELF_R_TYPE(rel->r_info);
 		symidx = ELF_R_SYM(rel->r_info);
 		switch (rtype) {
-		case R_IA64_DIR64LSB:
-		case R_IA64_FPTR64LSB:
-		case R_IA64_REL64LSB:
+		case R_IA_64_DIR64LSB:
+		case R_IA_64_FPTR64LSB:
+		case R_IA_64_REL64LSB:
 			addend = *where;
 			break;
 		default:
@@ -204,21 +204,21 @@ elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data,
 	}
 
 	if (local) {
-		if (rtype == R_IA64_REL64LSB)
+		if (rtype == R_IA_64_REL64LSB)
 			*where = relocbase + addend;
 		return (0);
 	}
 
 	switch (rtype) {
-	case R_IA64_NONE:
+	case R_IA_64_NONE:
 		break;
-	case R_IA64_DIR64LSB:	/* word64 LSB	S + A */
+	case R_IA_64_DIR64LSB:	/* word64 LSB	S + A */
 		addr = lookup(lf, symidx, 1);
 		if (addr == 0)
 			return (-1);
 		*where = addr + addend;
 		break;
-	case R_IA64_FPTR64LSB:	/* word64 LSB	@fptr(S + A) */
+	case R_IA_64_FPTR64LSB:	/* word64 LSB	@fptr(S + A) */
 		if (addend != 0) {
 			printf("%s: addend ignored for OPD relocation\n",
 			    __func__);
@@ -228,9 +228,9 @@ elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data,
 			return (-1);
 		*where = addr;
 		break;
-	case R_IA64_REL64LSB:	/* word64 LSB	BD + A */
+	case R_IA_64_REL64LSB:	/* word64 LSB	BD + A */
 		break;
-	case R_IA64_IPLTLSB:
+	case R_IA_64_IPLTLSB:
 		addr = lookup_fdesc(lf, symidx, lookup);
 		if (addr == 0)
 			return (-1);
diff --git a/sys/ia64/ia64/genassym.c b/sys/ia64/ia64/genassym.c
index 536c8b3..8e988b6 100644
--- a/sys/ia64/ia64/genassym.c
+++ b/sys/ia64/ia64/genassym.c
@@ -100,10 +100,10 @@ ASSYM(PCB_CURRENT_PMAP,	offsetof(struct pcb, pcb_current_pmap));
 ASSYM(PCB_ONFAULT,	offsetof(struct pcb, pcb_onfault));
 ASSYM(PCB_SPECIAL_RP,	offsetof(struct pcb, pcb_special.rp));
 
-ASSYM(R_IA64_DIR64LSB,	R_IA64_DIR64LSB);
-ASSYM(R_IA64_FPTR64LSB,	R_IA64_FPTR64LSB);
-ASSYM(R_IA64_NONE,	R_IA64_NONE);
-ASSYM(R_IA64_REL64LSB,	R_IA64_REL64LSB);
+ASSYM(R_IA_64_DIR64LSB,	R_IA_64_DIR64LSB);
+ASSYM(R_IA_64_FPTR64LSB, R_IA_64_FPTR64LSB);
+ASSYM(R_IA_64_NONE,	R_IA_64_NONE);
+ASSYM(R_IA_64_REL64LSB,	R_IA_64_REL64LSB);
 
 ASSYM(SIZEOF_PCB,	sizeof(struct pcb));
 ASSYM(SIZEOF_SPECIAL,	sizeof(struct _special));
diff --git a/sys/ia64/ia64/locore.S b/sys/ia64/ia64/locore.S
index 2968494..12c48b0 100644
--- a/sys/ia64/ia64/locore.S
+++ b/sys/ia64/ia64/locore.S
@@ -342,10 +342,10 @@ STATIC_ENTRY(_reloc, 1)
 
 	extr.u	r23=r16,0,32		// ELF64_R_TYPE(r16)
 	;;
-	cmp.eq	p6,p0=R_IA64_NONE,r23
+	cmp.eq	p6,p0=R_IA_64_NONE,r23
 (p6)	br.cond.dpnt.few 3f
 	;;
-	cmp.eq	p6,p0=R_IA64_REL64LSB,r23
+	cmp.eq	p6,p0=R_IA_64_REL64LSB,r23
 (p6)	br.cond.dptk.few 4f
 	;;
 
@@ -364,10 +364,10 @@ STATIC_ENTRY(_reloc, 1)
 	add	r16=r16,in0		// relocate symbol value
 	;;
 
-	cmp.eq	p6,p0=R_IA64_DIR64LSB,r23
+	cmp.eq	p6,p0=R_IA_64_DIR64LSB,r23
 (p6)	br.cond.dptk.few 5f
 	;;
-	cmp.eq	p6,p0=R_IA64_FPTR64LSB,r23
+	cmp.eq	p6,p0=R_IA_64_FPTR64LSB,r23
 (p6)	br.cond.dptk.few 6f
 	;;
 
diff --git a/sys/ia64/include/elf.h b/sys/ia64/include/elf.h
index 6babea9..880675a 100644
--- a/sys/ia64/include/elf.h
+++ b/sys/ia64/include/elf.h
@@ -34,7 +34,7 @@
  */
 
 #ifndef __ELF_WORD_SIZE
-#define __ELF_WORD_SIZE 64
+#define	__ELF_WORD_SIZE	64
 #endif
 
 #include <sys/elf64.h>	/* Definitions common to all 64 bit architectures. */
@@ -146,80 +146,86 @@ __ElfType(Auxinfo);
  */
 
 /*	Name			Value	   Field	Calculation */
-#define	R_IA64_NONE		0	/* None */
-#define	R_IA64_IMM14		0x21	/* immediate14	S + A */
-#define	R_IA64_IMM22		0x22	/* immediate22	S + A */
-#define	R_IA64_IMM64		0x23	/* immediate64	S + A */
-#define	R_IA64_DIR32MSB		0x24	/* word32 MSB	S + A */
-#define	R_IA64_DIR32LSB		0x25	/* word32 LSB	S + A */
-#define	R_IA64_DIR64MSB		0x26	/* word64 MSB	S + A */
-#define	R_IA64_DIR64LSB		0x27	/* word64 LSB	S + A */
-#define	R_IA64_GPREL22		0x2a	/* immediate22	@gprel(S + A) */
-#define	R_IA64_GPREL64I		0x2b	/* immediate64	@gprel(S + A) */
-#define	R_IA64_GPREL64MSB	0x2e	/* word64 MSB	@gprel(S + A) */
-#define	R_IA64_GPREL64LSB	0x2f	/* word64 LSB	@gprel(S + A) */
-#define	R_IA64_LTOFF22		0x32	/* immediate22	@ltoff(S + A) */
-#define	R_IA64_LTOFF64I		0x33	/* immediate64	@ltoff(S + A) */
-#define	R_IA64_PLTOFF22		0x3a	/* immediate22	@pltoff(S + A) */
-#define	R_IA64_PLTOFF64I	0x3b	/* immediate64	@pltoff(S + A) */
-#define	R_IA64_PLTOFF64MSB	0x3e	/* word64 MSB	@pltoff(S + A) */
-#define	R_IA64_PLTOFF64LSB	0x3f	/* word64 LSB	@pltoff(S + A) */
-#define	R_IA64_FPTR64I		0x43	/* immediate64	@fptr(S + A) */
-#define	R_IA64_FPTR32MSB	0x44	/* word32 MSB	@fptr(S + A) */
-#define	R_IA64_FPTR32LSB	0x45	/* word32 LSB	@fptr(S + A) */
-#define	R_IA64_FPTR64MSB	0x46	/* word64 MSB	@fptr(S + A) */
-#define	R_IA64_FPTR64LSB	0x47	/* word64 LSB	@fptr(S + A) */
-#define	R_IA64_PCREL21B		0x49	/* immediate21 form1 S + A - P */
-#define	R_IA64_PCREL21M		0x4a	/* immediate21 form2 S + A - P */
-#define	R_IA64_PCREL21F		0x4b	/* immediate21 form3 S + A - P */
-#define	R_IA64_PCREL32MSB	0x4c	/* word32 MSB	S + A - P */
-#define	R_IA64_PCREL32LSB	0x4d	/* word32 LSB	S + A - P */
-#define	R_IA64_PCREL64MSB	0x4e	/* word64 MSB	S + A - P */
-#define	R_IA64_PCREL64LSB	0x4f	/* word64 LSB	S + A - P */
-#define	R_IA64_LTOFF_FPTR22	0x52	/* immediate22	@ltoff(@fptr(S + A)) */
-#define	R_IA64_LTOFF_FPTR64I	0x53	/* immediate64	@ltoff(@fptr(S + A)) */
-#define	R_IA64_LTOFF_FPTR32MSB	0x54	/* word32 MSB	@ltoff(@fptr(S + A)) */
-#define	R_IA64_LTOFF_FPTR32LSB	0x55	/* word32 LSB	@ltoff(@fptr(S + A)) */
-#define	R_IA64_LTOFF_FPTR64MSB	0x56	/* word64 MSB	@ltoff(@fptr(S + A)) */
-#define	R_IA64_LTOFF_FPTR64LSB	0x57	/* word64 LSB	@ltoff(@fptr(S + A)) */
-#define	R_IA64_SEGREL32MSB	0x5c	/* word32 MSB	@segrel(S + A) */
-#define	R_IA64_SEGREL32LSB	0x5d	/* word32 LSB	@segrel(S + A) */
-#define	R_IA64_SEGREL64MSB	0x5e	/* word64 MSB	@segrel(S + A) */
-#define	R_IA64_SEGREL64LSB	0x5f	/* word64 LSB	@segrel(S + A) */
-#define	R_IA64_SECREL32MSB	0x64	/* word32 MSB	@secrel(S + A) */
-#define	R_IA64_SECREL32LSB	0x65	/* word32 LSB	@secrel(S + A) */
-#define	R_IA64_SECREL64MSB	0x66	/* word64 MSB	@secrel(S + A) */
-#define	R_IA64_SECREL64LSB	0x67	/* word64 LSB	@secrel(S + A) */
-#define	R_IA64_REL32MSB		0x6c	/* word32 MSB	BD + A */
-#define	R_IA64_REL32LSB		0x6d	/* word32 LSB	BD + A */
-#define	R_IA64_REL64MSB		0x6e	/* word64 MSB	BD + A */
-#define	R_IA64_REL64LSB		0x6f	/* word64 LSB	BD + A */
-#define	R_IA64_LTV32MSB		0x74	/* word32 MSB	S + A */
-#define	R_IA64_LTV32LSB		0x75	/* word32 LSB	S + A */
-#define	R_IA64_LTV64MSB		0x76	/* word64 MSB	S + A */
-#define	R_IA64_LTV64LSB		0x77	/* word64 LSB	S + A */
-#define	R_IA64_IPLTMSB		0x80	/* function descriptor MSB special */
-#define	R_IA64_IPLTLSB		0x81	/* function descriptor LSB speciaal */
-#define	R_IA64_SUB		0x85	/* immediate64	A - S */
-#define	R_IA64_LTOFF22X		0x86	/* immediate22	special */
-#define	R_IA64_LDXMOV		0x87	/* immediate22	special */
-#define	R_IA64_TPREL14		0x91	/* imm14	@tprel(S + A) */
-#define	R_IA64_TPREL22		0x92	/* imm22	@tprel(S + A) */
-#define	R_IA64_TPREL64I		0x93	/* imm64	@tprel(S + A) */
-#define	R_IA64_TPREL64MSB	0x96	/* word64 MSB	@tprel(S + A) */
-#define	R_IA64_TPREL64LSB	0x97	/* word64 LSB	@tprel(S + A) */
-#define	R_IA64_LTOFF_TPREL22	0x9a	/* imm22	@ltoff(@tprel(S+A)) */
-#define	R_IA64_DTPMOD64MSB	0xa6	/* word64 MSB	@dtpmod(S + A) */
-#define	R_IA64_DTPMOD64LSB	0xa7	/* word64 LSB	@dtpmod(S + A) */
-#define	R_IA64_LTOFF_DTPMOD22	0xaa	/* imm22	@ltoff(@dtpmod(S+A)) */
-#define	R_IA64_DTPREL14		0xb1	/* imm14	@dtprel(S + A) */
-#define	R_IA64_DTPREL22		0xb2	/* imm22	@dtprel(S + A) */
-#define	R_IA64_DTPREL64I	0xb3	/* imm64	@dtprel(S + A) */
-#define	R_IA64_DTPREL32MSB	0xb4	/* word32 MSB	@dtprel(S + A) */
-#define	R_IA64_DTPREL32LSB	0xb5	/* word32 LSB	@dtprel(S + A) */
-#define	R_IA64_DTPREL64MSB	0xb6	/* word64 MSB	@dtprel(S + A) */
-#define	R_IA64_DTPREL64LSB	0xb7	/* word64 LSB	@dtprel(S + A) */
-#define	R_IA64_LTOFF_DTPREL22	0xba	/* imm22	@ltoff(@dtprel(S+A)) */
+#define	R_IA_64_NONE		0	/* None */
+#define	R_IA_64_IMM14		0x21	/* immediate14	S + A */
+#define	R_IA_64_IMM22		0x22	/* immediate22	S + A */
+#define	R_IA_64_IMM64		0x23	/* immediate64	S + A */
+#define	R_IA_64_DIR32MSB	0x24	/* word32 MSB	S + A */
+#define	R_IA_64_DIR32LSB	0x25	/* word32 LSB	S + A */
+#define	R_IA_64_DIR64MSB	0x26	/* word64 MSB	S + A */
+#define	R_IA_64_DIR64LSB	0x27	/* word64 LSB	S + A */
+#define	R_IA_64_GPREL22		0x2a	/* immediate22	@gprel(S + A) */
+#define	R_IA_64_GPREL64I	0x2b	/* immediate64	@gprel(S + A) */
+#define	R_IA_64_GPREL32MSB	0x2c	/* word32 MSB	@gprel(S + A) */
+#define	R_IA_64_GPREL32LSB	0x2d	/* word32 LSB	@gprel(S + A) */
+#define	R_IA_64_GPREL64MSB	0x2e	/* word64 MSB	@gprel(S + A) */
+#define	R_IA_64_GPREL64LSB	0x2f	/* word64 LSB	@gprel(S + A) */
+#define	R_IA_64_LTOFF22		0x32	/* immediate22	@ltoff(S + A) */
+#define	R_IA_64_LTOFF64I	0x33	/* immediate64	@ltoff(S + A) */
+#define	R_IA_64_PLTOFF22	0x3a	/* immediate22	@pltoff(S + A) */
+#define	R_IA_64_PLTOFF64I	0x3b	/* immediate64	@pltoff(S + A) */
+#define	R_IA_64_PLTOFF64MSB	0x3e	/* word64 MSB	@pltoff(S + A) */
+#define	R_IA_64_PLTOFF64LSB	0x3f	/* word64 LSB	@pltoff(S + A) */
+#define	R_IA_64_FPTR64I		0x43	/* immediate64	@fptr(S + A) */
+#define	R_IA_64_FPTR32MSB	0x44	/* word32 MSB	@fptr(S + A) */
+#define	R_IA_64_FPTR32LSB	0x45	/* word32 LSB	@fptr(S + A) */
+#define	R_IA_64_FPTR64MSB	0x46	/* word64 MSB	@fptr(S + A) */
+#define	R_IA_64_FPTR64LSB	0x47	/* word64 LSB	@fptr(S + A) */
+#define	R_IA_64_PCREL60B	0x48	/* immediate60 form1 S + A - P */
+#define	R_IA_64_PCREL21B	0x49	/* immediate21 form1 S + A - P */
+#define	R_IA_64_PCREL21M	0x4a	/* immediate21 form2 S + A - P */
+#define	R_IA_64_PCREL21F	0x4b	/* immediate21 form3 S + A - P */
+#define	R_IA_64_PCREL32MSB	0x4c	/* word32 MSB	S + A - P */
+#define	R_IA_64_PCREL32LSB	0x4d	/* word32 LSB	S + A - P */
+#define	R_IA_64_PCREL64MSB	0x4e	/* word64 MSB	S + A - P */
+#define	R_IA_64_PCREL64LSB	0x4f	/* word64 LSB	S + A - P */
+#define	R_IA_64_LTOFF_FPTR22	0x52	/* immediate22	@ltoff(@fptr(S + A)) */
+#define	R_IA_64_LTOFF_FPTR64I	0x53	/* immediate64	@ltoff(@fptr(S + A)) */
+#define	R_IA_64_LTOFF_FPTR32MSB	0x54	/* word32 MSB	@ltoff(@fptr(S + A)) */
+#define	R_IA_64_LTOFF_FPTR32LSB	0x55	/* word32 LSB	@ltoff(@fptr(S + A)) */
+#define	R_IA_64_LTOFF_FPTR64MSB	0x56	/* word64 MSB	@ltoff(@fptr(S + A)) */
+#define	R_IA_64_LTOFF_FPTR64LSB	0x57	/* word64 LSB	@ltoff(@fptr(S + A)) */
+#define	R_IA_64_SEGREL32MSB	0x5c	/* word32 MSB	@segrel(S + A) */
+#define	R_IA_64_SEGREL32LSB	0x5d	/* word32 LSB	@segrel(S + A) */
+#define	R_IA_64_SEGREL64MSB	0x5e	/* word64 MSB	@segrel(S + A) */
+#define	R_IA_64_SEGREL64LSB	0x5f	/* word64 LSB	@segrel(S + A) */
+#define	R_IA_64_SECREL32MSB	0x64	/* word32 MSB	@secrel(S + A) */
+#define	R_IA_64_SECREL32LSB	0x65	/* word32 LSB	@secrel(S + A) */
+#define	R_IA_64_SECREL64MSB	0x66	/* word64 MSB	@secrel(S + A) */
+#define	R_IA_64_SECREL64LSB	0x67	/* word64 LSB	@secrel(S + A) */
+#define	R_IA_64_REL32MSB	0x6c	/* word32 MSB	BD + A */
+#define	R_IA_64_REL32LSB	0x6d	/* word32 LSB	BD + A */
+#define	R_IA_64_REL64MSB	0x6e	/* word64 MSB	BD + A */
+#define	R_IA_64_REL64LSB	0x6f	/* word64 LSB	BD + A */
+#define	R_IA_64_LTV32MSB	0x74	/* word32 MSB	S + A */
+#define	R_IA_64_LTV32LSB	0x75	/* word32 LSB	S + A */
+#define	R_IA_64_LTV64MSB	0x76	/* word64 MSB	S + A */
+#define	R_IA_64_LTV64LSB	0x77	/* word64 LSB	S + A */
+#define	R_IA_64_PCREL21BI	0x79	/* immediate21 form1 S + A - P */
+#define	R_IA_64_PCREL22		0x7a	/* immediate22	S + A - P */
+#define	R_IA_64_PCREL64I	0x7b	/* immediate64	S + A - P */
+#define	R_IA_64_IPLTMSB		0x80	/* function descriptor MSB special */
+#define	R_IA_64_IPLTLSB		0x81	/* function descriptor LSB speciaal */
+#define	R_IA_64_SUB		0x85	/* immediate64	A - S */
+#define	R_IA_64_LTOFF22X	0x86	/* immediate22	special */
+#define	R_IA_64_LDXMOV		0x87	/* immediate22	special */
+#define	R_IA_64_TPREL14		0x91	/* imm14	@tprel(S + A) */
+#define	R_IA_64_TPREL22		0x92	/* imm22	@tprel(S + A) */
+#define	R_IA_64_TPREL64I	0x93	/* imm64	@tprel(S + A) */
+#define	R_IA_64_TPREL64MSB	0x96	/* word64 MSB	@tprel(S + A) */
+#define	R_IA_64_TPREL64LSB	0x97	/* word64 LSB	@tprel(S + A) */
+#define	R_IA_64_LTOFF_TPREL22	0x9a	/* imm22	@ltoff(@tprel(S+A)) */
+#define	R_IA_64_DTPMOD64MSB	0xa6	/* word64 MSB	@dtpmod(S + A) */
+#define	R_IA_64_DTPMOD64LSB	0xa7	/* word64 LSB	@dtpmod(S + A) */
+#define	R_IA_64_LTOFF_DTPMOD22	0xaa	/* imm22	@ltoff(@dtpmod(S+A)) */
+#define	R_IA_64_DTPREL14	0xb1	/* imm14	@dtprel(S + A) */
+#define	R_IA_64_DTPREL22	0xb2	/* imm22	@dtprel(S + A) */
+#define	R_IA_64_DTPREL64I	0xb3	/* imm64	@dtprel(S + A) */
+#define	R_IA_64_DTPREL32MSB	0xb4	/* word32 MSB	@dtprel(S + A) */
+#define	R_IA_64_DTPREL32LSB	0xb5	/* word32 LSB	@dtprel(S + A) */
+#define	R_IA_64_DTPREL64MSB	0xb6	/* word64 MSB	@dtprel(S + A) */
+#define	R_IA_64_DTPREL64LSB	0xb7	/* word64 LSB	@dtprel(S + A) */
+#define	R_IA_64_LTOFF_DTPREL22	0xba	/* imm22	@ltoff(@dtprel(S+A)) */
 
 /* Define "machine" characteristics */
 #if __ELF_WORD_SIZE == 32
@@ -233,6 +239,6 @@ __ElfType(Auxinfo);
 
 /* Processor specific dynmamic section tags. */
 
-#define DT_IA64_PLT_RESERVE     0x70000000
+#define	DT_IA_64_PLT_RESERVE	0x70000000
 
 #endif /* !_MACHINE_ELF_H_ */