* collect2.c (IS_DIR_SEPARATOR): Define.

        (prefix_from_string): Use IS_DIR_SEPARATOR and DIR_SEPARATOR.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@30182 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a9763a1..d6a8cbb 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -17,6 +17,9 @@ Mon Oct 25 23:10:45 1999  Andreas Schwab  <schwab@suse.de>
 
 Mon Oct 25 23:03:09 1999  Jeffrey A Law  (law@cygnus.com)
 
+       * collect2.c (IS_DIR_SEPARATOR): Define.
+       (prefix_from_string): Use IS_DIR_SEPARATOR and DIR_SEPARATOR.
+
        * som.h (ASM_DECLARE_FUNCTION_NAME): Set PRIV_LEV for static
        functions too.
 

diff --git a/gcc/collect2.c b/gcc/collect2.c
index 64101bf..9138bcd 100644 (file)
--- a/gcc/collect2.c
+++ b/gcc/collect2.c
@@ -49,6 +49,17 @@ Boston, MA 02111-1307, USA.  */
 #include "obstack.h"
 #include "intl.h"
 
+#ifndef DIR_SEPARATOR
+# define IS_DIR_SEPARATOR(ch) ((ch) == '/')
+#else /* DIR_SEPARATOR */
+# ifndef DIR_SEPARATOR_2
+#  define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
+# else /* DIR_SEPARATOR && DIR_SEPARATOR_2 */
+#  define IS_DIR_SEPARATOR(ch) \
+       (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+# endif /* DIR_SEPARATOR && DIR_SEPARATOR_2 */
+#endif /* DIR_SEPARATOR */
+
 /* Obstack allocation and deallocation routines.  */
 #define obstack_chunk_alloc xmalloc
 #define obstack_chunk_free free
@@ -810,9 +821,9 @@ prefix_from_string (p, pprefix)
            {
              strcpy (nstore, "./");
            }
-         else if (endp[-1] != '/')
+         else if (! IS_DIR_SEPARATOR (endp[-1]))
            {
-             nstore[endp-startp] = '/';
+             nstore[endp-startp] = DIR_SEPARATOR;
              nstore[endp-startp+1] = 0;
            }
          else