From: Alan Modra <amodra@gmail.com>
Date: Mon, 29 Oct 2018 07:39:39 +0000 (+1030)
Subject: Simplify --sysroot=/
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=55d5520ae35a2b0ce788bd6d43dd619043e887f7;p=binutils-gdb.git

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=/".
---

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 4dfd2e82415..d2700bcf562 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+2018-10-29  Alan Modra  <amodra@gmail.com>
+
+	* ldmain.c (get_sysroot): Return "" for "--sysroot=/".
+
 2018-10-29  Alan Modra  <amodra@gmail.com>
 
 	* Makefile.am (ei386beos.c, ei386go32.c): Correct dependencies.
diff --git a/ld/ldmain.c b/ld/ldmain.c
index 464192049ab..6f3ce6f8100 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);
+
+  if (!path)
+    path = TARGET_SYSTEM_ROOT;
+
+  if (IS_DIR_SEPARATOR (*path) && path[1] == 0)
+    path = "";
 
-  return TARGET_SYSTEM_ROOT;
+  return path;
 }
 
 /* We need to find any explicitly given emulation in order to initialize the