Merge in the necessary bits from 1.1.5.1 to make exec.h and reloc.h

happy campers again (e.g. match our own exec format).  This should
make ld happy.
Submitted by:	jkh

1 files changed, 10 insertions, 7 deletions

diff --git a/sys/amd64/include/reloc.h b/sys/amd64/include/reloc.h
index 28b10c1..fc3b5cb 100644
--- a/sys/amd64/include/reloc.h
+++ b/sys/amd64/include/reloc.h
@@ -31,15 +31,18 @@
  * SUCH DAMAGE.
  *
  *	@(#)reloc.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: reloc.h,v 1.2 1994/08/02 07:38:59 davidg Exp $
  */
 
 /* Relocation format. */
 struct relocation_info {
-	int r_address;			/* offset in text or data segment */
-	unsigned int r_symbolnum : 24,	/* ordinal number of add symbol */
-			 r_pcrel :  1,	/* 1 if value should be pc-relative */
-			r_length :  2,	/* log base 2 of value's width */
-			r_extern :  1,	/* 1 if need to add symbol to value */
-				 :  4;	/* reserved */
+	int r_address;			  /* offset in text or data segment */
+	unsigned int   r_symbolnum : 24,  /* ordinal number of add symbol */
+			   r_pcrel :  1,  /* 1 if value should be pc-relative */
+			  r_length :  2,  /* log base 2 of value's width */
+			  r_extern :  1,  /* 1 if need to add symbol to value */
+			 r_baserel :  1,  /* linkage table relative */
+			r_jmptable :  1,  /* relocate to jump table */
+			r_relative :  1,  /* load address relative */
+			    r_copy :  1;  /* run time copy */
 };