From 72ed03376d9faf97a453ac312879b662d7e5afa3 Mon Sep 17 00:00:00 2001
From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 17 Jan 2007 22:59:10 +0000
Subject: [PATCH] * tools/gnu/classpath/tools/javah/PathOptionGroup.java
(PathOptionGroup): Set default boot class path.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120882 138bc75d-0d04-0410-961f-82ee72b054a4
---
libjava/classpath/ChangeLog | 5 +++++
.../tools/javah/PathOptionGroup$2.class | Bin 1104 -> 1104 bytes
.../tools/javah/PathOptionGroup$3.class | Bin 1103 -> 1103 bytes
.../tools/javah/PathOptionGroup$4.class | Bin 1108 -> 1108 bytes
.../tools/javah/PathOptionGroup$5.class | Bin 1107 -> 1107 bytes
.../tools/javah/PathOptionGroup.class | Bin 3120 -> 3290 bytes
.../tools/javah/PathOptionGroup.java | 7 ++++++-
7 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 83de49090b6a..3a3d8a221fe4 100644
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-17 Tom Tromey <tromey@redhat.com>
+
+ * tools/gnu/classpath/tools/javah/PathOptionGroup.java
+ (PathOptionGroup): Set default boot class path.
+
2006-12-14 Andrew Haley <aph@redhat.com>
* tools/gnu/classpath/tools/jar/Creator.java: Close the
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$2.class
index 0613196320c81b24a703470c377399c7a13dc5af..a4fe014e13728d561c74d22c45cf71979eada108 100644
GIT binary patch
delta 23
fcmcb>ae-sQY-Yy9$#a<VSyLJK8PX;Tus8q!VAux8
delta 23
fcmcb>ae-sQY-Yxo$#a<VSrZue84@Q8us8q!U`GbI
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$3.class
index 8e7c07f5904f58ed05cf2bdf1b20cf1901173096..6786f255ac56a77d3e856dacfaee7660bd0186b8 100644
GIT binary patch
delta 23
fcmX@lah_wtWM;;U$y1oiSaTS77;-1`vp4_%V6+C#
delta 23
fcmX@lah_wtWM;<X$y1oiSkoDJ7&0dFvp4_%U?T><
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$4.class
index 1e0725da07be152f015c80aea73886b75859c695..08d44961c3eb8684a33e53a10ef4874f3acf4ae5 100644
GIT binary patch
delta 23
fcmcb@afM^Ud}hY{$qShCS&JF?8A>LLus8q!W2OfN
delta 23
fcmcb@afM^Ud}hY1$qShCS@Rh98S*EKus8q!V-*JX
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$5.class
index 5791d4f8269058b4a896022b3384876c5a41536b..e8f36fc5b3e39e937fecf46bbadb21dac4da7b18 100644
GIT binary patch
delta 23
fcmcc2ahYSoJZ8qS$@7`>S*sZM8LB4>vp4_%WFrR_
delta 23
fcmcc2ahYSoJZ8qi$@7`>SxXuC8OkOLvp4_%W0D64
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup.class
index 4833679fb4b565aa2bd37761f3f322526dc24408..41960117caaa147941150b326c0f3359ef36a91e 100644
GIT binary patch
delta 914
zcmYjOTTc^F5dKbSyUTVHacu-6#Hyj{7TPEfBbXSJ2QU>0pcN5yp-T&v7TPU>hzKg)
zugClSj(0Jdq7n_h_+X5Q55D+h;@>dpY|8^V$;_PZd^7W%nen`z^Q13--+u(K9OJK~
zpmn{7%?xuA$*8wA7BjqU5iODMc56mh!WL{5(8Q3_sr72Uh!zd`8u}B4-X)_M+ZY@n
z-KdMly7jox&*0{tEKWYfoDPQVGDKtx*vWgWC2AXk(x4kIBdoj9^<8Ft5jumluClRO
z!VZLF%tx4iv+lBY%2<qDe2vY+x+uTcS|TFGuiISC9)_%{ntBNlBuu`+(8#}Ai})X#
z%6d(%P%1(Y(a)Rh`Sv720`{8l>@pGi7zDk~2zJC1BKGr1d!aOd5J@oq&41fhvBSJT
zD6}7yaSX?KwcvK0#AyMiNPT($Nuwj;t1<MrX2jw$&fqLRCAb*pFNIwD1sNA{iGLLe
zyeDx*##Jn(eqk+9OFac#XOPoHqPpSRRPUD{<ED&TxXp9LmF0ICW;Od~5-J4TXULri
ztut5Sk7+?YF5w;?niCj%eMJ1lvVYLHEwt2r-XrA?DVyFR;P-rntg3I&;7OrHoy3kN
zRne4IB{+fh6gmirG^sf?N>u5#P9UCvl0@3A^qHhR8DxNvL1oB9h6#B^T`X8e)(Z#O
zt+1mUv#}caXu%?Ehr5c_>4Sz!gwco?+R=+X3_>OP+>A_kP(-&y2w((xU~~@PAiW(T
z)JnHezQnO~=*WgK6coL~35F@0tMyF6*;G7%6)BugVPSw?E;C&H_sf&@0oPKvF@-y|
zlelMc9*k3^j8HeSDITT~jlfBL@~P7TjM66#V->|~aTK+*b5ma_Y-9r&eXW$T5s&DH
yjFKww7*EnAbMTZzXHil%p5ZP<7CcY4dx4kaRVq?O9#Ci$86TPU$!R~3@&5t%WYTK@
delta 805
zcmYjPSx*yT6g?kZW;#qFOd5(&!YF~1mPJ8ga7jdckfao45sRQs>0nu;v>gx?s37hu
zekzEH;u2qcfEe2-(eSEI>Z4Em67>#4qA%aM-<fmIJ$Gh)ZCuQkzWx661;BQ^S&|}l
zn}DNy!C5X;iExMr@j{2kbDY6`xUS`pgjRIQ*n|@d5pQ5Rr<4yn_GX`wQ3Q>l#H8H(
zr$b>~riZ;+gwFGvYTjuE+rj!K31Re@{k;q=R{xOG&-zJRT@+*RH0y?HM0GVBiy3NH
zzm`m@gPIYQ(1%U|3DY#UMufp2=p#m?Cy^8}%xi>VTO6G{BGj@`J}(qI$7Q5&k$)9R
z)JaSUxWu6JYQtLPkkQj$S#RhG&4?vrT*ei?K~&i_zD@KvZ^*cbTf9LmsF=hZ8F%5O
zK~XIkq+tT48RRvS0o|x<Z3;+`!DT$aLq03+WHbD`=q`RtTl_CNU@j4eX%RgkVHQu!
z?VrAPxmH=~9YipC^W8orkU`M53^|lR;|Co1S2k1G8uBS^$}y!qgN`)%&ja_W_c
z(rwQmYEgY8I-?AjqCty^6O&YiOy(>xOEf79rF3qkxj_3qII#=4*n`dJKn1!`hh8)z
z4jm)#kwmuQ!H+V!F=Ee=#d)gjbi2TRWP4L%4R29U_7M{dE4Ui;FT))w&!8%e>uGFh
zqbIi+=KieuZJ%*3jr%Kj6kNuvshL|OCo573TvU%zuratXPKi<|#015iL@m|(F@+#~
zEi=^)IOuG%QiZ9d5zlB9MoqghkLPQaIe3A5*r>^c1<X*Dg_mpNUg0&Nk4$O^0fqi)
N3&ZQ!w~lcO{{jGqv9ACC
diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/PathOptionGroup.java b/libjava/classpath/tools/gnu/classpath/tools/javah/PathOptionGroup.java
index 4287354aed65..efb5f7a70b2e 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/javah/PathOptionGroup.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/javah/PathOptionGroup.java
@@ -1,5 +1,5 @@
/* PathOptionGroup.java - handle classpath-setting options
- Copyright (C) 2006 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2007 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -89,6 +89,11 @@ public class PathOptionGroup
{
super("Class path options");
+ // Use the VM's built-in boot class path by default.
+ String boot = System.getProperty("sun.boot.class.path");
+ if (boot != null)
+ setPath(bootclasspath, boot);
+
add(new Option("classpath", "Set the class path", "PATH")
{
public void parsed(String path) throws OptionException
--
GitLab