From 8da19946c6339d630c19054f3a353fcc0145ea64 Mon Sep 17 00:00:00 2001
From: John van Groningen
Date: Thu, 7 Jan 2016 13:33:41 +0000
Subject: include cgarmas.h and cgarmwas.h for ARM

---
 cg.c     | 23 ++++++++++++++---------
 cgcode.c | 15 ++++++++++-----
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/cg.c b/cg.c
index 7e8f16d..23a91f7 100644
--- a/cg.c
+++ b/cg.c
@@ -55,19 +55,24 @@ TP2PerfGlobals ThePGlobals;
 #include "cgcode.h"
 #include "cglin.h"
 #include "cgopt.h"
-#ifdef _WINDOWS_
+#ifdef I486
 # include "cgias.h"
 # include "cgiwas.h"
 #else
-# ifdef SOLARIS
-#  include "cgswas.h"
+# ifdef ARM
+#  include "cgarmas.h"
+#  include "cgarmwas.h"
 # else
-#  ifdef G_POWER
-#   include "cgpas.h"
-#   include "cgpwas.h"
+#  ifdef SOLARIS
+#   include "cgswas.h"
 #  else
-#   include "cgas.h"
-#   include "cgwas.h"
+#   ifdef G_POWER
+#    include "cgpas.h"
+#    include "cgpwas.h"
+#   else
+#    include "cgas.h"
+#    include "cgwas.h"
+#   endif
 #  endif
 # endif
 #endif
@@ -917,7 +922,7 @@ int main (int argc,char **argv)
 			setvbuf (assembly_file,NULL,_IOFBF,IO_BUF_SIZE);
 #endif
 		}
-	
+
 #ifdef GENERATE_OBJECT_FILE
 		initialize_assembler (obj_file);
 #endif
diff --git a/cgcode.c b/cgcode.c
index b5065f1..e2a212e 100644
--- a/cgcode.c
+++ b/cgcode.c
@@ -60,7 +60,7 @@
 #	include "cgpas.h"
 #	include "cgpwas.h"
 #else
-# if defined (I486) || defined (ARM)
+# ifdef I486
 #  ifdef G_AI64
 #	include "cgaas.h"
 #	include "cgawas.h"
@@ -69,11 +69,16 @@
 #	include "cgiwas.h"
 #  endif
 # else
-#  ifdef SOLARIS
-#	include "cgswas.h"
+#  ifdef ARM
+#	include "cgarmas.h"
+#	include "cgarmwas.h"
 #  else
-#	include "cgas.h"
-#	include "cgwas.h"
+#   ifdef SOLARIS
+#    include "cgswas.h"
+#   else
+#    include "cgas.h"
+#    include "cgwas.h"
+#   endif
 #  endif
 # endif
 #endif
-- 
cgit v1.2.3