From 5ae6e48ab6a9792f07477572d361307513b7adaf Mon Sep 17 00:00:00 2001 From: dominiq Date: Fri, 29 Apr 2016 11:50:42 +0000 Subject: [PATCH] 2016-04-29 Dominique d'Humieres backport from trunk: 2016-04-20 Ben Elliston * testsuite/lib/libjava.exp (libjava_arguments): Use 'file normalize' rather than the defunct DejaGnu 'absolute' proc. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch@235634 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 8 ++++++++ libjava/testsuite/lib/libjava.exp | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index ed374c1..eb5d617 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,11 @@ +2016-04-29 Dominique d'Humieres + + backport from trunk: + 2016-04-20 Ben Elliston + + * testsuite/lib/libjava.exp (libjava_arguments): Use 'file + normalize' rather than the defunct DejaGnu 'absolute' proc. + 2016-04-27 Release Manager * GCC 6.1.0 released. diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp index 0cfb253..45d2074 100644 --- a/libjava/testsuite/lib/libjava.exp +++ b/libjava/testsuite/lib/libjava.exp @@ -416,7 +416,7 @@ proc libjava_arguments {{mode compile}} { # Search for libtool. We need it to link. set found_compiler 0 - set d [absolute $objdir] + set d [file normalize $objdir] foreach x {. .. ../.. ../../..} { if {[file exists $d/$x/libtool]} then { # We have to run silently to avoid DejaGNU lossage. -- 2.7.4