From ed9fca3f20677f1cfafc1b9d00706e4167f81bd1 Mon Sep 17 00:00:00 2001 From: Andris Pavenis Date: Sun, 30 Sep 2001 04:34:42 +0300 Subject: [PATCH] xm-djgpp.h (GCC_DRIVER_HOST_INITIALIZATION): Don't update md_exec_prefix. * config/i386/xm-djgpp.h (GCC_DRIVER_HOST_INITIALIZATION): Don't update md_exec_prefix. (UPDATE_PATH_HOST_CANONICALIZE): Don't free PATH as it can point to string constant. From-SVN: r45892 --- gcc/ChangeLog | 7 +++++++ gcc/config/i386/xm-djgpp.h | 3 +-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c89d7c81ec3..c67af505d58 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2001-09-29 Andris Pavenis + + * config/i386/xm-djgpp.h (GCC_DRIVER_HOST_INITIALIZATION): Don't + update md_exec_prefix. + (UPDATE_PATH_HOST_CANONICALIZE): Don't free PATH as it can point + to string constant. + 2001-09-30 Ulrich Weigand * config/s390/s390.h (EXTRA_CC_MODES): Add CCLmode. diff --git a/gcc/config/i386/xm-djgpp.h b/gcc/config/i386/xm-djgpp.h index cad1abf64c1..2e5260e3e23 100644 --- a/gcc/config/i386/xm-djgpp.h +++ b/gcc/config/i386/xm-djgpp.h @@ -79,13 +79,13 @@ Boston, MA 02111-1307, USA. */ 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/'; 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) \ { \ @@ -93,6 +93,5 @@ Boston, MA 02111-1307, USA. */ \ _fixpath ((PATH), fixed_path); \ strcat (fixed_path, "/"); \ - free (PATH); \ (PATH) = xstrdup (fixed_path); \ }