From 63e1873a8ea01edfd49af750c2c4480c34bca2e1 Mon Sep 17 00:00:00 2001
From: Peter Johnson <peter@tortall.net>
Date: Tue, 7 Oct 2008 04:34:19 +0000
Subject: [PATCH] Don't require nasm preproc for some testcases.

svn path=/trunk/yasm/; revision=2129
---
 .../bin/tests/multisect/multisect1.asm        |  8 +++---
 modules/objfmts/elf/tests/amd64/elfso64.asm   | 26 +++++++++----------
 modules/objfmts/elf/tests/elfvisibility.asm   |  8 +++---
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/modules/objfmts/bin/tests/multisect/multisect1.asm b/modules/objfmts/bin/tests/multisect/multisect1.asm
index 2989b15b..d9699b79 100644
--- a/modules/objfmts/bin/tests/multisect/multisect1.asm
+++ b/modules/objfmts/bin/tests/multisect/multisect1.asm
@@ -1,8 +1,8 @@
-BITS 32
+[BITS 32]
 
 [MAP all]
 ; This file is loaded as a DOS .COM file.
-SEGMENT _TEXT start=0 vstart=100h
+[SEGMENT _TEXT start=0 vstart=100h]
  
 ; shrink & relocate stack:
 	mov	sp, stack_ends   ; NASM puts 460h here -
@@ -13,7 +13,7 @@ SEGMENT _TEXT start=0 vstart=100h
 	mov	ah, 4Ah  ; DOS resize mem.block
 	int 21h
  
-SEGMENT GATESEG align=1 follows=_TEXT vstart=0
+[SEGMENT GATESEG align=1 follows=_TEXT vstart=0]
 ; label to use for copying this segment at run-time.
 gate0cpy:
 dd 0
@@ -25,7 +25,7 @@ dd 0
 ; vstart=0 makes some calculations easier.
  
 ; Reserve space for stack:
-SEGMENT .bss follows=GATESEG align=16
+[SEGMENT .bss follows=GATESEG align=16]
     resb 400h
 stack_ends:
 
diff --git a/modules/objfmts/elf/tests/amd64/elfso64.asm b/modules/objfmts/elf/tests/amd64/elfso64.asm
index 39dbf2ea..931c7ffe 100644
--- a/modules/objfmts/elf/tests/amd64/elfso64.asm
+++ b/modules/objfmts/elf/tests/amd64/elfso64.asm
@@ -21,18 +21,18 @@
 ; [16] Reference a data-section symbol in the data section
 ; [17] Reference a BSS-section symbol in the data section
 
-	  BITS 64
-	  GLOBAL lrotate:function ; [1]
-	  GLOBAL greet:function	; [1]
-	  GLOBAL asmstr:data asmstr.end-asmstr ; [2]
-	  GLOBAL textptr:data 4	; [2]
-	  GLOBAL selfptr:data 4	; [2]
-	  GLOBAL integer:data 4	; [3]
-	  EXTERN printf		; [10]
-	  COMMON commvar 4:4	; [7]
-	  EXTERN _GLOBAL_OFFSET_TABLE_
+	  [BITS 64]
+	  [GLOBAL lrotate:function] ; [1]
+	  [GLOBAL greet:function]	; [1]
+	  [GLOBAL asmstr:data asmstr.end-asmstr] ; [2]
+	  [GLOBAL textptr:data 4]	; [2]
+	  [GLOBAL selfptr:data 4]	; [2]
+	  [GLOBAL integer:data 4]	; [3]
+	  [EXTERN printf]		; [10]
+	  [COMMON commvar 4:4]	; [7]
+	  [EXTERN _GLOBAL_OFFSET_TABLE_]
 
-	  SECTION .text
+	  [SECTION .text]
 
 ; prototype: long lrotate(long x, int num);
 lrotate:			; [1]
@@ -66,7 +66,7 @@ greet	  push rbx		; we'll use RBX for GOT, so save it
 	  pop rbx
 	  ret
 
-	  SECTION .data
+	  [SECTION .data]
 
 ; a string
 asmstr	  db 'hello, world', 0	; [2]
@@ -81,7 +81,7 @@ localptr  dd localint		; [5] [17]
 textptr	  dd greet wrt ..sym	; [15]
 selfptr	  dd selfptr wrt ..sym	; [16]
 
-	  SECTION .bss
+	  [SECTION .bss]
 
 ; an integer
 integer	  resd 1		; [3]
diff --git a/modules/objfmts/elf/tests/elfvisibility.asm b/modules/objfmts/elf/tests/elfvisibility.asm
index 32d20722..8577b5de 100644
--- a/modules/objfmts/elf/tests/elfvisibility.asm
+++ b/modules/objfmts/elf/tests/elfvisibility.asm
@@ -1,9 +1,9 @@
 [section .text]
 
-global ghidden:hidden
-global ginternal:internal
-global gprotected:protected
-global gtoomany:hidden internal
+[global ghidden:hidden]
+[global ginternal:internal]
+[global gprotected:protected]
+[global gtoomany:hidden internal]
 
 ghidden:
 ginternal:
-- 
2.49.0