cpplib.h (struct cpp_dir): Add new field, canonical_name.

libcpp/ChangeLog
	* include/cpplib.h (struct cpp_dir): Add new field, canonical_name.

gcc/ChangeLog

	* incpath.c: Use HOST_LACKS_INODE_NUMBERS conditional
	rather than OS names to choose INO_T_EQ definition.
	(DIRS_EQ) [!INO_T_EQ]: Don't worry about case in comparison.
	(add_path) [!INO_T_EQ]: Use lrealpath to fill canonical_name field.

From-SVN: r136196

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f4c3f5e0c2f599a93094f6d20126a891276dfdfe..aeff771692be73cabd97fdfbe78cacfd983d4ebd 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2008-05-30  Danny Smith  <dannysmith@users.sourceforge.net>
+
+       * incpath.c: Use HOST_LACKS_INODE_NUMBERS conditional
+       rather than OS names to choose INO_T_EQ definition.
+       (DIRS_EQ) [!INO_T_EQ]: Don't worry about case in comparison.
+       (add_path) [!INO_T_EQ]: Use lrealpath to fill canonical_name
+       field.
+
 2008-05-29  Daniel Franke  <franke.daniel@gmail.com>
 
        PR target/36348

diff --git a/gcc/incpath.c b/gcc/incpath.c
index e5fe8db23ca80e8fa5ca1a8ab6ebce604c9c56ab..761b1cf6305934d37af29d4b1735919d7d4a02c4 100644 (file)
--- a/gcc/incpath.c
+++ b/gcc/incpath.c
@@ -31,13 +31,12 @@
 #include "incpath.h"
 #include "cppdefault.h"
 
-/* Windows does not natively support inodes, and neither does MSDOS.
-   Cygwin's emulation can generate non-unique inodes, so don't use it.
+/* Microsoft Windows does not natively support inodes.
    VMS has non-numeric inodes.  */
 #ifdef VMS
 # define INO_T_EQ(A, B) (!memcmp (&(A), &(B), sizeof (A)))
 # define INO_T_COPY(DEST, SRC) memcpy(&(DEST), &(SRC), sizeof (SRC))
-#elif !((defined _WIN32 && !defined (_UWIN)) || defined __MSDOS__)
+#elif !defined (HOST_LACKS_INODE_NUMBERS)
 # define INO_T_EQ(A, B) ((A) == (B))
 # define INO_T_COPY(DEST, SRC) (DEST) = (SRC)
 #endif
@@ -46,7 +45,7 @@
 #define DIRS_EQ(A, B) ((A)->dev == (B)->dev \
        && INO_T_EQ((A)->ino, (B)->ino))
 #else
-#define DIRS_EQ(A, B) (!strcasecmp ((A)->name, (B)->name))
+#define DIRS_EQ(A, B) (!strcmp ((A)->canonical_name, (B)->canonical_name))
 #endif
 
 static const char dir_separator_str[] = { DIR_SEPARATOR, 0 };
@@ -408,6 +407,9 @@ add_path (char *path, int chain, int cxx_aware, bool user_supplied_p)
   p = XNEW (cpp_dir);
   p->next = NULL;
   p->name = path;
+#ifndef INO_T_EQ
+  p->canonical_name = lrealpath (path);
+#endif
   if (chain == SYSTEM || chain == AFTER)
     p->sysp = 1 + !cxx_aware;
   else

diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index 7f31ff4e79a8990cde7c635e0d53a192ca9ac8ad..6df683eee916b8f36988839f8ca03ace077e708d 100644 (file)
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-30  Danny Smith  <dannysmith@users.sourceforge.net>
+
+       * include/cpplib.h (struct cpp_dir): Add new field, canonical_name.
+
 2008-05-21  Tom Tromey  <tromey@redhat.com>
 
        PR preprocessor/27777:

diff --git a/libcpp/include/cpplib.h b/libcpp/include/cpplib.h
index 76288a9068cffca444ff5899cc3807e523dc44a2..92ab291db2cdd350d51100e472550ff944e71d79 100644 (file)
--- a/libcpp/include/cpplib.h
+++ b/libcpp/include/cpplib.h
@@ -508,6 +508,10 @@ struct cpp_dir
   char *name;
   unsigned int len;
 
+  /* The canonicalized NAME as determined by lrealpath.  This field 
+     is only used by hosts that lack reliable inode numbers.  */
+  char *canonical_name;
+
   /* One if a system header, two if a system header that has extern
      "C" guards for C++.  */
   unsigned char sysp;