summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorneil <neil@138bc75d-0d04-0410-961f-82ee72b054a4>2001-03-10 10:43:52 +0000
committerneil <neil@138bc75d-0d04-0410-961f-82ee72b054a4>2001-03-10 10:43:52 +0000
commit79db8ea819caa42d9b166b78eb7c38d4cba12f1d (patch)
tree14fc3d96b29e3a9f455b47391b31f26822d7c419
parent0bce9b89bb0f42bf6347e7478104c3d1f75f375c (diff)
downloadppe42-gcc-79db8ea819caa42d9b166b78eb7c38d4cba12f1d.tar.gz
ppe42-gcc-79db8ea819caa42d9b166b78eb7c38d4cba12f1d.zip
* cppfiles.c (search_from): Use lbasename.
* mkdeps.c (deps_add_default_target): Use lbasename. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@40364 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/cppfiles.c6
-rw-r--r--gcc/mkdeps.c2
3 files changed, 7 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e8a825d247f..43a6ffeb0a0 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-10 Neil Booth <neil@daikokuya.demon.co.uk>
+
+ * cppfiles.c (search_from): Use lbasename.
+ * mkdeps.c (deps_add_default_target): Use lbasename.
+
2001-03-09 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* fixinc/server.c (load_data, run_shell): Use xmalloc, xrealloc &
diff --git a/gcc/cppfiles.c b/gcc/cppfiles.c
index 7f15a8d24ca..b9c03d055f1 100644
--- a/gcc/cppfiles.c
+++ b/gcc/cppfiles.c
@@ -804,11 +804,7 @@ search_from (pfile, inc)
if (CPP_OPTION (pfile, ignore_srcdir))
return CPP_OPTION (pfile, quote_include);
- /* basename () on Solaris returns "." for an empty string. */
- dlen = 0;
- if (inc->name[0] != '\0')
- dlen = basename (inc->name) - inc->name;
-
+ dlen = lbasename (inc->name) - inc->name;
if (dlen)
{
/* We don't guarantee NAME is null-terminated. This saves
diff --git a/gcc/mkdeps.c b/gcc/mkdeps.c
index 14935b328a6..8afd75e7416 100644
--- a/gcc/mkdeps.c
+++ b/gcc/mkdeps.c
@@ -191,7 +191,7 @@ deps_add_default_target (d, tgt)
#ifndef OBJECT_SUFFIX
# define OBJECT_SUFFIX ".o"
#endif
- char *start = basename (tgt);
+ char *start = lbasename (tgt);
char *o = (char *) alloca (strlen (start) + strlen (OBJECT_SUFFIX) + 1);
char *suffix;
OpenPOWER on IntegriCloud