merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 25c6cd1b77bd9c9d7db4a59f568e823de1f4b5f4..16f541ed27528fa94a865fd0da8c3e62e759060c 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-29  Douglas B Rupp  <rupp@gnat.com>
+
+       * make-temp-file.c (choose_tmpdir): Try standard temp logical on VMS.
+
 2009-07-27  Douglas B Rupp  <rupp@gnat.com>
 
        * pex-unix.c (vfork): Remove VMS specific definition (get from header

diff --git a/libiberty/make-temp-file.c b/libiberty/make-temp-file.c
index eadcf8502137f111a7463f0c6b59f6a633f58a3e..13e192565340266e80d40ff2bc56a8d6179b6325 100644 (file)
--- a/libiberty/make-temp-file.c
+++ b/libiberty/make-temp-file.c
@@ -1,5 +1,5 @@
 /* Utility to pick a temporary filename prefix.
-   Copyright (C) 1996, 1997, 1998, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 2001, 2009 Free Software Foundation, Inc.
 
 This file is part of the libiberty library.
 Libiberty is free software; you can redistribute it and/or
@@ -111,9 +111,14 @@ choose_tmpdir (void)
       char *tmpdir;
       unsigned int len;
       
+#ifdef VMS
+      /* Try VMS standard temp logical.  */
+      base = try_dir ("/sys$scratch", base);
+#else
       base = try_dir (getenv ("TMPDIR"), base);
       base = try_dir (getenv ("TMP"), base);
       base = try_dir (getenv ("TEMP"), base);
+#endif
       
 #ifdef P_tmpdir
       base = try_dir (P_tmpdir, base);