diff options
| author | jsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-01-21 21:57:57 +0000 |
|---|---|---|
| committer | jsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-01-21 21:57:57 +0000 |
| commit | 65d26e11e7f386872407f865c77c442ca645040c (patch) | |
| tree | 65577762d18be0904ba33fedfa116a6364b01d5c | |
| parent | df5b74ca051dd9253112b5e870eb21d24ae6e51c (diff) | |
* gcc/c-incpath.c (dir_separator_str): New.
(add_standard_paths): Use it instead of hardcoding "/".
* gcc/testsuite/lib/target-supports.exp
(check_profiling_available): Check for -muclibc.
* gcc/testsuite/gcc.c-torture/execute/20030125-1.x: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/csl-3_4_3-linux-branch@110074 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | ChangeLog.csl | 8 | ||||
| -rw-r--r-- | gcc/c-incpath.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.c-torture/execute/20030125-1.x | 7 | ||||
| -rw-r--r-- | gcc/testsuite/lib/target-supports.exp | 9 |
4 files changed, 28 insertions, 2 deletions
diff --git a/ChangeLog.csl b/ChangeLog.csl index 3cad5f7c4c7..e2faabeaaf6 100644 --- a/ChangeLog.csl +++ b/ChangeLog.csl @@ -1,3 +1,11 @@ +2006-01-21 Joseph Myers <joseph@codesourcery.com> + + * gcc/c-incpath.c (dir_separator_str): New. + (add_standard_paths): Use it instead of hardcoding "/". + * gcc/testsuite/lib/target-supports.exp + (check_profiling_available): Check for -muclibc. + * gcc/testsuite/gcc.c-torture/execute/20030125-1.x: Likewise. + 2006-01-16 Joseph Myers <joseph@codesourcery.com> * gcc/testsuite/gcc.dg/wchar_t-1.c, diff --git a/gcc/c-incpath.c b/gcc/c-incpath.c index cd6c1db918b..4ebe897c8f0 100644 --- a/gcc/c-incpath.c +++ b/gcc/c-incpath.c @@ -43,6 +43,8 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ # define INO_T_COPY(DEST, SRC) (DEST) = (SRC) #endif +static const char dir_separator_str[] = { DIR_SEPARATOR, 0 }; + static void add_env_var_paths (const char *, int); static void add_standard_paths (const char *, const char *, const char *, int); static void free_path (struct cpp_dir *, int); @@ -142,7 +144,7 @@ add_standard_paths (const char *sysroot, const char *iprefix, { char *str = concat (iprefix, p->fname + len, NULL); if (p->multilib && imultilib) - str = concat (str, "/", imultilib, NULL); + str = concat (str, dir_separator_str, imultilib, NULL); add_path (str, SYSTEM, p->cxx_aware); } } @@ -162,7 +164,7 @@ add_standard_paths (const char *sysroot, const char *iprefix, str = update_path (p->fname, p->component); if (p->multilib && imultilib) - str = concat (str, "/", imultilib, NULL); + str = concat (str, dir_separator_str, imultilib, NULL); add_path (str, SYSTEM, p->cxx_aware); } diff --git a/gcc/testsuite/gcc.c-torture/execute/20030125-1.x b/gcc/testsuite/gcc.c-torture/execute/20030125-1.x index ae66af762eb..69cb97b17b5 100644 --- a/gcc/testsuite/gcc.c-torture/execute/20030125-1.x +++ b/gcc/testsuite/gcc.c-torture/execute/20030125-1.x @@ -1,3 +1,10 @@ # Only Linux does inlclude all c99 functions at the moment. if { ! [istarget "*linux*"] } { return 1 } +if { [istarget "*-wrs-linux*"] } { + set target [target_info name] + set multilib_flags " [board_info $target multilib_flags] " + if [string match "* -muclibc *" $multilib_flags] { + return 1 + } +} return 0 diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp index a8866a525b6..efe664b2fe4 100644 --- a/gcc/testsuite/lib/target-supports.exp +++ b/gcc/testsuite/lib/target-supports.exp @@ -192,6 +192,15 @@ proc check_profiling_available { test_what } { return 0 } + # uClibc does not have gcrt1.o. + if { [istarget *-wrs-linux*] } { + set target [target_info name] + set multilib_flags " [board_info $target multilib_flags] " + if [string match "* -muclibc *" $multilib_flags] { + return 0 + } + } + # Now examine the cache variable. if {![info exists profiling_available_saved]} { # Some targets don't have any implementation of __bb_init_func or are |