From: H. Peter Anvin <hpa@zytor.com>
Date: Thu, 14 May 2009 01:38:46 +0000 (-0700)
Subject: core: obsolete .bss1 and .bss2
X-Git-Tag: syslinux-4.00-pre1~140
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=376a2bfe09b8292140d7a40ce77a1cc7f4316e17;p=profile%2Fivi%2Fsyslinux.git

core: obsolete .bss1 and .bss2

Remove the obsolete .bss1 and .bss2 segments; they represent segment
balancing which is no longer useful.  The current balance between
.earlybss, .bss and .uibss seems to be sufficient; if we need more
balancing in the future then we need to start over anyway.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---

diff --git a/core/com32.inc b/core/com32.inc
index 63b1e64..5dc19ad 100644
--- a/core/com32.inc
+++ b/core/com32.inc
@@ -257,7 +257,7 @@ __com32_cfarcall:
 
 		bits 16
 
-		section .bss1
+		section .bss
 		alignb 4
 RealModeEAX	resd 1			; Real mode EAX
 Com32SysSP	resw 1			; SP saved during COM32 syscall
diff --git a/core/comboot.inc b/core/comboot.inc
index 4db0b3e..1c4695b 100644
--- a/core/comboot.inc
+++ b/core/comboot.inc
@@ -1067,7 +1067,7 @@ feature_flags_len equ ($-feature_flags)
 err_notdos	db ': attempted DOS system call INT ',0
 err_comlarge	db 'COMBOOT image too large.', CR, LF, 0
 
-		section .bss1
+		section .bss
 		alignb 4
 DOSErrTramp	resd	33		; Error trampolines
 ConfigName	resb	FILENAME_MAX
diff --git a/core/dnsresolv.inc b/core/dnsresolv.inc
index c2c429c..e9bebad 100644
--- a/core/dnsresolv.inc
+++ b/core/dnsresolv.inc
@@ -150,7 +150,7 @@ dns_skiplabel:
 .rdata:		equ $
 		endstruc
 
-		section .bss2
+		section .bss
 		alignb 2
 DNSSendBuf	resb DNS_MAX_PACKET
 DNSRecvBuf	resb DNS_MAX_PACKET
diff --git a/core/font.inc b/core/font.inc
index 4090e5a..6c7aa78 100644
--- a/core/font.inc
+++ b/core/font.inc
@@ -146,7 +146,7 @@ vidrows_ok:	mov [VidRows],al
 VGAFontSize	dw 16			; Defaults to 16 byte font
 UserFont	db 0			; Using a user-specified font
 
-		section .bss1
+		section .bss
 		alignb 4
 GXPixCols	resw 1			; Graphics mode pixel columns
 GXPixRows	resw 1			; Graphics mode pixel rows
diff --git a/core/getc.inc b/core/getc.inc
index bb12047..ca3a42a 100644
--- a/core/getc.inc
+++ b/core/getc.inc
@@ -321,7 +321,7 @@ parseint:
 .isk:		shl ebx,10		; * 2^10
 		jmp .fini
 
-		section .bss1
+		section .bss
 		alignb 4
 NumBuf		resb 15			; Buffer to load number
 NumBufEnd	resb 1			; Last byte in NumBuf
diff --git a/core/graphics.inc b/core/graphics.inc
index 2b8290f..78ae0a6 100644
--- a/core/graphics.inc
+++ b/core/graphics.inc
@@ -308,7 +308,7 @@ linear_color	db 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0
 		; of this byte.
 UsingVGA	db 0
 
-		section .bss1
+		section .bss
 		alignb 4
 LSSHeader	equ $
 LSSMagic	resd 1			; Magic number
diff --git a/core/isolinux.asm b/core/isolinux.asm
index 4cb4cb8..921f7fa 100644
--- a/core/isolinux.asm
+++ b/core/isolinux.asm
@@ -102,7 +102,7 @@ trackbuf	resb trackbufsize	; Track buffer goes here
 
 		; Some of these are touched before the whole image
 		; is loaded.  DO NOT move this to .uibss.
-		section .bss2
+		section .bss
 		alignb 4
 ISOFileName	resb 64			; ISO filename canonicalization buffer
 ISOFileNameEnd	equ $
diff --git a/core/layout.inc b/core/layout.inc
index a73a36c..556f4a8 100644
--- a/core/layout.inc
+++ b/core/layout.inc
@@ -40,8 +40,8 @@ LATEBSS_START	equ 0B800h
 		section .replacestub	exec write progbits align=16
 
 		; Use .bss for things that doesn't have to be in low memory;
-		; with .bss1 and .bss2 to offload.  .earlybss should be used
-		; for things that absolutely have to be below 0x7c00.
+		; .earlybss should be used for things that absolutely have
+		; to be below 0x7c00.
 		section .bss		write nobits align=16
 
 %if 0 ; IS_PXELINUX
@@ -54,8 +54,6 @@ LATEBSS_START	equ 0B800h
 RBFG_brainfuck:	resb 2048		; Bigger than an Ethernet packet...
 %endif
 
-		section .bss2		write nobits align=16
-
 		section .init		exec write progbits align=1
 		section .text		exec write progbits align=1
 		section .bcopyxx	exec write progbits align=16
@@ -69,9 +67,6 @@ RBFG_brainfuck:	resb 2048		; Bigger than an Ethernet packet...
 		; the spillover from the last fractional sector load.
 		section .uibss		write nobits align=16
 
-		; Normal bss...
-		section .bss1		write nobits align=16
-
 		; Symbols from linker script
 %macro SECINFO 1
 		extern __%1_start, __%1_lma, __%1_end
diff --git a/core/pxelinux.asm b/core/pxelinux.asm
index 021af37..d98ee42 100644
--- a/core/pxelinux.asm
+++ b/core/pxelinux.asm
@@ -226,7 +226,7 @@ pxe_unload_stack_pkt_len	equ $-pxe_unload_stack_pkt
 		alignb 16
 		; BOOTP/DHCP packet buffer
 
-		section .bss2
+		section .bss
 		alignb 16
 packet_buf	resb 2048		; Transfer packet
 packet_buf_size	equ $-packet_buf