Skip to content

R
riscv-gcc-1
Commit bc9fadfb by David Edelsohn
Options

append / to AIX import path if not present 

From-SVN: r11275
parent e8d791dd
Showing with 6 additions and 2 deletions
gcc/collect2.c
...@@ -2616,6 +2616,7 @@ scan_libraries (prog_name) ...@@ -2616,6 +2616,7 @@ scan_libraries (prog_name)
char *impmem = implib + strlen (implib) + 1; char *impmem = implib + strlen (implib) + 1;
char *soname = NULL; char *soname = NULL;
char *trial; char *trial;
int pathlen;
LDFILE *libptr = NULL; LDFILE *libptr = NULL;
struct prefix_list *pl; struct prefix_list *pl;
ARCHDR ah; ARCHDR ah;
...@@ -2627,12 +2628,15 @@ scan_libraries (prog_name) ...@@ -2627,12 +2628,15 @@ scan_libraries (prog_name)
if (*impath == '/' && *(impath+1) == '\0' if (*impath == '/' && *(impath+1) == '\0'
&& strcmp (implib, "unix") == 0) && strcmp (implib, "unix") == 0)
continue; continue;
trial = alloca (MAX (strlen (impath), libpath.max_len) pathlen = strlen (impath);
trial = alloca (MAX (pathlen + 1, libpath.max_len)
+ strlen (implib) + 1); + strlen (implib) + 1);
if (*impath) if (*impath)
{ {
strcpy (trial, impath); strcpy (trial, impath);
strcat (trial, implib); if (impath[pathlen - 1] != '/')
trial[pathlen++] = '/';
strcpy (trial + pathlen, implib);
if (access (trial, R_OK) == 0) if (access (trial, R_OK) == 0)
soname = trial; soname = trial;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment