* configure.in: Don't check for putenv.

	* configure: Regenerate.
	* gcc.c (putenv): Don't define.
	* vax/xm-vms.h: Handle putenv.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 89fa7cd..c63faee 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2001-04-02  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+       * configure.in: Don't check for putenv.
+       * configure: Regenerate.
+       * gcc.c (putenv): Don't define.
+       * vax/xm-vms.h: Handle putenv.
+
 2001-04-02  Jakub Jelinek  <jakub@redhat.com>
 
        * ifcvt.c (noce_emit_move_insn): New.

diff --git a/gcc/config/vax/xm-vms.h b/gcc/config/vax/xm-vms.h
index a19fc15..5cda840 100644 (file)
--- a/gcc/config/vax/xm-vms.h
+++ b/gcc/config/vax/xm-vms.h
@@ -101,6 +101,14 @@ Boston, MA 02111-1307, USA.  */
 /* vprintf() has been available since VMS V4.6.  */
 
 #define HAVE_VPRINTF
+
+/* Early versions of VAX C for VMS do not have putenv.  Comment out
+   the following define if your system doesn't have putenv.  */
+#define HAVE_PUTENV
+
+#ifndef HAVE_PUTENV
+#define putenv(x)
+#endif
 \f
 #if defined(VAXC) || defined(__DECC)
 

diff --git a/gcc/configure b/gcc/configure
index 1fe889a..2f97b6a 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -2018,7 +2018,7 @@ EOF
 fi
 
 # Find some useful tools
-for ac_prog in gawk mawk nawk awk
+for ac_prog in mawk gawk nawk awk
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -3099,7 +3099,7 @@ EOF
 fi
 
 
-for ac_func in strtoul bsearch putenv popen \
+for ac_func in strtoul bsearch popen \
        strchr strrchr kill getrlimit setrlimit atoll atoq \
        sysconf isascii gettimeofday strsignal putc_unlocked fputc_unlocked \
        fputs_unlocked getrusage iconv nl_langinfo

diff --git a/gcc/configure.in b/gcc/configure.in
index 910bf3e..a26f8a7 100644 (file)
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -544,7 +544,7 @@ fi
 dnl Disabled until we have a complete test for buggy enum bitfields.
 dnl gcc_AC_C_ENUM_BF_UNSIGNED
 
-AC_CHECK_FUNCS(strtoul bsearch putenv popen \
+AC_CHECK_FUNCS(strtoul bsearch popen \
        strchr strrchr kill getrlimit setrlimit atoll atoq \
        sysconf isascii gettimeofday strsignal putc_unlocked fputc_unlocked \
        fputs_unlocked getrusage iconv nl_langinfo)

diff --git a/gcc/gcc.c b/gcc/gcc.c
index a232554..4556988 100644 (file)
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -2009,60 +2009,6 @@ clear_failure_queue ()
   failure_delete_queue = 0;
 }
 \f
-/* Routine to add variables to the environment.  We do this to pass
-   the pathname of the gcc driver, and the directories search to the
-   collect2 program, which is being run as ld.  This way, we can be
-   sure of executing the right compiler when collect2 wants to build
-   constructors and destructors.  Since the environment variables we
-   use come from an obstack, we don't have to worry about allocating
-   space for them.  */
-
-#ifndef HAVE_PUTENV
-
-void
-putenv (str)
-     char *str;
-{
-#ifndef VMS                    /* nor about VMS */
-
-  extern char **environ;
-  char **old_environ = environ;
-  char **envp;
-  int num_envs = 0;
-  int name_len = 1;
-  int str_len = strlen (str);
-  char *p = str;
-  int ch;
-
-  while ((ch = *p++) != '\0' && ch != '=')
-    name_len++;
-
-  if (!ch)
-    abort ();
-
-  /* Search for replacing an existing environment variable, and
-     count the number of total environment variables.  */
-  for (envp = old_environ; *envp; envp++)
-    {
-      num_envs++;
-      if (!strncmp (str, *envp, name_len))
-       {
-         *envp = str;
-         return;
-       }
-    }
-
-  /* Add a new environment variable */
-  environ = (char **) xmalloc (sizeof (char *) * (num_envs + 2));
-  *environ = str;
-  memcpy ((char *) (environ + 1), (char *) old_environ,
-         sizeof (char *) * (num_envs + 1));
-
-#endif /* VMS */
-}
-
-#endif /* HAVE_PUTENV */
-\f
 /* Build a list of search directories from PATHS.
    PREFIX is a string to prepend to the list.
    If CHECK_DIR_P is non-zero we ensure the directory exists.