summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>1997-08-25 10:57:38 +0000
committerpeter <peter@FreeBSD.org>1997-08-25 10:57:38 +0000
commite063258819eb0970081953f666ee7a5e32ca8917 (patch)
treec54932d356cb364ab15e0759df68e87878ff4039 /sys
parent90e0972a81a26e29c994e1115e530dfab8caa4fe (diff)
downloadFreeBSD-src-e063258819eb0970081953f666ee7a5e32ca8917.zip
FreeBSD-src-e063258819eb0970081953f666ee7a5e32ca8917.tar.gz
s/.align/.p2align/ so that we get the same results when building elf
objects (the tools are a bit better)
Diffstat (limited to 'sys')
-rw-r--r--sys/amd64/amd64/mpboot.S6
-rw-r--r--sys/i386/i386/mpboot.s6
-rw-r--r--sys/i386/i386/mplock.s4
3 files changed, 8 insertions, 8 deletions
diff --git a/sys/amd64/amd64/mpboot.S b/sys/amd64/amd64/mpboot.S
index f47f49f..8a6af0a 100644
--- a/sys/amd64/amd64/mpboot.S
+++ b/sys/amd64/amd64/mpboot.S
@@ -31,7 +31,7 @@
* mpboot.s: FreeBSD machine support for the Intel MP Spec
* multiprocessor systems.
*
- * $Id: mpboot.s,v 1.1 1997/04/26 11:45:17 peter Exp $
+ * $Id: mpboot.s,v 1.2 1997/06/22 16:03:22 peter Exp $
*/
@@ -70,7 +70,7 @@
/*
* the APs enter here from their trampoline code (bootMP, below)
*/
- .align 4
+ .p2align 4
NON_GPROF_ENTRY(MPentry)
CHECKPOINT(0x36, 3)
@@ -229,7 +229,7 @@ dead: hlt /* We should never get here */
/*
* MP boot strap Global Descriptor Table
*/
- .align 4
+ .p2align 4
.globl _MP_GDT
.globl _bootCodeSeg
.globl _bootDataSeg
diff --git a/sys/i386/i386/mpboot.s b/sys/i386/i386/mpboot.s
index f47f49f..8a6af0a 100644
--- a/sys/i386/i386/mpboot.s
+++ b/sys/i386/i386/mpboot.s
@@ -31,7 +31,7 @@
* mpboot.s: FreeBSD machine support for the Intel MP Spec
* multiprocessor systems.
*
- * $Id: mpboot.s,v 1.1 1997/04/26 11:45:17 peter Exp $
+ * $Id: mpboot.s,v 1.2 1997/06/22 16:03:22 peter Exp $
*/
@@ -70,7 +70,7 @@
/*
* the APs enter here from their trampoline code (bootMP, below)
*/
- .align 4
+ .p2align 4
NON_GPROF_ENTRY(MPentry)
CHECKPOINT(0x36, 3)
@@ -229,7 +229,7 @@ dead: hlt /* We should never get here */
/*
* MP boot strap Global Descriptor Table
*/
- .align 4
+ .p2align 4
.globl _MP_GDT
.globl _bootCodeSeg
.globl _bootDataSeg
diff --git a/sys/i386/i386/mplock.s b/sys/i386/i386/mplock.s
index 7eb2113..df9042c 100644
--- a/sys/i386/i386/mplock.s
+++ b/sys/i386/i386/mplock.s
@@ -6,7 +6,7 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
*
- * $Id: mplock.s,v 1.17 1997/08/10 20:59:07 fsmp Exp $
+ * $Id: mplock.s,v 1.18 1997/08/20 05:25:47 fsmp Exp $
*
* Functions for locking between CPUs in a SMP system.
*
@@ -445,7 +445,7 @@ NON_GPROF_ENTRY(rel_altsyscall_lock)
*
*/
.data
- .align 2 /* xx_lock aligned on int boundary */
+ .p2align 2 /* xx_lock aligned on int boundary */
.globl _mp_lock
_mp_lock: .long 0
OpenPOWER on IntegriCloud