diff options
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/compile/compile.c | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6c4bbe5..0dcb3a3 100644 --- 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 1d342a0..90cfc36 100644 --- 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. */ |