From 27ba92a50c7abbfebf9f1fbc539c39f0011d2fd7 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Wed, 14 May 2025 17:09:45 +0200 Subject: [PATCH] ld: rename ldirname to stat_ldirname It conflicts with the ldirname function that will be added in the next libiberty sync. ld/: * ldlang.c (stat_ldirname): Rename from ldirname, all uses changed. --- ld/ldlang.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ld/ldlang.c b/ld/ldlang.c index e0368171fa9..32e6e7abdf1 100644 --- a/ld/ldlang.c +++ b/ld/ldlang.c @@ -322,7 +322,7 @@ spec_match (const struct wildcard_spec *spec, const char *name) } static char * -ldirname (const char *name) +stat_ldirname (const char *name) { const char *base = lbasename (name); @@ -1266,7 +1266,7 @@ new_afile (const char *name, /* If name is a relative path, search the directory of the current linker script first. */ if (from_filename && !IS_ABSOLUTE_PATH (name)) - p->extra_search_path = ldirname (from_filename); + p->extra_search_path = stat_ldirname (from_filename); p->flags.real = true; p->flags.search_dirs = true; break; -- 2.47.3