Sun Jul 30 06:24:25 2023 UTC ()
fix merge botch.


(mrg)
diff -r1.8 -r1.9 src/external/gpl3/gcc/dist/libiberty/make-temp-file.c
cvs diff -r1.8 -r1.9 src/external/gpl3/gcc/dist/libiberty/make-temp-file.c (expand / switch to unified diff)

--- src/external/gpl3/gcc/dist/libiberty/make-temp-file.c 2023/07/30 05:51:39 1.8
+++ src/external/gpl3/gcc/dist/libiberty/make-temp-file.c 2023/07/30 06:24:25 1.9
@@ -133,27 +133,27 @@ choose_tmpdir (void) @@ -133,27 +133,27 @@ choose_tmpdir (void)
133#endif 133#endif
134  134
135#ifdef P_tmpdir 135#ifdef P_tmpdir
136 /* We really want a directory name here as if concatenated with say \dir 136 /* We really want a directory name here as if concatenated with say \dir
137 we do not end up with a double \\ which defines an UNC path. */ 137 we do not end up with a double \\ which defines an UNC path. */
138 if (strcmp (P_tmpdir, "\\") == 0) 138 if (strcmp (P_tmpdir, "\\") == 0)
139 base = try_dir ("\\.", base); 139 base = try_dir ("\\.", base);
140 else 140 else
141 base = try_dir (P_tmpdir, base); 141 base = try_dir (P_tmpdir, base);
142#endif 142#endif
143 143
144 /* Try /tmp, then /var/tmp. */ 144 /* Try /tmp, then /var/tmp. */
145 base = try_dir (tmp, base); 145 base = try_dir (tmp, base);
146 base = try_dir (usrtmp, base); 146 base = try_dir (vartmp, base);
147  147
148 /* If all else fails, use the current directory! */ 148 /* If all else fails, use the current directory! */
149 if (base == 0) 149 if (base == 0)
150 base = "."; 150 base = ".";
151 /* Append DIR_SEPARATOR to the directory we've chosen 151 /* Append DIR_SEPARATOR to the directory we've chosen
152 and return it. */ 152 and return it. */
153 len = strlen (base); 153 len = strlen (base);
154 tmpdir = XNEWVEC (char, len + 2); 154 tmpdir = XNEWVEC (char, len + 2);
155 strcpy (tmpdir, base); 155 strcpy (tmpdir, base);
156 tmpdir[len] = DIR_SEPARATOR; 156 tmpdir[len] = DIR_SEPARATOR;
157 tmpdir[len+1] = '\0'; 157 tmpdir[len+1] = '\0';
158 memoized_tmpdir = tmpdir; 158 memoized_tmpdir = tmpdir;
159#else /* defined(_WIN32) && !defined(__CYGWIN__) */ 159#else /* defined(_WIN32) && !defined(__CYGWIN__) */