$OpenBSD$

Index: src/utils/mp_gpprof_server/libraries/gamespy/common/nitro/nitrosample/Nitro.lcf
--- src/utils/mp_gpprof_server/libraries/gamespy/common/nitro/nitrosample/Nitro.lcf.orig
+++ src/utils/mp_gpprof_server/libraries/gamespy/common/nitro/nitrosample/Nitro.lcf
@@ -120,7 +120,7 @@
 #  Set STATICINIT instead of .ctor temporarily
 #
 #  Revision 1.2	 04/14/2004 07:16:42  yasu
-#  add ALIGN(32) for convenience to handle cache line
+#  add D_ALIGN(32) for convenience to handle cache line
 #
 #  Revision 1.1	 04/06/2004 01:59:54  yasu
 #  newly added
@@ -162,7 +162,7 @@ SECTIONS
 	############################ STATIC #################################
 	.main:
 	{
-	ALIGNALL(4);			. = ALIGN(32);	# Fit to cache line
+	ALIGNALL(4);			. = D_ALIGN(32);	# Fit to cache line
 					
 	#
 	#  TEXT BLOCK: READ ONLY
@@ -181,17 +181,17 @@ SECTIONS
 					* (.version)
 					OBJECT(NitroMain,*)
 					GROUP(ROOT) (.text)
-					. = ALIGN(4);
+					. = D_ALIGN(4);
 					* (.exception)
-					. = ALIGN(4);
+					. = D_ALIGN(4);
 	SDK_STATIC_ETABLE_START		=.;
 					EXCEPTION
 	SDK_STATIC_ETABLE_END		=.;
-					. = ALIGN(4);
+					. = D_ALIGN(4);
 					GROUP(ROOT) (.init)
-					. = ALIGN(4);
+					. = D_ALIGN(4);
 					GROUP(ROOT) (.rodata)
-					. = ALIGN(4);
+					. = D_ALIGN(4);
 
 	SDK_STATIC_SINIT_START		=.;
 					#:::::::::: ctor
@@ -202,7 +202,7 @@ SECTIONS
 	SDK_STATIC_SINIT_END		=.;
 
 					#:::::::::: text/rodata
-					. = ALIGN(32);
+					. = D_ALIGN(32);
 	SDK_STATIC_TEXT_END		=.;
 	
 	#
@@ -211,14 +211,14 @@ SECTIONS
 	SDK_STATIC_DATA_START		=.;
 					#:::::::::: data
 					GROUP(ROOT) (.sdata)
-					. = ALIGN(4);
+					. = D_ALIGN(4);
 					GROUP(ROOT) (.data)
-					. = ALIGN(4);
+					. = D_ALIGN(4);
 	SDK_OVERLAY_DIGEST		=.;
 					# NO DIGEST
 	SDK_OVERLAY_DIGEST_END		=.;
 					#:::::::::: data
-					. = ALIGN(32);
+					. = D_ALIGN(32);
 	SDK_STATIC_DATA_END		=.;
 	SDK_STATIC_END			=.;
 
@@ -232,7 +232,7 @@ SECTIONS
 
 	.main.bss:
 	{
-	ALIGNALL(4);			. = ALIGN(32);
+	ALIGNALL(4);			. = D_ALIGN(32);
 					
 	#
 	#  BSS BLOCK
@@ -240,11 +240,11 @@ SECTIONS
 	SDK_STATIC_BSS_START		=.;
 					#:::::::::: bss
 					GROUP(ROOT) (.sbss)
-					. = ALIGN(4);
+					. = D_ALIGN(4);
 					GROUP(ROOT) (.bss)
-					. = ALIGN(4);
+					. = D_ALIGN(4);
 					#:::::::::: bss
-					. = ALIGN(32);
+					. = D_ALIGN(32);
 	SDK_STATIC_BSS_END		= .;
 	SDK_STATIC_BSS_SIZE		= SDK_STATIC_BSS_END - SDK_STATIC_BSS_START;
 
@@ -268,7 +268,7 @@ SECTIONS
 
 	.ITCM:
 	{
-	ALIGNALL(4);				. = ALIGN(32);
+	ALIGNALL(4);				. = D_ALIGN(32);
 						
 	#
 	#   TEXT BLOCK: READ ONLY
@@ -278,10 +278,10 @@ SECTIONS
 	SDK_AUTOLOAD.ITCM.START	=.;
 	SDK_AUTOLOAD.ITCM.TEXT_START	=.;
 						#:::::::::: text/rodata
-						. = ALIGN(4);
+						. = D_ALIGN(4);
 						* (.itcm)
-						. = ALIGN(4);
-						. = ALIGN(4);
+						. = D_ALIGN(4);
+						. = D_ALIGN(4);
 						#:::::::::: text/rodata
 	SDK_AUTOLOAD.ITCM.TEXT_END	=.;
 
@@ -290,11 +290,11 @@ SECTIONS
 	#
 	SDK_AUTOLOAD.ITCM.DATA_START	=.;
 						#:::::::::: data
-						. = ALIGN(4);
-						. = ALIGN(4);
-						. = ALIGN(4);
+						. = D_ALIGN(4);
+						. = D_ALIGN(4);
+						. = D_ALIGN(4);
 						#:::::::::: data
-						. = ALIGN(32);
+						. = D_ALIGN(32);
 	SDK_AUTOLOAD.ITCM.DATA_END	=.;
 	SDK_AUTOLOAD.ITCM.END	=.;
 	
@@ -307,20 +307,20 @@ SECTIONS
 
 	.ITCM.bss:
 	{
-	ALIGNALL(4);				. = ALIGN(32);
+	ALIGNALL(4);				. = D_ALIGN(32);
 						
 	#
 	#  BSS BLOCK
 	#
 	SDK_AUTOLOAD.ITCM.BSS_START	= .;
 						#:::::::::: bss
-						. = ALIGN(4);
-						. = ALIGN(4);
-						. = ALIGN(4);
+						. = D_ALIGN(4);
+						. = D_ALIGN(4);
+						. = D_ALIGN(4);
 						* (.itcm.bss)
-						. = ALIGN(4);
+						. = D_ALIGN(4);
 						#:::::::::: bss
-						. = ALIGN(32);
+						. = D_ALIGN(32);
 	SDK_AUTOLOAD.ITCM.BSS_END	= .;
 
 	SDK_AUTOLOAD.ITCM.BSS_SIZE	= SDK_AUTOLOAD.ITCM.BSS_END - SDK_AUTOLOAD.ITCM.BSS_START;
@@ -329,7 +329,7 @@ SECTIONS
 
 	.DTCM:
 	{
-	ALIGNALL(4);				. = ALIGN(32);
+	ALIGNALL(4);				. = D_ALIGN(32);
 						
 	#
 	#   TEXT BLOCK: READ ONLY
@@ -339,9 +339,9 @@ SECTIONS
 	SDK_AUTOLOAD.DTCM.START	=.;
 	SDK_AUTOLOAD.DTCM.TEXT_START	=.;
 						#:::::::::: text/rodata
-						. = ALIGN(4);
-						. = ALIGN(4);
-						. = ALIGN(4);
+						. = D_ALIGN(4);
+						. = D_ALIGN(4);
+						. = D_ALIGN(4);
 						#:::::::::: text/rodata
 	SDK_AUTOLOAD.DTCM.TEXT_END	=.;
 
@@ -350,12 +350,12 @@ SECTIONS
 	#
 	SDK_AUTOLOAD.DTCM.DATA_START	=.;
 						#:::::::::: data
-						. = ALIGN(4);
-						. = ALIGN(4);
+						. = D_ALIGN(4);
+						. = D_ALIGN(4);
 						* (.dtcm)
-						. = ALIGN(4);
+						. = D_ALIGN(4);
 						#:::::::::: data
-						. = ALIGN(32);
+						. = D_ALIGN(32);
 	SDK_AUTOLOAD.DTCM.DATA_END	=.;
 	SDK_AUTOLOAD.DTCM.END	=.;
 	
@@ -368,20 +368,20 @@ SECTIONS
 
 	.DTCM.bss:
 	{
-	ALIGNALL(4);				. = ALIGN(32);
+	ALIGNALL(4);				. = D_ALIGN(32);
 						
 	#
 	#  BSS BLOCK
 	#
 	SDK_AUTOLOAD.DTCM.BSS_START	= .;
 						#:::::::::: bss
-						. = ALIGN(4);
-						. = ALIGN(4);
+						. = D_ALIGN(4);
+						. = D_ALIGN(4);
 						* (.dtcm.bss)
-						. = ALIGN(4);
-						. = ALIGN(4);
+						. = D_ALIGN(4);
+						. = D_ALIGN(4);
 						#:::::::::: bss
-						. = ALIGN(32);
+						. = D_ALIGN(32);
 	SDK_AUTOLOAD.DTCM.BSS_END	= .;
 
 	SDK_AUTOLOAD.DTCM.BSS_SIZE	= SDK_AUTOLOAD.DTCM.BSS_END - SDK_AUTOLOAD.DTCM.BSS_START;
@@ -431,31 +431,31 @@ SECTIONS
 	# MAIN EX Area
 	.dummy.MAIN_EX:
 	{
-		. = ALIGN(32);
+		. = D_ALIGN(32);
 	} > dummy.MAIN_EX
 	
 	############################ ARENA ##################################
 	.arena.MAIN:
 	{
-						. = ALIGN(32);
+						. = D_ALIGN(32);
 		SDK_SECTION_ARENA_START		=.;
 	} > arena.MAIN
 	
 	.arena.MAIN_EX:
 	{
-						. = ALIGN(32);
+						. = D_ALIGN(32);
 		SDK_SECTION_ARENA_EX_START	=.;
 	} > arena.MAIN_EX
 	
 	.arena.ITCM:
 	{
-						. = ALIGN(32);
+						. = D_ALIGN(32);
 		SDK_SECTION_ARENA_ITCM_START	=.;
 	} > arena.ITCM
 
 	.arena.DTCM:
 	{
-						. = ALIGN(32);
+						. = D_ALIGN(32);
 		SDK_SECTION_ARENA_DTCM_START	=.;
 	} > arena.DTCM
 	
