From 7dfe46cd7fff69425575989cbb1e5248b507578d Mon Sep 17 00:00:00 2001
From: Mark Pizzolato <mark@infocomm.com>
Date: Thu, 18 Apr 2013 17:16:46 -0700
Subject: [PATCH] Fixed generic compiler name report in SHOW VERSION and fixed
 make using Sun C compiler

---
 makefile | 4 ++--
 scp.c    | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/makefile b/makefile
index 4d2b4e27..a88a4b40 100644
--- a/makefile
+++ b/makefile
@@ -79,8 +79,8 @@ ifeq ($(WIN32),)  #*nix Environments (&& cygwin)
     ifeq (,$(GCC_VERSION))
       ifeq (SunOS,$(OSTYPE))
         ifneq (,$(shell $(GCC) -V 2>&1 | grep 'Sun C'))
-          SUNC_VERSION = $(shell $(GCC) -V 2>&1 | grep 'Sun C' | awk '{ print $$4 }')
-          COMPILER_NAME = Sun C $(SUNC_VERSION)
+          SUNC_VERSION = $(shell $(GCC) -V 2>&1 | grep 'Sun C')
+          COMPILER_NAME = $(wordlist 2,10,$(SUNC_VERSION))
         endif
       endif
     endif
diff --git a/scp.c b/scp.c
index 83237b2b..bcb3ff7f 100644
--- a/scp.c
+++ b/scp.c
@@ -2789,7 +2789,11 @@ if (flag) {
 #elif defined (__DECC_VER)
     fprintf (st, "\n\t\tCompiler: DEC C %c%d.%d-%03d", ("T SV")[((__DECC_VER/10000)%10)-6], __DECC_VER/10000000, (__DECC_VER/100000)%100, __DECC_VER%10000);
 #elif defined (SIM_COMPILER)
-    fprintf (st, "\n\t\tCompiler: %s", SIM_COMPILER);
+#define S_xstr(a) S_str(a)
+#define S_str(a) #a
+    fprintf (st, "\n\t\tCompiler: %s", S_xstr(SIM_COMPILER));
+#undef S_str
+#undef S_xstr
 #endif
 #if defined (__DATE__) && defined (__TIME__)
     fprintf (st, "\n\t\tSimulator Compiled: %s at %s", __DATE__, __TIME__);