Fix the triplet regexp to recognize triplets, not only quadruplets

This allows triplets where the vendor is not set.

gdb/ChangeLog:
2015-03-31  Matthias Klose  <doko@ubuntu.com>

	* compile/compile.c (compile_to_object): Allow triplets with or
	without vendor set.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6c4bbe5eb0e04b3e8e07b5caf4722cb2535df52b..0dcb3a3d7f40db80f3ec3b39fa8ef6a380924647 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-31  Matthias Klose  <doko@ubuntu.com>
+
+       * compile/compile.c (compile_to_object): Allow triplets with or
+       without vendor set.
+
 2015-03-30  Doug Evans  <dje@google.com>
 
        PR c++/18141

diff --git a/gdb/compile/compile.c b/gdb/compile/compile.c
index 1d342a0d82c75bd9e2a4b0f2aa15aacf6bd1a06b..90cfc36ae1cf062a087396c840c68e1dcb5574fc 100644 (file)
--- a/gdb/compile/compile.c
+++ b/gdb/compile/compile.c
@@ -483,7 +483,9 @@ compile_to_object (struct command_line *cmd, char *cmd_string,
 
   os_rx = osabi_triplet_regexp (gdbarch_osabi (gdbarch));
   arch_rx = gdbarch_gnu_triplet_regexp (gdbarch);
-  triplet_rx = concat (arch_rx, "-[^-]*-", os_rx, (char *) NULL);
+
+  /* Allow triplets with or without vendor set.  */
+  triplet_rx = concat (arch_rx, "(-[^-]*)?-", os_rx, (char *) NULL);
   make_cleanup (xfree, triplet_rx);
 
   /* Set compiler command-line arguments.  */