From 48770219fa51259e71cc93b6d4dbcc4c7ce129e1 Mon Sep 17 00:00:00 2001
From: Zach Bacon <11doctorwhocanada@gmail.com>
Date: Sat, 20 Feb 2016 18:44:49 -0500
Subject: [PATCH] Minor build fixes cxx11 related

---
 src/gba/GBA-arm.cpp   | 14 +++++++-------
 src/gba/GBA-thumb.cpp | 10 +++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/gba/GBA-arm.cpp b/src/gba/GBA-arm.cpp
index 395df5d3..1fbba0c0 100644
--- a/src/gba/GBA-arm.cpp
+++ b/src/gba/GBA-arm.cpp
@@ -298,18 +298,18 @@ static void count(u32 opcode, int cond_res)
 #ifdef __GNUC__
  #define ALU_HEADER           asm("mov %%ecx, %%edi; "
  #define ALU_TRAILER          : "=D" (opcode) : "c" (opcode) : "eax", "ebx", "edx", "esi")
- #define EMIT0(op)            #op"; "
- #define EMIT1(op,arg)        #op" "arg"; "
- #define EMIT2(op,src,dest)   #op" "src", "dest"; "
- #define KONST(val)           "$"#val
+ #define EMIT0(op)            #op "; "
+ #define EMIT1(op,arg)        #op " " arg "; "
+ #define EMIT2(op,src,dest)   #op " " src ", " dest "; "
+ #define KONST(val)           "$" #val
  #define ASMVAR(cvar)         ASMVAR2 (__USER_LABEL_PREFIX__, cvar)
  #define ASMVAR2(prefix,cvar) STRING (prefix) cvar
  #define STRING(x)            #x
  #define VAR(var)             ASMVAR(#var)
  #define VARL(var)            ASMVAR(#var)
- #define REGREF1(index)       ASMVAR("reg("index")")
- #define REGREF2(index,scale) ASMVAR("reg(,"index","#scale")")
- #define LABEL(n)             #n": "
+ #define REGREF1(index)       ASMVAR("reg(" index ")")
+ #define REGREF2(index,scale) ASMVAR("reg(," index "," #scale ")")
+ #define LABEL(n)             #n ": "
  #define LABELREF(n,dir)      #n#dir
  #define al "%%al"
  #define ah "%%ah"
diff --git a/src/gba/GBA-thumb.cpp b/src/gba/GBA-thumb.cpp
index de5cfed8..9bce836d 100644
--- a/src/gba/GBA-thumb.cpp
+++ b/src/gba/GBA-thumb.cpp
@@ -305,15 +305,15 @@ static INSN_REGPARM void thumbBreakpoint(u32 opcode)
                 V_FLAG = (Flags >> 26) & 1;			\
             }
 #else
-  #define EMIT1(op,arg)        #op" "arg"; "
-  #define EMIT2(op,src,dest)   #op" "src", "dest"; "
-  #define KONST(val)           "$"#val
+  #define EMIT1(op,arg)        #op " " arg "; "
+  #define EMIT2(op,src,dest)   #op " " src ", " dest "; "
+  #define KONST(val)           "$" #val
   #define ASMVAR(cvar)         ASMVAR2 (__USER_LABEL_PREFIX__, cvar)
   #define ASMVAR2(prefix,cvar) STRING (prefix) cvar
   #define STRING(x)            #x
   #define VAR(var)             ASMVAR(#var)
-  #define REGREF1(index)       ASMVAR("reg("index")")
-  #define REGREF2(index,scale) ASMVAR("reg(,"index","#scale")")
+  #define REGREF1(index)       ASMVAR("reg(" index ")")
+  #define REGREF2(index,scale) ASMVAR("reg(," index "," #scale ")")
   #define eax "%%eax"
   #define ecx "%%ecx"
   #define edx "%%edx"