Fixed compiler version info to display the C++ compiler name correctly when using...

Change-Id: I4b61e6262b522ce093f0c51d11226be0d1e992a5
Signed-off-by: Botond Baranyi <botond.baranyi@ericsson.com>

diff --git a/common/version_internal.h b/common/version_internal.h
index 14316f23707b02b57f76fa8df8c0ab5bdd66fd39..9b9a0bd6ad8c313f7e363271ed17d734af0e4542 100644 (file)
--- a/common/version_internal.h
+++ b/common/version_internal.h
@@ -12,6 +12,7 @@
  *   Lovassy, Arpad
  *   Raduly, Csaba
  *   Szabados, Kristof
+ *   Szabo, Bence Janos
  *   Szabo, Janos Zoltan – initial implementation
  *
  ******************************************************************************/
@@ -123,17 +124,29 @@
 /* Version of the C/C++ compiler */
 
 #if defined(__GNUC__)
-  /* the code is compiled with GCC */
-# ifdef __GNUC_PATCHLEVEL__
-   /* the patch number is known (version 3.0 or later) */
-#  define GEN_COMP_VER2(major, minor, patchlevel) "GCC " #major "." #minor "." #patchlevel
-#  define GEN_COMP_VER(major, minor, patchlevel) GEN_COMP_VER2(major, minor, patchlevel)
-#  define C_COMPILER_VERSION GEN_COMP_VER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
+# ifdef __clang__
+#  ifdef __clang_patchlevel__
+#    define GEN_COMP_VER2(major, minor, patchlevel) "clang " #major "." #minor "." #patchlevel
+#    define GEN_COMP_VER(major, minor, patchlevel) GEN_COMP_VER2(major, minor, patchlevel)
+#    define C_COMPILER_VERSION GEN_COMP_VER(__clang_major__, __clang_minor__, __clang_patchlevel__)
+#  else
+#    define GEN_COMP_VER2(major, minor) "clang " #major "." #minor ".?"
+#    define GEN_COMP_VER(major, minor) GEN_COMP_VER2(major, minor)
+#    define C_COMPILER_VERSION GEN_COMP_VER(__clang_major__, __clang_minor__)
+#  endif
 # else
-   /* the patch number is unknown (version 2.x.?) */
-#  define GEN_COMP_VER2(major, minor) "GCC " #major "." #minor ".?"
-#  define GEN_COMP_VER(major, minor) GEN_COMP_VER2(major, minor)
-#  define C_COMPILER_VERSION GEN_COMP_VER(__GNUC__, __GNUC_MINOR__)
+    /* the code is compiled with GCC */
+#  ifdef __GNUC_PATCHLEVEL__
+     /* the patch number is known (version 3.0 or later) */
+#    define GEN_COMP_VER2(major, minor, patchlevel) "GCC " #major "." #minor "." #patchlevel
+#    define GEN_COMP_VER(major, minor, patchlevel) GEN_COMP_VER2(major, minor, patchlevel)
+#    define C_COMPILER_VERSION GEN_COMP_VER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
+#  else
+     /* the patch number is unknown (version 2.x.?) */
+#    define GEN_COMP_VER2(major, minor) "GCC " #major "." #minor ".?"
+#    define GEN_COMP_VER(major, minor) GEN_COMP_VER2(major, minor)
+#    define C_COMPILER_VERSION GEN_COMP_VER(__GNUC__, __GNUC_MINOR__)
+#  endif
 # endif
 #elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
   /* the code is compiled with Sun Workshop C/C++ compiler */