mirror of https://github.com/ipxe/ipxe.git
[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>pull/259/head
Michael Brown
parent
b539e9a7e9
commit
c160fb2593
|
|
@ -13,7 +13,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
|
|||
****************************************************************************
|
||||
*/
|
||||
.section ".stack", "aw", @nobits
|
||||
.align 8
|
||||
.balign 8
|
||||
.globl _stack
|
||||
_stack:
|
||||
.space STACK_SIZE
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
|
|||
****************************************************************************
|
||||
*/
|
||||
.section ".stack16", "aw", @nobits
|
||||
.align 8
|
||||
.balign 8
|
||||
.globl _stack16
|
||||
_stack16:
|
||||
.space 4096
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
|
|||
****************************************************************************
|
||||
*/
|
||||
.section ".data16", "aw", @progbits
|
||||
.align 16
|
||||
.balign 16
|
||||
.globl hidemem_base
|
||||
.globl hidemem_umalloc
|
||||
.globl hidemem_textdata
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
|
|||
*/
|
||||
.section ".text16.data", "aw", @progbits
|
||||
.globl ppxe
|
||||
.align 16
|
||||
.balign 16
|
||||
ppxe:
|
||||
.ascii "!PXE" /* Signature */
|
||||
.byte pxe_length /* StructLength */
|
||||
|
|
@ -72,7 +72,7 @@ undiheader:
|
|||
*/
|
||||
.section ".text16.data", "aw", @progbits
|
||||
.globl pxenv
|
||||
.align 16
|
||||
.balign 16
|
||||
pxenv:
|
||||
.ascii "PXENV+" /* Signature */
|
||||
.word 0x0201 /* Version */
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -285,7 +285,7 @@ enable_a20:
|
|||
ret
|
||||
|
||||
.section ".text16.early.data", "aw", @progbits
|
||||
.align 2
|
||||
.balign 2
|
||||
enable_a20_method:
|
||||
.word 0
|
||||
.size enable_a20_method, . - enable_a20_method
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
|
|||
****************************************************************************
|
||||
*/
|
||||
.section ".data16.gdt", "aw", @progbits
|
||||
.align 16
|
||||
.balign 16
|
||||
gdt:
|
||||
gdtr: /* The first GDT entry is unused, the GDTR can fit here. */
|
||||
gdt_limit: .word gdt_length - 1
|
||||
|
|
@ -224,7 +224,7 @@ RC_TMP_END:
|
|||
|
||||
/* Shared temporary static buffer */
|
||||
.section ".bss16.rm_tmpbuf", "aw", @nobits
|
||||
.align 16
|
||||
.balign 16
|
||||
rm_tmpbuf:
|
||||
.space VC_TMP_END
|
||||
.size rm_tmpbuf, . - rm_tmpbuf
|
||||
|
|
@ -1470,7 +1470,7 @@ interrupt_wrapper:
|
|||
****************************************************************************
|
||||
*/
|
||||
.section ".pages", "aw", @nobits
|
||||
.align SIZEOF_PT
|
||||
.balign SIZEOF_PT
|
||||
|
||||
/* Page map level 4 entries (PML4Es)
|
||||
*
|
||||
|
|
|
|||
|
|
@ -259,7 +259,7 @@ static inline void eplatform_discard ( int dummy __unused, ... ) {}
|
|||
*/
|
||||
#define __einfo_error( einfo ) ( { \
|
||||
__asm__ ( ".section \".einfo\", \"\", " PROGBITS_OPS "\n\t" \
|
||||
".align 8\n\t" \
|
||||
".balign 8\n\t" \
|
||||
"\n1:\n\t" \
|
||||
".long ( 4f - 1b )\n\t" \
|
||||
".long %c0\n\t" \
|
||||
|
|
@ -268,7 +268,7 @@ static inline void eplatform_discard ( int dummy __unused, ... ) {}
|
|||
".long %c1\n\t" \
|
||||
"\n2:\t.asciz \"" __einfo_desc ( einfo ) "\"\n\t" \
|
||||
"\n3:\t.asciz \"" __FILE__ "\"\n\t" \
|
||||
".align 8\n\t" \
|
||||
".balign 8\n\t" \
|
||||
"\n4:\n\t" \
|
||||
".previous\n\t" : : \
|
||||
"i" ( __einfo_errno ( einfo ) ), \
|
||||
|
|
|
|||
Loading…
Reference in New Issue