OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove any trailing directory separator from ld_canon_sysroot and adjust ld_canon_sysroot_len. 

The problem was the ld expect libiberty/lrealpath() to always return a
path, but in some cases it returns a prefix. It seemed like too much of
an earthquake to propose a fix to lrealpath.

	* ldmain.c (main): Remove directory separator, if any, from the
	end of the canonicalized sysroot.
This commit is contained in:
Douglas B Rupp 2018-02-28 11:44:26 +00:00 committed by Nick Clifton
parent eef104664e
commit 889be5dbd2
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ld/ChangeLog
View File

@ -1,3 +1,8 @@
2018-02-28 Douglas B Rupp <rupp@adacore.com>
* ldmain.c (main): Remove directory separator, if any, from the
end of the canonicalized sysroot.
2018-02-27 H.J. Lu <hongjiu.lu@intel.com>
* NEWS: Mention --enable-separate-code.

9
ld/ldmain.c
View File

@ -228,7 +228,14 @@ main (int argc, char **argv)
if (*ld_sysroot)
ld_canon_sysroot = lrealpath (ld_sysroot);
if (ld_canon_sysroot)
ld_canon_sysroot_len = strlen (ld_canon_sysroot);
{
ld_canon_sysroot_len = strlen (ld_canon_sysroot);
/* is_sysrooted_pathname() relies on no trailing dirsep. */
if (ld_canon_sysroot_len > 0
&& IS_DIR_SEPARATOR (ld_canon_sysroot [ld_canon_sysroot_len - 1]))
ld_canon_sysroot [--ld_canon_sysroot_len] = '\0';
}
else
ld_canon_sysroot_len = -1;