aboutsummaryrefslogtreecommitdiff
path: root/ld
diff options
context:
space:
mode:
authorDouglas B Rupp <rupp@adacore.com>2018-02-28 11:44:26 +0000
committerNick Clifton <nickc@redhat.com>2018-02-28 11:44:26 +0000
commit889be5dbd230ee47a90d4a83f682b13ed7e3faae (patch)
tree7c4623776aa822c8320d6b7cbe134e5a9492078e /ld
parenteef104664efb52965d85a28bc3fc7c77e52e48e2 (diff)
downloadgdb-889be5dbd230ee47a90d4a83f682b13ed7e3faae.zip
gdb-889be5dbd230ee47a90d4a83f682b13ed7e3faae.tar.gz
gdb-889be5dbd230ee47a90d4a83f682b13ed7e3faae.tar.bz2
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.
Diffstat (limited to 'ld')
-rw-r--r--ld/ChangeLog5
-rw-r--r--ld/ldmain.c9
2 files changed, 13 insertions, 1 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 07c86ef..f6b7508 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -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.
diff --git a/ld/ldmain.c b/ld/ldmain.c
index b6914db..6527613 100644
--- a/ld/ldmain.c
+++ b/ld/ldmain.c
@@ -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;