folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed generic compiler name report in SHOW VERSION and fixed make using Sun C compiler

Browse source
This commit is contained in:
Mark Pizzolato 2013-04-18 17:16:46 -07:00
parent 5c9288a3d9
commit 7dfe46cd7f
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
makefile
View file

@ -79,8 +79,8 @@ ifeq ($(WIN32),) #*nix Environments (&& cygwin)
ifeq (,$(GCC_VERSION)) ifeq (,$(GCC_VERSION))
ifeq (SunOS,$(OSTYPE)) ifeq (SunOS,$(OSTYPE))
ifneq (,$(shell $(GCC) -V 2>&1 | grep 'Sun C')) ifneq (,$(shell $(GCC) -V 2>&1 | grep 'Sun C'))
SUNC_VERSION = $(shell $(GCC) -V 2>&1 | grep 'Sun C' | awk '{ print $$4 }') SUNC_VERSION = $(shell $(GCC) -V 2>&1 | grep 'Sun C')
COMPILER_NAME = Sun C $(SUNC_VERSION) COMPILER_NAME = $(wordlist 2,10,$(SUNC_VERSION))
endif endif
endif endif
endif endif

6
scp.c
View file

@ -2789,7 +2789,11 @@ if (flag) {
#elif defined (__DECC_VER) #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); 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) #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 #endif
#if defined (__DATE__) && defined (__TIME__) #if defined (__DATE__) && defined (__TIME__)
fprintf (st, "\n\t\tSimulator Compiled: %s at %s", __DATE__, __TIME__); fprintf (st, "\n\t\tSimulator Compiled: %s at %s", __DATE__, __TIME__);