2008-10-07 H.J. Lu <hongjiu.lu@intel.com>

[pf3gnuchains/gcc-fork.git] / gcc / config / i386 / xm-djgpp.h

diff --git a/gcc/config/i386/xm-djgpp.h b/gcc/config/i386/xm-djgpp.h
index 9a711fd..c3758ea 100644 (file)
--- a/gcc/config/i386/xm-djgpp.h
+++ b/gcc/config/i386/xm-djgpp.h
@@ -1,36 +1,29 @@
-/* Configuration for GNU C-compiler for Intel 80386 running DJGPP.
-   Copyright (C) 1988, 1996, 1998, 1999, 2000 Free Software Foundation, Inc.
+/* Configuration for GCC for Intel 80386 running DJGPP.
+   Copyright (C) 1988, 1996, 1998, 1999, 2000, 2001, 2004, 2007
+   Free Software Foundation, Inc.
 
-This file is part of GNU CC.
+This file is part of GCC.
 
-GNU CC is free software; you can redistribute it and/or modify
+GCC is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
-GNU CC is distributed in the hope that it will be useful,
+GCC is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */
 
 /* Use semicolons to separate elements of a path.  */
 #define PATH_SEPARATOR ';'
 
-#define EXECUTABLE_SUFFIX ".exe"
+#define HOST_EXECUTABLE_SUFFIX ".exe"
 
-/* Even though we support "/", allow "\" since everybody tests both.  */
-#define DIR_SEPARATOR '/'
-#define DIR_SEPARATOR_2 '\\'
-
-/* Allow test for DOS drive names.  */
-#define HAVE_DOS_BASED_FILE_SYSTEM
-
-/* System dependant initialization for collect2
+/* System dependent initialization for collect2
    to tell system() to act like Unix.  */
 #define COLLECT2_HOST_INITIALIZATION \
   do { __system_flags |= (__system_allow_multiple_cmds                 \
@@ -50,9 +43,6 @@ Boston, MA 02111-1307, USA.  */
       strcat (xref_file, xref_ext); \
   } while (0)
 
-/* Change /dev/env/DJDIR/prefix/dir/ to canonical form so gcc_exec_prefix
-   is set properly in 'gcc.c'. It also helps to cut down the number of times
-   the value of the DJGPP environment variable 'DJDIR' is evaluated.  */
 #undef GCC_DRIVER_HOST_INITIALIZATION
 #define GCC_DRIVER_HOST_INITIALIZATION \
   do { \
@@ -68,41 +58,27 @@ Boston, MA 02111-1307, USA.  */
            to try and figure out what's wrong.  */ \
         char *djgpp = getenv ("DJGPP"); \
         if (djgpp == NULL) \
-          fatal ("Environment variable DJGPP not defined."); \
+          fatal ("environment variable DJGPP not defined"); \
         else if (access (djgpp, R_OK) == 0) \
-          fatal ("Environment variable DJGPP points to missing file '%s'.", \
+          fatal ("environment variable DJGPP points to missing file '%s'", \
                  djgpp); \
         else \
-          fatal ("Environment variable DJGPP points to corrupt file '%s'.", \
+          fatal ("environment variable DJGPP points to corrupt file '%s'", \
                   djgpp); \
       } \
-    standard_exec_prefix = update_path (standard_exec_prefix, NULL); \
-    standard_bindir_prefix = update_path (standard_bindir_prefix, NULL); \
-    standard_startfile_prefix = update_path (standard_startfile_prefix, NULL); \
-    md_exec_prefix = update_path (md_exec_prefix, NULL); \
   } while (0)
 
-/* Canonicalize paths containing '/dev/env/', especially those in
-   prefix.c.  */
-#define UPDATE_PATH_HOST_CANONICALIZE(PATH, KEY) \
-  do { \
-    if (strncmp (PATH, "/dev/env/", sizeof("/dev/env/") - 1) == 0) \
-      { \
-        static char *djdir; \
-        static int djdir_len; \
-        static char fixed_path[FILENAME_MAX + 1]; \
-        char *new_path; \
-        /* The default prefixes all use '/dev/env/DJDIR', so optimize \
-           for this. All other uses of '/dev/env/' go through \
-           libc's canonicalization function.  */ \
-        _fixpath (PATH, fixed_path); \
-        /* _fixpath removes any trailing '/', so add it back.  */ \
-        strcat (fixed_path, "/"); \
-        new_path = xstrdup (fixed_path); \
-        PATH = new_path; \
-        return PATH; \
-      } \
-    /* If DIR_SEPARATOR_2 isn't in PATH, nothing more need be done.  */ \
-    if (strchr (PATH, DIR_SEPARATOR_2) == NULL) \
-      return PATH; \
-  } while (0)
+/* Canonicalize paths containing '/dev/env/'; used in prefix.c.
+   _fixpath is a djgpp-specific function to canonicalize a path.
+   "/dev/env/DJDIR" evaluates to "c:/djgpp" if DJDIR is "c:/djgpp" for
+   example.  It removes any trailing '/', so add it back.  */
+/* We cannot free PATH below as it can point to string constant  */
+#define UPDATE_PATH_HOST_CANONICALIZE(PATH) \
+  if (memcmp ((PATH), "/dev/env/", sizeof("/dev/env/") - 1) == 0) \
+    {                                          \
+      static char fixed_path[FILENAME_MAX + 1];        \
+                                               \
+      _fixpath ((PATH), fixed_path);           \
+      strcat (fixed_path, "/");                        \
+      (PATH) = xstrdup (fixed_path);           \
+    }