From b10593796ca7d2db01d90e7425f77406d60e3039 Mon Sep 17 00:00:00 2001
From: Aaron Culliney <asc_at_bitr0t_com>
Date: Sat, 7 Jun 2014 13:02:22 -0700
Subject: [PATCH] Move x86-specific assembly alignment macros and add __i686__

---
 src/apple2.h       | 6 ------
 src/x86/cpu-regs.h | 8 ++++++++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/apple2.h b/src/apple2.h
index 9cfcd082..b99de189 100644
--- a/src/apple2.h
+++ b/src/apple2.h
@@ -21,12 +21,6 @@
 #include "config.h"
 #endif
 
-/* Code alignment */
-#if defined(__i486__) || defined(__i586__)
-#define         ALIGN                   .balign 16
-#else /* !(__i486__ || __i586__) */
-#define         ALIGN                   .balign 4
-#endif /* !(__i486__ || __i586__) */
 
 /* Symbol naming issues */
 #ifdef NO_UNDERSCORES
diff --git a/src/x86/cpu-regs.h b/src/x86/cpu-regs.h
index 3482c65d..3ad012bc 100644
--- a/src/x86/cpu-regs.h
+++ b/src/x86/cpu-regs.h
@@ -11,6 +11,14 @@
 
 #include "cpu.h"
 
+#if defined(__LP64__)
+#   error TBD
+#elif defined(__i486__) || defined(__i586__) || defined(__i686__)
+#   define ALIGN .balign 16
+#else
+#   define ALIGN .balign 4
+#endif
+
 #define X_Reg           %bl             /* 6502 X register in %bl  */
 #define Y_Reg           %bh             /* 6502 Y register in %bh  */
 #define A_Reg           %cl             /* 6502 A register in %cl  */