diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-06-09 16:32:09 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-06-09 16:32:09 -0700 |
| commit | bb170715538cc6c8806fcec20e6ca0d3f7267468 (patch) | |
| tree | 58ed3c7a7d7e23701fed06677de54b863b1143de /core | |
| parent | 012d53b0453ac7a5ec03fb802434fe64e6f85bf5 (diff) | |
| download | syslinux-bb170715538cc6c8806fcec20e6ca0d3f7267468.tar.gz | |
Whitespace cleanup
Diffstat (limited to 'core')
| -rw-r--r-- | core/Makefile | 2 | ||||
| -rw-r--r-- | core/ldlinux.asm | 2 | ||||
| -rw-r--r-- | core/localboot.inc | 4 | ||||
| -rw-r--r-- | core/pxelinux.asm | 2 | ||||
| -rw-r--r-- | core/runkernel.inc | 2 | ||||
| -rw-r--r-- | core/syslinux.ld | 4 |
6 files changed, 8 insertions, 8 deletions
diff --git a/core/Makefile b/core/Makefile index 3e58696b..983a3417 100644 --- a/core/Makefile +++ b/core/Makefile @@ -34,7 +34,7 @@ OBJCOPY = objcopy OBJDUMP = objdump OPTFLAGS = -g -Os -march=i386 -falign-functions=0 -falign-jumps=0 -falign-loops=0 -fomit-frame-pointer -INCLUDES = +INCLUDES = CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -W -Wall -msoft-float $(OPTFLAGS) $(INCLUDES) NASM = nasm diff --git a/core/ldlinux.asm b/core/ldlinux.asm index cb045c83..54dc8fac 100644 --- a/core/ldlinux.asm +++ b/core/ldlinux.asm @@ -1072,7 +1072,7 @@ search_dos_dir: .not_us: popa jmp .nomatch - + .short_entry: test byte [gs:si+11],8 ; Ignore volume labels jnz .nomatch diff --git a/core/localboot.inc b/core/localboot.inc index b6b31deb..ae54737a 100644 --- a/core/localboot.inc +++ b/core/localboot.inc @@ -1,5 +1,5 @@ ; ----------------------------------------------------------------------- -; +; ; Copyright 1999-2008 H. Peter Anvin - All Rights Reserved ; ; This program is free software; you can redistribute it and/or modify @@ -51,7 +51,7 @@ local_boot: jnc .ok dec bp jnz .again - jmp kaboom ; Failure... + jmp kaboom ; Failure... .ok: pop dx cli ; Abandon hope, ye who enter here diff --git a/core/pxelinux.asm b/core/pxelinux.asm index 9e2d2fb3..2c81ec54 100644 --- a/core/pxelinux.asm +++ b/core/pxelinux.asm @@ -1724,7 +1724,7 @@ PXEEntry equ pxenv.jump+1 section .bss alignb 2 PXEStatus resb 2 - + section .text ; diff --git a/core/runkernel.inc b/core/runkernel.inc index abd23782..7ddc7632 100644 --- a/core/runkernel.inc +++ b/core/runkernel.inc @@ -553,7 +553,7 @@ parse_load_initrd: ; Input: InitRD - set to the mangled name of the initrd ; EDI - location to load ; Output: EDI - location for next initrd -; InitRDEnd - updated +; InitRDEnd - updated ; loadinitrd: push ds diff --git a/core/syslinux.ld b/core/syslinux.ld index 66ea5e53..28ef44e9 100644 --- a/core/syslinux.ld +++ b/core/syslinux.ld @@ -13,7 +13,7 @@ SECTIONS { /* "Early" sections (before the load) */ . = 0x0800; - + .earlybss : { __earlybss_start = .; *(.earlybss) @@ -81,7 +81,7 @@ SECTIONS *(.data) __data_end = .; } - __data_len = __data_end - __data_start; + __data_len = __data_end - __data_start; __data_dwords = (__data_len + 3) >> 2; . = ALIGN(4); |