--- imach/src/imach.c 2015/01/03 16:45:04 1.176 +++ imach/src/imach.c 2015/01/04 09:35:48 1.178 @@ -1,6 +1,12 @@ -/* $Id: imach.c,v 1.176 2015/01/03 16:45:04 brouard Exp $ +/* $Id: imach.c,v 1.178 2015/01/04 09:35:48 brouard Exp $ $State: Exp $ $Log: imach.c,v $ + Revision 1.178 2015/01/04 09:35:48 brouard + *** empty log message *** + + Revision 1.177 2015/01/03 18:40:56 brouard + Summary: Still testing ilc32 on OSX + Revision 1.176 2015/01/03 16:45:04 brouard *** empty log message *** @@ -626,11 +632,11 @@ typedef struct { #define ODIRSEPARATOR '\\' #endif -/* $Id: imach.c,v 1.176 2015/01/03 16:45:04 brouard Exp $ */ +/* $Id: imach.c,v 1.178 2015/01/04 09:35:48 brouard Exp $ */ /* $State: Exp $ */ char version[]="Imach version 0.98p, December 2014,INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121), Intel Software 2015"; -char fullversion[]="$Revision: 1.176 $ $Date: 2015/01/03 16:45:04 $"; +char fullversion[]="$Revision: 1.178 $ $Date: 2015/01/04 09:35:48 $"; char strstart[80]; char optionfilext[10], optionfilefiname[FILENAMELENGTH]; int erreur=0, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings */ @@ -5504,20 +5510,27 @@ BOOL IsWow64() return bIsWow64 != FALSE; } #endif + void syscompilerinfo() { /* #include "syscompilerinfo.h"*/ -#if defined(__GNUC__) -#include /* Only on gnu */ -struct utsname sysInfo; -#endif -#include +#if defined __INTEL_COMPILER +#if defined(__GNUC__) + struct utsname sysInfo; /* For Intel on Linux and OS/X */ +#endif +#elif defined(__GNUC__) +#include /* Only on gnu */ + struct utsname sysInfo; int cross = CROSS; if (cross){ - printf("Cross-"); - fprintf(ficlog,"Cross-"); + printf("Cross-"); + fprintf(ficlog, "Cross-"); } +#endif + +#include + printf("Compiled with:");fprintf(ficlog,"Compiled with:"); #if defined(__clang__) printf(" Clang/LLVM");fprintf(ficlog," Clang/LLVM"); /* Clang/LLVM. ---------------------------------------------- */ @@ -5596,9 +5609,10 @@ struct utsname sysInfo; } else perror("uname() error"); +#ifndef __INTEL_COMPILER printf("GNU libc version: %s\n", gnu_get_libc_version()); fprintf(ficlog,"GNU libc version: %s\n", gnu_get_libc_version()); - +#endif #endif // void main() @@ -5610,7 +5624,7 @@ struct utsname sysInfo; } else{ printf("The process is not running under WOW64 (i.e probably on a 64bit Windows).\n"); - frintf(ficlog,"The programm is not running under WOW64 (i.e probably on a 64bit Windows).\n"); + fprintf(ficlog,"The programm is not running under WOW64 (i.e probably on a 64bit Windows).\n"); } // printf("\nPress Enter to continue..."); // getchar();