[build] Use .balign directive instead of .align
The semantics of the assembler's .align directive vary by CPU architecture. For the ARM builds, it specifies a power of two rather than a number of bytes. This currently leads to the .einfo entries (which do not appear in the final binary) having an alignment of 256 bytes for the ARM builds. Fix by switching to the GNU-specific directive .balign, which is consistent across architectures Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
@@ -110,7 +110,7 @@ overlay:
|
||||
/* Overlay number */
|
||||
.word 0
|
||||
|
||||
.align 16, 0
|
||||
.balign 16, 0
|
||||
|
||||
.globl _exe_start
|
||||
_exe_start:
|
||||
|
||||
@@ -492,7 +492,7 @@ mromheader:
|
||||
.word 0
|
||||
.size mromheader, . - mromheader
|
||||
|
||||
.align 4
|
||||
.balign 4
|
||||
mpciheader:
|
||||
.ascii "PCIR" /* Signature */
|
||||
.word pci_vendor_id /* Vendor identification */
|
||||
|
||||
@@ -88,7 +88,7 @@ checksum:
|
||||
.previous
|
||||
|
||||
.ifeqs BUSTYPE, "PCIR"
|
||||
.align 4
|
||||
.balign 4
|
||||
pciheader:
|
||||
.ascii "PCIR" /* Signature */
|
||||
.word pci_vendor_id /* Vendor identification */
|
||||
@@ -136,7 +136,7 @@ pci_devlist_end:
|
||||
* BIOSes will scan on 16-byte boundaries rather than using
|
||||
* the offset stored at 0x1a
|
||||
*/
|
||||
.align 16
|
||||
.balign 16
|
||||
pnpheader:
|
||||
.ascii "$PnP" /* Signature */
|
||||
.byte 0x01 /* Structure revision */
|
||||
@@ -184,7 +184,7 @@ prodstr_pci_id:
|
||||
|
||||
.globl undiheader
|
||||
.weak undiloader
|
||||
.align 4
|
||||
.balign 4
|
||||
undiheader:
|
||||
.ascii "UNDI" /* Signature */
|
||||
.byte undiheader_len /* Length of structure */
|
||||
@@ -199,7 +199,7 @@ undiheader:
|
||||
.equ undiheader_len, . - undiheader
|
||||
.size undiheader, . - undiheader
|
||||
|
||||
.align 4
|
||||
.balign 4
|
||||
ipxeheader:
|
||||
.ascii "iPXE" /* Signature */
|
||||
.byte ipxeheader_len /* Length of structure */
|
||||
|
||||
@@ -231,7 +231,7 @@ rep_len_dec: .space sizeof__lzma_len_dec
|
||||
literal: .rept ( ( 1 << LZMA_LC ) * 0x300 )
|
||||
.word 0
|
||||
.endr
|
||||
.align 4
|
||||
.balign 4
|
||||
.equ sizeof__lzma_dec, . - lzma_dec
|
||||
.previous
|
||||
|
||||
|
||||
Reference in New Issue
Block a user