merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index 75c4753b77d755d142f1b76dea3087c786a5785e..269409ca630ce0450cd36385d74569ed36f704f9 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-29  Joel Brobecker  <brobecker@adacore.com>
+
+       * filenames.h (FILENAME_CMP): Adjust define to call filename_cmp
+       regardless of the type of file system.
+
 2007-03-06  Jan Hubicka  <jh@suse.cz>
 
        * ansidecl.h (ATTRIBUTE_COLD, ATTRIBUTE_HOT): New.

diff --git a/include/filenames.h b/include/filenames.h
index 6b72fd249b40363753beffc3eef912429323cb3b..5338208e0242dcfb8e9786b0319f2d249166172c 100644 (file)
--- a/include/filenames.h
+++ b/include/filenames.h
@@ -5,7 +5,7 @@
    use forward- and back-slash in path names interchangeably, and
    some of them have case-insensitive file names.
 
-   Copyright 2000, 2001 Free Software Foundation, Inc.
+   Copyright 2000, 2001, 2007 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -38,14 +38,15 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
    want to know whether to prepend the current working directory to
    a file name, which should not be done with a name like d:foo.  */
 #define IS_ABSOLUTE_PATH(f)    (IS_DIR_SEPARATOR((f)[0]) || (((f)[0]) && ((f)[1] == ':')))
-#define FILENAME_CMP(s1, s2)   strcasecmp(s1, s2)
 
 #else  /* not DOSish */
 
 #define IS_DIR_SEPARATOR(c)    ((c) == '/')
 #define IS_ABSOLUTE_PATH(f)    (IS_DIR_SEPARATOR((f)[0]))
-#define FILENAME_CMP(s1, s2)   strcmp(s1, s2)
 
 #endif /* not DOSish */
 
+extern int filename_cmp (const char *s1, const char *s2);
+#define FILENAME_CMP(s1, s2)   filename_cmp(s1, s2)
+
 #endif /* FILENAMES_H */