From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gcc-patches-return-131787-listarch-gcc-patches=gcc.gnu.org@gcc.gnu.org>
Received: (qmail 12951 invoked by alias); 25 Oct 2004 22:00:15 -0000
Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Archive: <http://gcc.gnu.org/ml/gcc-patches/>
List-Post: <mailto:gcc-patches@gcc.gnu.org>
List-Help: <mailto:gcc-patches-help@gcc.gnu.org>
Sender: gcc-patches-owner@gcc.gnu.org
Received: (qmail 12937 invoked from network); 25 Oct 2004 22:00:14 -0000
Received: from unknown (HELO mail.aaronwl.com) (68.228.0.128)
  by sourceware.org with SMTP; 25 Oct 2004 22:00:14 -0000
Received: from [70.182.14.214] (cdm-70-182-14-214.laft.cox-internet.com [70.182.14.214])
	by mail.aaronwl.com (8.12.11/8.12.11) with ESMTP id i9PM0GkN026056;
	Mon, 25 Oct 2004 22:00:16 GMT
Message-ID: <417D77C7.3060900@aaronwl.com>
Date: Mon, 25 Oct 2004 22:10:00 -0000
From: "Aaron W. LaFramboise" <aaronavay62@aaronwl.com>
User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.3) Gecko/20040910
MIME-Version: 1.0
To: tromey@redhat.com
CC: Gcc Patch List <gcc-patches@gcc.gnu.org>, java-patches@gcc.gnu.org
Subject: Re: [PING] Windows patches.
References: <417AB82F.4030405@aaronwl.com> <m3acudout2.fsf@localhost.localdomain>
In-Reply-To: <m3acudout2.fsf@localhost.localdomain>
Content-Type: multipart/mixed;
 boundary="------------080102080806070203040300"
X-SW-Source: 2004-10/txt/msg02101.txt.bz2

This is a multi-part message in MIME format.
--------------080102080806070203040300
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-length: 320

Tom Tromey wrote:

> You may want/need to patch the test suite as well.  (I didn't look to
> see if it is necessary.)

I found one place with a CLASSPATH separator in the testsuite.  I've
started a bootstrap/test cycle with it, which might take a while.  Is
this OK, assuming it passes the tests?

Aaron W. LaFramboise


--------------080102080806070203040300
Content-Type: text/plain;
 name="gcc-mainline-20041025-libjavatest.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="gcc-mainline-20041025-libjavatest.patch"
Content-length: 1729

2004-10-25  Aaron W. LaFramboise  <aaronavay62@aaronwl.com>

	* testsuite/lib/libjava.exp (libjava_arguments): Fix CLASSPATH
	separator handling for Windows.

Index: gcc/libjava/testsuite/lib/libjava.exp
===================================================================
RCS file: /cvs/gcc/gcc/libjava/testsuite/lib/libjava.exp,v
retrieving revision 1.59
diff -c -3 -p -r1.59 libjava.exp
*** gcc/libjava/testsuite/lib/libjava.exp	4 Aug 2004 16:49:21 -0000	1.59
--- gcc/libjava/testsuite/lib/libjava.exp	25 Oct 2004 06:56:08 -0000
*************** proc libjava_arguments {{mode compile}} 
*** 332,337 ****
--- 332,338 ----
      global tool_root_dir
      global libgcj_jar
      global libjava_libgcc_s_path
+     global target_triplet
  
      if [info exists LIBJAVA] {
  	set libjava $LIBJAVA;
*************** proc libjava_arguments {{mode compile}} 
*** 370,379 ****
  
      verbose "LD_LIBRARY_PATH = $env(LD_LIBRARY_PATH)"
  
      # Set the CLASSPATH environment variable
!     verbose "CLASSPATH is .:$srcdir/$subdir:$objdir:$libgcj_jar"
      global env
!     set env(CLASSPATH) ".:$srcdir/$subdir:$objdir:$libgcj_jar"
  
      if {$mode == "link"} {
  	global wrapper_file wrap_compile_flags
--- 371,387 ----
  
      verbose "LD_LIBRARY_PATH = $env(LD_LIBRARY_PATH)"
  
+     # Determine CLASSPATH separator
+     if { [string match "i?86-pc-mingw32*" $target_triplet] } {
+ 	set sep ";"
+     } else {
+ 	set sep ":"
+     }
+ 
      # Set the CLASSPATH environment variable
!     verbose "CLASSPATH is .$sep$srcdir/$subdir$sep$objdir$sep$libgcj_jar"
      global env
!     set env(CLASSPATH) ".$sep$srcdir/$subdir$sep$objdir$sep$libgcj_jar"
  
      if {$mode == "link"} {
  	global wrapper_file wrap_compile_flags

--------------080102080806070203040300--