2014-11-13 Dominique Dhumieres <dominiq@lps.ens.fr>

	PR bootstrap/63853
gcc/
	* gcc.c (handle_foffload_option): Replace strchrnul with strchr.
	* lto-wrapper.c (parse_env_var, append_offload_options): Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@217524 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5fe2834..25da2a0 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-13  Dominique Dhumieres  <dominiq@lps.ens.fr>
+
+       PR bootstrap/63853
+       * gcc.c (handle_foffload_option): Replace strchrnul with strchr.
+       * lto-wrapper.c (parse_env_var, append_offload_options): Likewise.
+
 2014-11-13  Alan Lawrence  <alan.lawrence@arm.com>
 
        * fold-const.c (const_binop): Remove code handling VEC_RSHIFT_EXPR.

diff --git a/gcc/gcc.c b/gcc/gcc.c
index 4422fa0..653ca8d 100644 (file)
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -3375,12 +3375,16 @@ handle_foffload_option (const char *arg)
   if (arg[0] == '-')
     return;
 
-  end = strchrnul (arg, '=');
+  end = strchr (arg, '=');
+  if (end == NULL)
+    end = strchr (arg, '\0');
   cur = arg;
 
   while (cur < end)
     {
-      next = strchrnul (cur, ',');
+      next = strchr (cur, ',');
+      if (next == NULL)
+       next = strchr (cur, '\0');
       next = (next > end) ? end : next;
 
       target = XNEWVEC (char, next - cur + 1);
@@ -3400,7 +3404,9 @@ handle_foffload_option (const char *arg)
       c = OFFLOAD_TARGETS;
       while (c)
        {
-         n = strchrnul (c, ',');
+         n = strchr (c, ',');
+         if (n == NULL)
+           n = strchr (c, '\0');
 
          if (strlen (target) == (size_t) (n - c)
              && strncmp (target, c, n - c) == 0)
@@ -3421,7 +3427,9 @@ handle_foffload_option (const char *arg)
          c = offload_targets;
          do
            {
-             n = strchrnul (c, ':');
+             n = strchr (c, ':');
+             if (n == NULL)
+               n = strchr (c, '\0');
 
              if (strlen (target) == (size_t) (n - c)
                  && strncmp (c, target, n - c) == 0)

diff --git a/gcc/lto-wrapper.c b/gcc/lto-wrapper.c
index de73ebc..951a2dd 100644 (file)
--- a/gcc/lto-wrapper.c
+++ b/gcc/lto-wrapper.c
@@ -424,7 +424,9 @@ parse_env_var (const char *str, char ***pvalues, const char *append)
 
   values = (char**) xmalloc (num * sizeof (char*));
   curval = str;
-  nextval = strchrnul (curval, ':');
+  nextval = strchr (curval, ':');
+  if (nextval == NULL)
+    nextval = strchr (curval, '\0');
 
   int append_len = append ? strlen (append) : 0;
   for (i = 0; i < num; i++)
@@ -436,7 +438,9 @@ parse_env_var (const char *str, char ***pvalues, const char *append)
       if (append)
        strcat (values[i], append);
       curval = nextval + 1;
-      nextval = strchrnul (curval, ':');
+      nextval = strchr (curval, ':');
+      if (nextval == NULL)
+       nextval = strchr (curval, '\0');
     }
   *pvalues = values;
   return num;
@@ -581,7 +585,9 @@ append_offload_options (obstack *argv_obstack, const char *target,
 
          while (cur < opts)
            {
-             next = strchrnul (cur, ',');
+             next = strchr (cur, ',');
+             if (next == NULL)
+               next = strchr (cur, '\0');
              next = (next > opts) ? opts : next;
 
              if (strlen (target) == (size_t) (next - cur)