merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index 4ecae89bce45a517fed51e7294c0f6f811d726d0..95a7f00510b889853b5f499c57713d39aafad71b 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,35 @@
+2010-04-26  Pedro Alves  <pedro@codesourcery.com>
+
+       * filenames.h (PATH_SEPARATOR): Delete.
+
+2010-04-23  Pedro Alves  <pedro@codesourcery.com>
+
+       * filenames.h (IS_DIR_SEPARATOR_1): Rename from IS_DIR_SEPARATOR,
+       always define it independently of host, add `dos_based' parameter,
+       and handle it.
+       (PATH_SEPARATOR): Define.
+       (HAS_DRIVE_SPEC_1): Rename from HAS_DRIVE_SPEC, always define it
+       independently of host, add `dos_based' parameter, and handle it.
+       (IS_ABSOLUTE_PATH_1): Rename from IS_ABSOLUTE_PATH, always define
+       it independently of host, add `dos_based' parameter, and handle
+       it.
+       (IS_DOS_DIR_SEPARATOR, IS_DOS_ABSOLUTE_PATH)
+       (IS_UNIX_DIR_SEPARATOR, IS_UNIX_ABSOLUTE_PATH)
+       (HAS_DOS_DRIVE_SPEC): New.
+       (HAS_DRIVE_SPEC): Reimplement on top of HAS_DRIVE_SPEC_1.
+       (IS_DIR_SEPARATOR): Reimplement on top of IS_DIR_SEPARATOR_1.
+       (IS_ABSOLUTE_PATH): Reimplement on top of IS_ABSOLUTE_PATH_1.
+       * libiberty.h (dos_lbasename, unix_lbasename): Declare.
+
+2009-05-31  Ian Lance Taylor  <iant@google.com>
+
+       * ansidecl.h: Add extern "C" when compiling with C++.  Treat C++
+       the way we treat an ISO C compiler.  Don't define inline as a
+       macro when compiling with C++.
+       * dyn-string.h: Add header guard DYN_STRING_H.  Add extern "C"
+       when compiling with C++.
+       * fibheap.h: Add extern "C" when compiling with C++.
+
 2010-04-23  Pedro Alves  <pedro@codesourcery.com>
 
        * filenames.h (IS_DIR_SEPARATOR_1): Rename from IS_DIR_SEPARATOR,

diff --git a/include/filenames.h b/include/filenames.h
index ff4e5ac6e75d433dbc6b452ac213be6b96a50278..ca23d3253142436585bfb1c0c3d9793287fb0c61 100644 (file)
--- a/include/filenames.h
+++ b/include/filenames.h
@@ -34,12 +34,10 @@ extern "C" {
 #  ifndef HAVE_DOS_BASED_FILE_SYSTEM
 #    define HAVE_DOS_BASED_FILE_SYSTEM 1
 #  endif
-#  define PATH_SEPARATOR ';'
 #  define HAS_DRIVE_SPEC(f) HAS_DOS_DRIVE_SPEC (f)
 #  define IS_DIR_SEPARATOR(c) IS_DOS_DIR_SEPARATOR (c)
 #  define IS_ABSOLUTE_PATH(f) IS_DOS_ABSOLUTE_PATH (f)
 #else /* not DOSish */
-#  define PATH_SEPARATOR ':'
 #  define HAS_DRIVE_SPEC(f) (0)
 #  define IS_DIR_SEPARATOR(c) IS_UNIX_DIR_SEPARATOR (c)
 #  define IS_ABSOLUTE_PATH(f) IS_UNIX_ABSOLUTE_PATH (f)