From 3c1b63f7cd2f379333fb159d49f393b452b981a9 Mon Sep 17 00:00:00 2001
From: Peter Johnson <peter@tortall.net>
Date: Wed, 3 Aug 2005 07:05:09 +0000
Subject: [PATCH] coff_objfmt.c (coff_objfmt_section_switch): Default alignment
 to 16 bytes when in 64-bit mode.

svn path=/trunk/yasm/; revision=1214
---
 modules/objfmts/coff/coff-objfmt.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/modules/objfmts/coff/coff-objfmt.c b/modules/objfmts/coff/coff-objfmt.c
index e5cdaee5..846a3c20 100644
--- a/modules/objfmts/coff/coff-objfmt.c
+++ b/modules/objfmts/coff/coff-objfmt.c
@@ -1021,14 +1021,22 @@ coff_objfmt_section_switch(yasm_objfmt *objfmt, yasm_valparamhead *valparams,
 
     if (strcmp(sectname, ".data") == 0) {
 	flags = COFF_STYP_DATA;
-	if (objfmt_coff->win32)
-	    flags |= COFF_STYP_READ | COFF_STYP_WRITE |
-		(3<<COFF_STYP_ALIGN_SHIFT);	/* align=4 */
+	if (objfmt_coff->win32) {
+	    flags |= COFF_STYP_READ | COFF_STYP_WRITE;
+	    if (objfmt_coff->machine == COFF_MACHINE_AMD64)
+		flags |= 5<<COFF_STYP_ALIGN_SHIFT;	/* align=16 */
+	    else
+		flags |= 3<<COFF_STYP_ALIGN_SHIFT;	/* align=4 */
+	}
     } else if (strcmp(sectname, ".bss") == 0) {
 	flags = COFF_STYP_BSS;
-	if (objfmt_coff->win32)
-	    flags |= COFF_STYP_READ | COFF_STYP_WRITE |
-		(3<<COFF_STYP_ALIGN_SHIFT);	/* align=4 */
+	if (objfmt_coff->win32) {
+	    flags |= COFF_STYP_READ | COFF_STYP_WRITE;
+	    if (objfmt_coff->machine == COFF_MACHINE_AMD64)
+		flags |= 5<<COFF_STYP_ALIGN_SHIFT;	/* align=16 */
+	    else
+		flags |= 3<<COFF_STYP_ALIGN_SHIFT;	/* align=4 */
+	}
 	resonly = 1;
     } else if (strcmp(sectname, ".text") == 0) {
 	flags = COFF_STYP_TEXT;
-- 
2.40.0