From 55d5520ae35a2b0ce788bd6d43dd619043e887f7 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 29 Oct 2018 18:09:39 +1030 Subject: [PATCH] Simplify --sysroot=/ Prepending '/' to absolute paths doesn't gain us much, and results in the current implementation of --trace emitting silly path-in-sysroot output, eg. /lib/ld-linux-x86-64.so.2 (//lib/ld-linux-x86-64.so.2) * ldmain.c (get_sysroot): Return "" for "--sysroot=/". --- ld/ChangeLog | 4 ++++ ld/ldmain.c | 22 +++++++++++++--------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 4dfd2e8241..d2700bcf56 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,7 @@ +2018-10-29 Alan Modra + + * ldmain.c (get_sysroot): Return "" for "--sysroot=/". + 2018-10-29 Alan Modra * Makefile.am (ei386beos.c, ei386go32.c): Correct dependencies. diff --git a/ld/ldmain.c b/ld/ldmain.c index 464192049a..6f3ce6f810 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c @@ -584,21 +584,25 @@ static const char * get_sysroot (int argc, char **argv) { int i; - const char *path; + const char *path = NULL; for (i = 1; i < argc; i++) if (CONST_STRNEQ (argv[i], "--sysroot=")) - return argv[i] + strlen ("--sysroot="); + path = argv[i] + strlen ("--sysroot="); - path = get_relative_sysroot (BINDIR); - if (path) - return path; + if (!path) + path = get_relative_sysroot (BINDIR); - path = get_relative_sysroot (TOOLBINDIR); - if (path) - return path; + if (!path) + path = get_relative_sysroot (TOOLBINDIR); - return TARGET_SYSTEM_ROOT; + if (!path) + path = TARGET_SYSTEM_ROOT; + + if (IS_DIR_SEPARATOR (*path) && path[1] == 0) + path = ""; + + return path; } /* We need to find any explicitly given emulation in order to initialize the