diff options
author | jsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-06-14 20:11:37 +0000 |
---|---|---|
committer | jsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-06-14 20:11:37 +0000 |
commit | 3e87b9805fa6658a46a068e835a004005bcef879 (patch) | |
tree | fbc63c1e6ab5dbc70fa471c1f8ba73b1a4c9e4e5 /gcc/prefix.c | |
parent | 771e289076fb404b3af142ccbc1ce7251ae95ee6 (diff) | |
download | gcc-3e87b9805fa6658a46a068e835a004005bcef879.tar.gz |
* common/common-target-def.h, common/common-target.def,
common/common-target.h, common/config/default-common.c,
common/config/pa/pa-common.c: New files.
* Makefile.in (common_out_file, common_out_object_file,
COMMON_TARGET_H, COMMON_TARGET_DEF_H): New.
(OBJS-libcommon-target): Include $(common_out_object_file).
(prefix.o): Update dependencies.
($(common_out_object_file), common/common-target-hooks-def.h,
s-common-target-hooks-def-h): New.
(s-tm-texi): Also check timestamp on common-target.def.
(build/genhooks.o): Update dependencies.
* config.gcc (common_out_file, target_has_targetm_common): Define.
* config/pa/som.h (ALWAYS_STRIP_DOTDOT): Replace with
TARGET_ALWAYS_STRIP_DOTDOT.
* configure.ac (common_out_object_file): Define.
(common_out_file, common_out_object_file): Substitute.
(common): Create directory.
* configure: Regenerate.
* doc/tm.texi.in (targetm_common): Document.
(TARGET_ALWAYS_STRIP_DOTDOT): Add @hook entry.
* doc/tm.texi: Regenerate.
* genhooks.c (hook_array): Also include common/common-target.def.
* prefix.c (tm.h): Don't include.
(common/common-target.h): Include.
(ALWAYS_STRIP_DOTDOT): Don't define.
(update_path): Use targetm_common.always_strip_dotdot instead of
ALWAYS_STRIP_DOTDOT.
* system.h (ALWAYS_STRIP_DOTDOT): Poison.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@175052 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/prefix.c')
-rw-r--r-- | gcc/prefix.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/gcc/prefix.c b/gcc/prefix.c index 90261ae6ffe..369ede70309 100644 --- a/gcc/prefix.c +++ b/gcc/prefix.c @@ -1,6 +1,6 @@ /* Utility to update paths from internal to external forms. Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, - 2007 Free Software Foundation, Inc. + 2007, 2011 Free Software Foundation, Inc. This file is part of GCC. @@ -67,11 +67,11 @@ License along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "tm.h" #if defined(_WIN32) && defined(ENABLE_WIN32_REGISTRY) #include <windows.h> #endif #include "prefix.h" +#include "common/common-target.h" static const char *std_prefix = PREFIX; @@ -271,10 +271,6 @@ update_path (const char *path, const char *key) else result = xstrdup (path); -#ifndef ALWAYS_STRIP_DOTDOT -#define ALWAYS_STRIP_DOTDOT 0 -#endif - p = result; while (1) { @@ -289,7 +285,8 @@ update_path (const char *path, const char *key) && (p != result && IS_DIR_SEPARATOR (p[-1]))) { *p = 0; - if (!ALWAYS_STRIP_DOTDOT && access (result, X_OK) == 0) + if (!targetm_common.always_strip_dotdot + && access (result, X_OK) == 0) { *p = '.'; break; |