Whitespace fix in gdb.base/skip.exp

[deliverable/binutils-gdb.git] / gdb / producer.c

diff --git a/gdb/producer.c b/gdb/producer.c
index 3f9297ac1de8c915bb019f70c96b8e8c75763fdf..63ec2acb0d57b64554687e7c540b155729cb9af3 100644 (file)
--- a/gdb/producer.c
+++ b/gdb/producer.c
@@ -1,6 +1,6 @@
 /* Producer string parsers for GDB.
 
-   Copyright (C) 2012-2017 Free Software Foundation, Inc.
+   Copyright (C) 2012-2019 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -19,6 +19,7 @@
 
 #include "defs.h"
 #include "producer.h"
+#include "gdbsupport/selftest.h"
 
 /* See producer.h.  */
 
@@ -71,3 +72,147 @@ producer_is_gcc (const char *producer, int *major, int *minor)
   return 0;
 }
 
+
+/* See producer.h.  */
+
+bool
+producer_is_icc (const char *producer, int *major, int *minor)
+{
+  if (producer == NULL || !startswith (producer, "Intel(R)"))
+    return false;
+
+  /* Prepare the used fields.  */
+  int maj, min;
+  if (major == NULL)
+    major = &maj;
+  if (minor == NULL)
+    minor = &min;
+
+  *minor = 0;
+  *major = 0;
+
+  /* Consumes the string till a "Version" is found.  */
+  const char *cs = strstr (producer, "Version");
+  if (cs != NULL)
+    {
+      cs = skip_to_space (cs);
+
+      int intermediate = 0;
+      int nof = sscanf (cs, "%d.%d.%d.%*d", major, &intermediate, minor);
+
+      /* Internal versions are represented only as MAJOR.MINOR, where
+        minor is usually 0.
+        Public versions have 3 fields as described with the command
+        above.  */
+      if (nof == 3)
+       return true;
+
+      if (nof == 2)
+       {
+         *minor = intermediate;
+         return true;
+       }
+    }
+
+  static bool warning_printed = false;
+  /* Not recognized as Intel, let the user know.  */
+  if (!warning_printed)
+    {
+      warning (_("Could not recognize version of Intel Compiler in: \"%s\""),
+              producer);
+      warning_printed = true;
+    }
+  return false;
+}
+
+#if defined GDB_SELF_TEST
+namespace selftests {
+namespace producer {
+
+static void
+producer_parsing_tests ()
+{
+  {
+    /* Check that we don't crash if "Version" is not found in what
+       looks like an ICC producer string.  */
+    static const char icc_no_version[] = "Intel(R) foo bar";
+
+    int major = 0, minor = 0;
+    SELF_CHECK (!producer_is_icc (icc_no_version, &major, &minor));
+    SELF_CHECK (!producer_is_gcc (icc_no_version, &major, &minor));
+  }
+
+  {
+    static const char extern_f_14_1[] = "\
+Intel(R) Fortran Intel(R) 64 Compiler XE for applications running on \
+Intel(R) 64, \
+Version 14.0.1.074 Build 20130716";
+
+    int major = 0, minor = 0;
+    SELF_CHECK (producer_is_icc (extern_f_14_1, &major, &minor)
+               && major == 14 && minor == 1);
+    SELF_CHECK (!producer_is_gcc (extern_f_14_1, &major, &minor));
+  }
+
+  {
+    static const char intern_f_14[] = "\
+Intel(R) Fortran Intel(R) 64 Compiler XE for applications running on \
+Intel(R) 64, \
+Version 14.0";
+
+    int major = 0, minor = 0;
+    SELF_CHECK (producer_is_icc (intern_f_14, &major, &minor)
+               && major == 14 && minor == 0);
+    SELF_CHECK (!producer_is_gcc (intern_f_14, &major, &minor));
+  }
+
+  {
+    static const char intern_c_14[] = "\
+Intel(R) C++ Intel(R) 64 Compiler XE for applications running on \
+Intel(R) 64, \
+Version 14.0";
+    int major = 0, minor = 0;
+    SELF_CHECK (producer_is_icc (intern_c_14, &major, &minor)
+               && major == 14 && minor == 0);
+    SELF_CHECK (!producer_is_gcc (intern_c_14, &major, &minor));
+  }
+
+  {
+    static const char intern_c_18[] = "\
+Intel(R) C++ Intel(R) 64 Compiler for applications running on \
+Intel(R) 64, \
+Version 18.0 Beta";
+    int major = 0, minor = 0;
+    SELF_CHECK (producer_is_icc (intern_c_18, &major, &minor)
+               && major == 18 && minor == 0);
+  }
+
+  {
+    static const char gnu[] = "GNU C 4.7.2";
+    SELF_CHECK (!producer_is_icc (gnu, NULL, NULL));
+
+    int major = 0, minor = 0;
+    SELF_CHECK (producer_is_gcc (gnu, &major, &minor)
+               && major == 4 && minor == 7);
+  }
+
+  {
+    static const char gnu_exp[] = "GNU C++14 5.0.0 20150123 (experimental)";
+    int major = 0, minor = 0;
+    SELF_CHECK (!producer_is_icc (gnu_exp, NULL, NULL));
+    SELF_CHECK (producer_is_gcc (gnu_exp, &major, &minor)
+               && major == 5 && minor == 0);
+  }
+}
+}
+}
+#endif
+
+void
+_initialize_producer ()
+{
+#if defined GDB_SELF_TEST
+  selftests::register_test
+    ("producer-parser", selftests::producer::producer_parsing_tests);
+#endif
+}