From e04520cef395107c9609825e7e44af4037322dae Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Wed, 28 Sep 1994 03:37:49 +0000
Subject: [PATCH] Ensure normal selection and alignment of the text and data
 sections before including files.  vector.s sometimes left the data section
 misaligned (depending on the configuration) so all the time-critical globals
 in icu.s were sometimes misaligned.

---
 sys/amd64/amd64/exception.S | 18 ++++++++++++++++--
 sys/amd64/amd64/exception.s | 18 ++++++++++++++++--
 sys/i386/i386/exception.s   | 18 ++++++++++++++++--
 3 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/sys/amd64/amd64/exception.S b/sys/amd64/amd64/exception.S
index 7ba980660ffe..d746f12d5fad 100644
--- a/sys/amd64/amd64/exception.S
+++ b/sys/amd64/amd64/exception.S
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: exception.s,v 1.3 1994/04/02 07:00:23 davidg Exp $
+ *	$Id: exception.s,v 1.4 1994/08/13 03:49:38 wollman Exp $
  */
 
 #include "npx.h"				/* NNPX */
@@ -269,7 +269,21 @@ IDTVEC(syscall)
 	jmp	_doreti
 
 /*
- * include generated interrupt vectors and ISA intr code
+ * Include what was once config+isa-dependent code.
+ * XXX it should be in a stand-alone file.  It's still icu-dependent and
+ * belongs in i386/isa.
  */
 #include "i386/isa/vector.s"
+
+/*
+ * Include what was once icu-dependent code.
+ * XXX it should be merged into this file (also move the definition of
+ * imen to vector.s or isa.c).
+ * Before including it, set up a normal asm environment so that vector.s
+ * doesn't have to know that stuff is included after it.
+ */
+	.data
+	ALIGN_DATA
+	.text
+	SUPERALIGN_TEXT
 #include "i386/isa/icu.s"
diff --git a/sys/amd64/amd64/exception.s b/sys/amd64/amd64/exception.s
index 7ba980660ffe..d746f12d5fad 100644
--- a/sys/amd64/amd64/exception.s
+++ b/sys/amd64/amd64/exception.s
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: exception.s,v 1.3 1994/04/02 07:00:23 davidg Exp $
+ *	$Id: exception.s,v 1.4 1994/08/13 03:49:38 wollman Exp $
  */
 
 #include "npx.h"				/* NNPX */
@@ -269,7 +269,21 @@ IDTVEC(syscall)
 	jmp	_doreti
 
 /*
- * include generated interrupt vectors and ISA intr code
+ * Include what was once config+isa-dependent code.
+ * XXX it should be in a stand-alone file.  It's still icu-dependent and
+ * belongs in i386/isa.
  */
 #include "i386/isa/vector.s"
+
+/*
+ * Include what was once icu-dependent code.
+ * XXX it should be merged into this file (also move the definition of
+ * imen to vector.s or isa.c).
+ * Before including it, set up a normal asm environment so that vector.s
+ * doesn't have to know that stuff is included after it.
+ */
+	.data
+	ALIGN_DATA
+	.text
+	SUPERALIGN_TEXT
 #include "i386/isa/icu.s"
diff --git a/sys/i386/i386/exception.s b/sys/i386/i386/exception.s
index 7ba980660ffe..d746f12d5fad 100644
--- a/sys/i386/i386/exception.s
+++ b/sys/i386/i386/exception.s
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: exception.s,v 1.3 1994/04/02 07:00:23 davidg Exp $
+ *	$Id: exception.s,v 1.4 1994/08/13 03:49:38 wollman Exp $
  */
 
 #include "npx.h"				/* NNPX */
@@ -269,7 +269,21 @@ IDTVEC(syscall)
 	jmp	_doreti
 
 /*
- * include generated interrupt vectors and ISA intr code
+ * Include what was once config+isa-dependent code.
+ * XXX it should be in a stand-alone file.  It's still icu-dependent and
+ * belongs in i386/isa.
  */
 #include "i386/isa/vector.s"
+
+/*
+ * Include what was once icu-dependent code.
+ * XXX it should be merged into this file (also move the definition of
+ * imen to vector.s or isa.c).
+ * Before including it, set up a normal asm environment so that vector.s
+ * doesn't have to know that stuff is included after it.
+ */
+	.data
+	ALIGN_DATA
+	.text
+	SUPERALIGN_TEXT
 #include "i386/isa/icu.s"