aboutsummaryrefslogtreecommitdiff
path: root/gcc/lto-wrapper.c
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@codesourcery.com>2015-09-23 16:52:50 +0200
committerThomas Schwinge <tschwinge@gcc.gnu.org>2015-09-23 16:52:50 +0200
commit64186aad5abe1c3e1468f172589b55a6449d6fc2 (patch)
treee56994358815ca037270fe39c1df903fc8423e3f /gcc/lto-wrapper.c
parentf2c9f71da9fd748bb452e69e7825e5f28e7c741d (diff)
downloadgcc-64186aad5abe1c3e1468f172589b55a6449d6fc2.zip
gcc-64186aad5abe1c3e1468f172589b55a6449d6fc2.tar.gz
gcc-64186aad5abe1c3e1468f172589b55a6449d6fc2.tar.bz2
Fix --enable-offload-targets/-foffload handling, pt. 1
gcc/ * configure.ac (offload_targets, OFFLOAD_TARGETS): Separate offload targets by commas, not colons. * config.in: Regenerate. * configure: Likewise. * gcc.c (driver::maybe_putenv_COLLECT_LTO_WRAPPER): Due to that, instead of setting up the default offload targets here... (process_command): ..., do it here. libgomp/ * plugin/configfrag.ac (OFFLOAD_TARGETS): Clarify that offload targets are separated by commas. * config.h.in: Regenerate. From-SVN: r228053
Diffstat (limited to 'gcc/lto-wrapper.c')
-rw-r--r--gcc/lto-wrapper.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/gcc/lto-wrapper.c b/gcc/lto-wrapper.c
index 150d3684..e13a82a 100644
--- a/gcc/lto-wrapper.c
+++ b/gcc/lto-wrapper.c
@@ -594,6 +594,8 @@ append_offload_options (obstack *argv_obstack, const char *target,
else
{
opts = strchr (option->arg, '=');
+ /* If there are offload targets specified, but no actual options,
+ there is nothing to do here. */
if (!opts)
continue;
@@ -606,10 +608,12 @@ append_offload_options (obstack *argv_obstack, const char *target,
next = opts;
next = (next > opts) ? opts : next;
+ /* Are we looking for this offload target? */
if (strlen (target) == (size_t) (next - cur)
&& strncmp (target, cur, next - cur) == 0)
break;
+ /* Skip the comma or equal sign. */
cur = next + 1;
}