From 7ed170666aae2c051e2a52c9aa3b9a08e9ab432d Mon Sep 17 00:00:00 2001
From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 16 Mar 2007 22:48:27 +0000
Subject: [PATCH] 	* tools/gnu/classpath/tools/javah/JniStubPrinter.java 
 (printClass): Added filename argument. 	*
 tools/gnu/classpath/tools/javah/JniIncludePrinter.java 	(printClass):
 Added filename argument. 	*
 tools/gnu/classpath/tools/javah/CniIncludePrinter.java 	(printClass):
 Use user's file name. 	* tools/gnu/classpath/tools/javah/CniStubPrinter.java 
 (printClass): Use user's file name. 	*
 tools/gnu/classpath/tools/javah/Printer.java (printClass): Added 
 filename argument. 	* tools/gnu/classpath/tools/javah/Main.java
 (getParser): Fix '-v' 	argument order. 	(writeHeaders): Use a HashMap.
 	(run): Put class name into HashMap for writeHeaders.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@123000 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libjava/classpath/ChangeLog                   |  17 ++++++++++
 .../tools/javah/CniIncludePrinter.class       | Bin 1928 -> 1933 bytes
 .../tools/javah/CniStubPrinter.class          | Bin 3940 -> 3996 bytes
 .../tools/javah/JniIncludePrinter.class       | Bin 4363 -> 4428 bytes
 .../tools/javah/JniStubPrinter.class          | Bin 3478 -> 3530 bytes
 .../gnu/classpath/tools/javah/Main$1.class    | Bin 1002 -> 1002 bytes
 .../gnu/classpath/tools/javah/Main$10.class   | Bin 928 -> 928 bytes
 .../gnu/classpath/tools/javah/Main$2.class    | Bin 1106 -> 1106 bytes
 .../gnu/classpath/tools/javah/Main$3.class    | Bin 1111 -> 1111 bytes
 .../gnu/classpath/tools/javah/Main$4.class    | Bin 994 -> 994 bytes
 .../gnu/classpath/tools/javah/Main$5.class    | Bin 1056 -> 1056 bytes
 .../gnu/classpath/tools/javah/Main$6.class    | Bin 926 -> 926 bytes
 .../gnu/classpath/tools/javah/Main$7.class    | Bin 1004 -> 1004 bytes
 .../gnu/classpath/tools/javah/Main$8.class    | Bin 924 -> 924 bytes
 .../gnu/classpath/tools/javah/Main$9.class    | Bin 960 -> 960 bytes
 .../gnu/classpath/tools/javah/Main.class      | Bin 10514 -> 10929 bytes
 .../gnu/classpath/tools/javah/Printer.class   | Bin 2145 -> 2159 bytes
 .../tools/javah/CniIncludePrinter.java        |   6 ++--
 .../classpath/tools/javah/CniStubPrinter.java |   6 ++--
 .../tools/javah/JniIncludePrinter.java        |   3 +-
 .../classpath/tools/javah/JniStubPrinter.java |   5 +--
 .../tools/gnu/classpath/tools/javah/Main.java |  29 ++++++++++++------
 .../gnu/classpath/tools/javah/Printer.java    |   5 +--
 23 files changed, 50 insertions(+), 21 deletions(-)

diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 985d95928d34..0f68f9194523 100644
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/ChangeLog
@@ -1,3 +1,20 @@
+2007-03-16  Tom Tromey  <tromey@redhat.com>
+
+	* tools/gnu/classpath/tools/javah/JniStubPrinter.java
+	(printClass): Added filename argument.
+	* tools/gnu/classpath/tools/javah/JniIncludePrinter.java
+	(printClass): Added filename argument.
+	* tools/gnu/classpath/tools/javah/CniIncludePrinter.java
+	(printClass): Use user's file name.
+	* tools/gnu/classpath/tools/javah/CniStubPrinter.java
+	(printClass): Use user's file name.
+	* tools/gnu/classpath/tools/javah/Printer.java (printClass): Added
+	filename argument.
+	* tools/gnu/classpath/tools/javah/Main.java (getParser): Fix '-v'
+	argument order.
+	(writeHeaders): Use a HashMap.
+	(run): Put class name into HashMap for writeHeaders.
+
 2007-03-02  Mario Torre  <neugens@limasoftware.net>
 
 	PR classpath/31017:
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniIncludePrinter.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniIncludePrinter.class
index 13a0a99fef3347a7278b3ba5d96eaab2dc15f35e..08bcc36cc044aa003ae3ca8d62c1e264a69cad00 100644
GIT binary patch
delta 398
zc-kG0OG^TA6vcltjw#cGW>8v-pdivTQ6dquw1=9Ry&u*}!pN8`dI+srv}w~qrcEvS
z3`sFTLEE5R`#y{GcNX_>xaZz;@40i`yWBsmk1rs?z5`ietdZ_-w7Q##2iYATEgYBY
z<#6>hoT=)S#OtpdlDu)IH0&fLY@_~dl{hmRDbmJ?;xz^ppYg0XJx=B%<ng1nywH|2
zMqQcc$Z0H+H(r#Hj)KNAMdMGY&aG;!wf!7t=hfP!UQ-FMp|MG?glhFNSGs<!GQhUR
zPJ7gTpr2k;B%Fuhv0C}$_13;B-88YGh%gJmH~gNkN#qHa#bbg$qBH}a#7pla#!RL?
zvnKN<*`Uc%G4w6ekjY9=z`CfdrZAFG1qLk4ppnH(4xb1SCC?;F#3+yuNm3L^&a*<N
gwP1ZA7P`P<yL2O2Y=~iD8>NRnVP+HEl67eBA6j-z2><{9

delta 383
zc-ke8%P&J=5XFDr?QJXdNvRYe5h0`xQG`g9daFmP^(w{Y##?Tx@k%W1Y%Jv3@E@=f
zatVp8#NIz+A->jPCTC{O%sF%Az4TUo{l0wwU2M3~1mWwE`s?4S$JmYL2nUj?div3P
z!r#q+WRSSPeP)=a+vy!ao7Jhe#$z6$3`?Ah2>gNMfpKO;Oe4P=Sv)z~&+o>9*)qli
zTE||IIU$)OA#fRm!ghYkI@Ehy(~=oxt$V%Am6FVnw!ZcK_`GC+MI~5JXHLw#z!3;$
zJ%m`6WT_E&N|VV`(>(Xkz^WuyTySohhsRGB&Wy-BpyN>QO@*Hc`XV-6cX&&<PvKki
z$Iv^`T(R>??1drUsLi;o_%_K@`==tb+hoEjEvZ<s8r_YFUgb8*Ed3;jlVVI+PLQTt
c2{rx8A*p~8YNiE2FV)miho<nF>T9h30X6VX&;S4c

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniStubPrinter.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniStubPrinter.class
index c3cf12dda49f933cd0ab83648deb30764edc63c5..8726cdd216e068bca03cd1c32a70658cad09fb81 100644
GIT binary patch
delta 921
zc-l>pU2GI(6o#L#ozBcorvwME9aHIA2)6uK@uEVDa$%yuG)<6%qy#bRGPG01t#qeb
zu++uBD*k|V1aYmXpo0Idt<x5y6h%$+);kiT#2XWD<i<Pn%+^F_k~x#_yzhC>ch39U
z@`<LpAFiL91J?7MK~?mtN{?T!EpK>GU%auUt3Ol7wD|*V_xgd?IsQvyRA<yq&gqtN
zLWXT>*lH1Sz~(VVqO{o%{cgC?MZ>7?G#OP?-<HiLfMNnTq*xd2GnPb~&E@)&Hc#<%
zlr>lBV>Zw7Ty)e7Zht{xt?+Z%U}(3O-jpz3N<<n>jwZ$W?zU*)z7%_S#U|p_=$2Gd
z<8e+Hyrx)GX?7^|gSIX|AKJW5DcYG@m7d_F!J7)_KfspI8_a|QgEnvRc62J$Tz|^u
zG@BKACY$y0d5iZrWAJ`-CDqh)mJbxBpYP6ue!){{En8Z5SgheAn~(V<a;<w7e`d3c
z8%@dzHDWRu1=d|XUn-W~U+DIRw}pd#uD470x%KImW|L{D(%jlAW11DhXe|?*xA}^G
zh0&MEcYFK8<gRlz7ul+)$p!;?Q8xF;B668WCjYWdR28qHVan>Rt&Q<YXyvt2>~#X?
z=9paf>hpv>(-hXk>~{{vJRb9e;GUVMp+j@E?*;B^F^63(0Xol5^I}35pmSsa9rJPp
zA;;sh98+}EXzltL3U19TZzziMq&p1PnBtuo-Yp@ioy+tRW`$MVuDe>2ymf{TWA3ON
zu6DI`t})H0|4KWbS45mIV(KMKN%$Yci5IdnNf6C*iqhX>3H3r*t{oK@-BfHLODhkH
zeRtE2$DLx1P4v=3AG_$sXD@-g1LPQy?--AAn0*{!P#l!!xR~rTL!6~RnPFsFT;Kqg
z#j!sM<0lSsg;B0bjXx;zCx@sN@dp+rza5)8lII%p+<>b5?cyP-Sjx|AWF^(o+$Cvj
hgRILJ@k@LyrVgZ)Z&-pZBE59bi6QLE!mr}ne*kvu>ns2O

delta 861
zc-lRZ+fP(i6vlrWX3m^B9E~}ONP>daQehm8l28h$F+OM$it$aGS~Cu#3`_@fhEW6@
zv8|WZ8{NH*_u7hgI|UCQ-Zg3Tq4mXQW6B@kgU{+Zn7AKScGmZ;wZ3&ZQ9dze%9GbO
z?*L196re!AP!$8Oi}H0Fje^huec!Aa`qwa3aR)nWcG9f~WFm>K*xD_MO8qMEVReH=
znjRZJWhQ-!!bQ=j=gQjbp<iJ{Iy+;@7DZUEw2F0;S!R4~^9|qXq*-a~w>iK;oih`a
zhZNQa@nkg7)e@^{G&$nsYF%zIi`7B4FktfoTGs~4%YNdQ06#0HwnZ|L#a-!mVsTSE
zmA3hn-}JU%rE#2-0Z!<X!IHvLoYo`3c_n9UerJWJCmM~VQWk%3KER*)Ww5+_kP8Yk
zo@$Py<C&Pkx8T#N&n-e+vboF^y~tWM?V3$7Gfn<ds2-EQb-%St4ePsBX`?F<^Qx*E
zOhyIlE8;jeZN_PnX|+aD&9R+nuZ!C@cUY(JM-v?>siNYF8M;3>W2mO6w;=lj9|2j!
zM93wU!<P>Y)9xgk*)GY?s>exh@EoILM%d-_y6kq@E7X1WnAIHqNBCiv@4_C>`Ccd<
zSxC;|cTAU~9xmQvWBjP7_xWo5gS40W#>gq|k*%mVN{wO8jB+lAG03`Ne~y3`R9Nc|
zd(cOtTy$CLxvIkpON|k(PS$j;d)b}5OG(%n68j!?ZcHL0V!c9Rirkw4iMf@RMhmdS
z?qjalP3ZBdb~Z$mg>0sV7Ct6Mo$S4lt*ob&FKClryVwL@k))drIipVYvyDS+=NKup
z9NuZVI7dbnw}b0)vp0k}&MxlL!()2+k3ODBj^||gUv9KW%CC7h`6g_p;JpdH6iu=p
qp7IIvMQaUtkyJ;ai0I?4Ow1=zytLEh_Pa%1Jq;KV^I)>Khi?HzjM{Dh

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniIncludePrinter.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniIncludePrinter.class
index a89e0d2e9a81c37a11c65fae9aa007e58c58f561..690b2b932dc38d9f586db6cef8acc036abd7fc79 100644
GIT binary patch
delta 626
zc-m!>O-NKx6vuyed^0|@566wYs1_O}(@aBPP~#>8wS~BA5w6B4QEH+O&9ZuveNbu1
zG+{Mai#7v=)G+#Hrox601S^Unq9TH_vYnf7H+Fo_D2fZ`<A4A6oc}%d_EkQsESoGm
z7y~viU5rbyE>^cZR`8~3TlBKc)lD7Yu5hq@U$CKl&#u~dR8^<*`U{t?@0L6g-ka_(
zjTBX^$3row)&3E-W@%{lJ!H!cf84utnd!Gk=Ght23~d4}WoQ<ihE{&pqSep>wk;pF
zXcKquf6O7Loc*-pMje;=O^~L!94i$ecalcKouf*T=TXRGct%XdvOG@UNfMAlPwe7?
zGoEF_;<;ci7cgo3O42v;b)`tRA~82=ckuZQEyLSCO5Xh=LE;a8i~qQ=@hN4>XkC<u
zy@OBeesm79hC{3sAK(B%I;o+HjT|OKH+3ALk)t%z!*-6*!f{$TK^rC!qQX8YXfLN^
zo#PB~&N3*`ZO${y1@6;FhJMDm$WzQqyk>y+LYm?-Ke)n-&}X?yfosambyY$_dAXq~
z7*eaasj9d|sYu=CyeW%VEZKbY886C?q9VqHu2%4cdWz%{KSfqAn#hT9T4cFJ&?csq
O@KrvC;+s8(@4o=H_ntri

delta 581
zc-mc&O-Phc6o#KW&P+oZOdqr`Xk(BzU)L}ffl<^z(!yNSLZl+dMMR7KwCwk@q3Fj7
z2I+4y!9|Q15yRM>84Ht$gy=`4$ciwsY}3M(n_%kPZ;&7ky!W1S-h1Eo-21AkyDIv!
zI6MN>@pAzIg`3>8G+A7nS+^si+#XM@%)W`d4P*z(_m_ELY@ovK5b->XTVs#e*lLsL
z>gaAmf1ais+njrb7Q;^0kRGM2S&tFSXhVl~?i=>#RTi8FhP~Q(_+P<iW&Bpw$45Tq
zEPB!uu|k1miiTjCcxAA_a>Xc58bXz!Ax82%O%YC0qn&5=Qd@kUXUy<gJL9E_s7+|+
zz1(PzcPdhUhOKVQ)j2-QtAG5b>wEfa@aCO<DOIO3@@@eZ3JwwzJV=DYtl$XMvT6=d
zOFL`mpq`_w<rwSfB+hZRaDrw|vYk`3a++P7p$(6Hba8;Qav~wDa}wvdAko7``aCYt
z&t=kdljRBpuFB}wcp;>5lDrezC$96A8_aN%U)*Ar+su*TH+PhxSB1Dsxmev$`ba8R
qB$?fHiM)~lihN_Uj8)5|7)ekjCKA4pB|#CWXPWPXg!;pue&#O`OrN6w

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniStubPrinter.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniStubPrinter.class
index ad9620710b8c8194d7541ada72beca3a2d292563..a0f008dbfd898387934b0ce3380b5adaefcbf665 100644
GIT binary patch
delta 528
zc-l>o&r4KM6vsbL?~G#_JZJZqMJr(xb0`UQOoD<?Mole$Ok(!bQOEqzqFT6UL{MBP
z;UbHX&<GkVEvJ#&s36ita^<>>(_i4)O?lp!;a%Kw&-b41_j}I0i@pP&dGKd@7r4f^
zJaP>D3%~uzs*p0P{SCwR3p)@U58RE8L~0f?zSN3pb$L7kl8)J<spI?;Besj1JmF``
zG}UobvTT!EY3?+Y?oc0g5;I`-XhLaPzSHLI(1bPJQf=>15>%Gj7m}qk5leZ8G{cs<
zz{=*{QO&r3Pq%nx5OgJ^*0sfi!Cs8Xpxbh9GL>c~jypl<pOyp8rFo@!{U5oid3$cP
zB$^W5WgX71yvt|kdnbs+2ZQ+EHxA`vQijaolI$<JB738Z-9*g8Jxp3Cr<H)j8#GhN
zeQxrATH3fxJN0xBrjy4!<OyAj(ai*pn5KtWLFciF)5|h_B<N?22q^~GW{@8Y@slWr
z!uuucBSt6?`?|ANZ=jINI4i>{MHt!Bbt<G+Q%Ikrfm~^5m0~`lMBur|uj7&i+WEp)
L`96b<>}<(X`-Fc`

delta 462
zc-l3P-7AA(7{-6^yhBE2N3;V@)R>nLF=dS$Xud!5ZN8htffEi)4jd^VVv?4!d|TGr
zQ0z?YfPaC1!XfSrJ#{_zeLdHG-S_>(tb0~-?CaqPC?%AFLBY25VGC8cRfFBO^={qC
zRI~1$RhRM3l=i9Qo{%gD-t0Qne$<dXj59)gbKxV6efFKa^lYCzd7>1wXfN`v=}c;t
z86B?{mzqn=BRcMQYMIlS7jEI6MFoc%WFSYqXIUZ2s>7IL46_zt-A{55SHdPvZA94A
z+5O9lboPHc9EzD{ITB;vKW{lsZ~?)%@ri=}J0R-QkSt&zO>l)=!6s5@CY2V<v{6hu
zC308LN+lgQ=%j`&oOIJbk3_xn)5oOX41+8(gpXm?7-5}JmbUS*#~4S96JUa%NUxY8
z%rp;D5|zRjUS65SB<*W|f0T4GAQ6>Ojv~W6b4HzvTFC+VoRcI@UM{#qm9|addW}((
JH;ILAe*hc`ZgBtr

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$1.class
index ef2f2cff33eb60a5d730342d0b5450db43c1c790..5937740302190b73ab7d6d4d09a4136d21e6666b 100644
GIT binary patch
delta 31
nc-ni#{)&Br8#Ckb$?nWyysH`58P+lgGpu6}W!Nxz6|(~XpQ#Bc

delta 31
nc-ni#{)&Br8#Cjw$?nWyysH@48P+feGpuD0WmrFX6|(~XpJoXp

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$10.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$10.class
index 8c33dd3413a19a65aee2839778d7f5de2832f304..ed0500f45edc859cf35c24bf56ab21697d31e144 100644
GIT binary patch
delta 23
fc-mXQzJPthA0|f5$$y#RSa}&Z82KhAFgpMMS|A2i

delta 23
fc-mXQzJPthA0|eQ$$y#RSa}#Y7<nfrFgpMMS_1}C

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$2.class
index 7bebfc82846676948ed5d1cb37f0b0cbb9fd1f4b..1eb1b1e43232c12adacec646aa7ca31a32e0c2e4 100644
GIT binary patch
delta 39
vc-p(fafxF?4m0Dy$+^rEM2|9XF&twMVK~kp$8dr{gW)8D0mG@uLM#pd{v``&

delta 39
vc-p(fafxF?4m0C{$+^rEM2|3VF&t$OVK~Mh$8elMgW&{&0mI43LM#pd{j3XN

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$3.class
index b59e0172203f5e1bce60d1cb2ff54bda75072e42..a798489e93c781ab7764a03a8e44f0c9b7b7649e 100644
GIT binary patch
delta 39
vc-p(pah+pBAv5Ed$wkZ)L@zOLF<fR4VYtE|$8eQFgW(#30mJpl;w%mT2H^|Z

delta 39
vc-p(pah+pBAv5FY$wkZ)L@zRMF<fF0VYtj7$8d!~gW)QJ0mHS);w%mT251Y@

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$4.class
index db5582d67231c8a0ea606b46f66f55793533a06c..0811703a1e5fff66325b777e0bf38b745c78b186 100644
GIT binary patch
delta 23
fc-ni!{)l~p2{Yr($)?O1talkW817A8#Owe7W*Z0x

delta 23
fc-ni!{)l~p2{Yr3$)?O1talhV817D9#Owe7W&Q{R

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$5.class
index ef7038103803e72fd190d0bc3bd24f84b714738c..faa51e20a530dbe15938b3e0b871f79d39ee01ed 100644
GIT binary patch
delta 31
nc-mXQv4CSk7&GI8$>Gd3yw4c87@jkTFuY)pVR$+D0kZ=Dq<acK

delta 31
nc-mXQv4CSk7&GJj$>Gd3yiXap7@jeRFg$0FVR$k50kZ=Dq&NyX

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$6.class
index e2e627dd34cb833a014188551e617322c4391a8f..10286fa7a07aa1d5dfcb92bd5300d469375ca702 100644
GIT binary patch
delta 23
fc-ouCK97CFFDAy<lYcYCvA$>EVE8aOj@bbKa~KHm

delta 23
fc-ouCK97CFFDAxUlYcYCvA$#AV0b?{j@bbKa{CDG

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$7.class
index 249ec5ceb10f9f63e7545b50c7e0753e60c19a32..6da557c37ac7a0fc8b623fa80027361686cacb64 100644
GIT binary patch
delta 31
nc-niz{)T;n4m0DY$-2x%yx$nO7``)zF#KSUVfZ<D4YLCPv0n<6

delta 31
nc-niz{)T;n4m0D&$-2x%yk8l(7``!xFnni_VfZn54YLCPu^bAJ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$8.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$8.class
index 001bfa06185dfda4e94b3c730598727adf88b4a5..16fe8a3a6e5e1cd253dc78509e5c98f75eca6276 100644
GIT binary patch
delta 23
fc-ou8K8Jn74<^RnlYcVBvHoY^U}Tsa!|VV6Z&C;t

delta 23
fc-ou8K8Jn74<^Q6lYcVBvHoM=VE8{dhS>oCbT0`M

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$9.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$9.class
index aee9be7d9242c9b05ce4e45922ae09a20e048e01..f4393f56fda36d81525601da85e1733c62b1db80 100644
GIT binary patch
delta 131
zc-lL_et><#24SD9#Ii*FoW#6z{os<K%)E4K=g9{c#U|dA#U(Xao-uLqBt`{RLq-Nh
z=gmtQgBWFWWF=X)Gw^I=U|?Wk;0KaiK$?Mpk%5(wX|gc0E~Cg~M`kNlHU<tx_Q?&*
Kl0g0}W;Fm-cpzi|

delta 125
zc-lL_et><#hKYxSCm&!Gn|M=J*x4s5u`E$PCowNwKe(hQGcVm5BsE!{F;RfgnUR58
zB{45QuQE5kwAgTR9i!6bO^mLLGBUc7EZZ4)HZm|UFfs50NiHDGz`)4B%E&lbm{}KS
XfFrXND=PyBBirN#W=SA_7PA@vYZ)Hq

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class
index 27c3b7e6fa38db4304f18ea8286d13fbba68bd39..66c37937fa3ae25fd3a04a59120a0b18f24cb7dc 100644
GIT binary patch
delta 4033
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
KN7z$aC;tO;S#@my

delta 3594
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

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Printer.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Printer.class
index 76b2cbeedab7bff1fe5470118ecf2340a3fa83cf..94bc20c09a5020ef14b10e657ecbc7caeffdd65a 100644
GIT binary patch
delta 112
zc-ng?@Lpg;8<T*ghEG;vS)zVszP?*#POA09i_(*KG4pNS$h3{cGM|B+p^!n8p@>0+
zp_oC9p@cz~p_IXhp^U+Tp`5{)p@PAip^_n(p^hPip`Ia!p#i9>5h&U`c>((*&JG4v
OhE4`9hOWuh9BKdxuN=+*

delta 97
zc-ng}@K9hw8xy1U#0xT$6<B#U?_=7|VwuOl&QQQ0%23Fl!cfGZ#!$?l%TU5##8Ap$
z!BEEF%uvqY%}~J*%uvga!cfPM!%z=Y(Et=_n!JvE5@$ODD?<kZ7enV{PYyKzyCN4U

diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/CniIncludePrinter.java b/libjava/classpath/tools/gnu/classpath/tools/javah/CniIncludePrinter.java
index fb007b131019..445f902da48a 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/javah/CniIncludePrinter.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/javah/CniIncludePrinter.java
@@ -1,5 +1,5 @@
 /* CniIncludePrinter.java - generate CNI header files
- Copyright (C) 2006 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2007 Free Software Foundation, Inc.
 
  This file is part of GNU Classpath.
 
@@ -63,14 +63,14 @@ public class CniIncludePrinter
     return new PrintStream(fos);
   }
 
-  public void printClass(ClassWrapper klass) throws IOException
+  public void printClass(File filename, ClassWrapper klass) throws IOException
   {
     // Never write Object or Class. This is a hack, maybe
     // the user would like to see what they look like...
     if (klass.name.equals("java/lang/Object")
         || klass.name.equals("java/lang/Class"))
       return;
-    PrintStream ps = getPrintStream(klass.name + ".h", klass);
+    PrintStream ps = getPrintStream(filename + ".h", klass);
     if (ps == null)
       return;
     ps.println();
diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/CniStubPrinter.java b/libjava/classpath/tools/gnu/classpath/tools/javah/CniStubPrinter.java
index d91f367c45c3..3acec2328897 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/javah/CniStubPrinter.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/javah/CniStubPrinter.java
@@ -1,5 +1,5 @@
 /* CniStubPrinter.java - Generate a CNI stub file
- Copyright (C) 2006 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2007 Free Software Foundation, Inc.
 
  This file is part of GNU Classpath.
 
@@ -90,12 +90,12 @@ public class CniStubPrinter
     return new CniPrintStream(fos);
   }
 
-  public void printClass(ClassWrapper klass) throws IOException
+  public void printClass(File filename, ClassWrapper klass) throws IOException
   {
     if (! klass.hasNativeMethod())
       return;
     String className = klass.name.replaceAll("/", "::");
-    CniPrintStream out = (CniPrintStream) getPrintStream(klass.name + ".cc",
+    CniPrintStream out = (CniPrintStream) getPrintStream(filename + ".cc",
                                                          klass);
     if (out == null)
       return;
diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java b/libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java
index dc19af255168..6c1a8e166fb2 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java
@@ -107,8 +107,9 @@ public class JniIncludePrinter
     return new JniPrintStream(classpath, fos, klass);
   }
 
-  public void printClass(ClassWrapper klass) throws IOException
+  public void printClass(File filename, ClassWrapper klass) throws IOException
   {
+    // Note that we ignore the filename here.
     String xname = JniHelper.mangle(klass.name);
     JniPrintStream out 
       = (JniPrintStream) getPrintStream(klass.name.replace('/', '_') + ".h", 
diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/JniStubPrinter.java b/libjava/classpath/tools/gnu/classpath/tools/javah/JniStubPrinter.java
index 758ec21c091a..d4b34fc20675 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/javah/JniStubPrinter.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/javah/JniStubPrinter.java
@@ -1,5 +1,5 @@
 /* JniStubPrinter.java - Generate JNI stub files
- Copyright (C) 2006 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2007 Free Software Foundation, Inc.
 
  This file is part of GNU Classpath.
 
@@ -71,8 +71,9 @@ public class JniStubPrinter
     return new JniPrintStream(classpath, fos, klass);
   }
 
-  public void printClass(ClassWrapper klass) throws IOException
+  public void printClass(File filename, ClassWrapper klass) throws IOException
   {
+    // Note that we ignore the filename here.
     if (! klass.hasNativeMethod())
       return;
     String xname = JniHelper.mangle(klass.name);
diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java b/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java
index 729af476ad89..250844d1d88b 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java
@@ -58,6 +58,7 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.Map;
 
 import org.objectweb.asm.ClassReader;
 
@@ -254,7 +255,7 @@ public class Main
         cni = true;
       }
     });
-    result.add(new Option('v', "verbose", "Set verbose mode")
+    result.add(new Option("verbose", 'v', "Set verbose mode")
     {
       public void parsed(String arg0) throws OptionException
       {
@@ -309,16 +310,18 @@ public class Main
     return result;
   }
 
-  private void writeHeaders(ArrayList klasses, Printer printer)
+  private void writeHeaders(HashMap klasses, Printer printer)
       throws IOException
   {
-    Iterator i = klasses.iterator();
+    Iterator i = klasses.entrySet().iterator();
     while (i.hasNext())
       {
-        ClassWrapper klass = (ClassWrapper) i.next();
+	Map.Entry e = (Map.Entry) i.next();
+	File filename = (File) e.getKey();
+        ClassWrapper klass = (ClassWrapper) e.getValue();
         if (verbose)
-          System.err.println("[writing " + klass + "]");
-        printer.printClass(klass);
+          System.err.println("[writing " + klass + " as " + filename + "]");
+        printer.printClass(filename, klass);
       }
   }
 
@@ -376,19 +379,21 @@ public class Main
       }
 
     Iterator i = klasses.iterator();
-    ArrayList results = new ArrayList();
+    HashMap results = new HashMap();
     while (i.hasNext())
       {
         // Let user specify either kind of class name or a
         // file name.
         Object item = i.next();
         ClassWrapper klass;
+	File filename;
         if (item instanceof File)
           {
             // Load class from file.
             if (verbose)
               System.err.println("[reading file " + item + "]");
-            klass = getClass((File) item);
+	    filename = (File) item;
+            klass = getClass(filename);
           }
         else
           {
@@ -396,9 +401,12 @@ public class Main
             String className = ((String) item).replace('.', '/');
             if (verbose)
               System.err.println("[reading class " + className + "]");
+	    // Use the name the user specified, even if it is
+	    // different from the ultimate class name.
+	    filename = new File(className);
             klass = getClass(className);
           }
-        results.add(klass);
+        results.put(filename, klass);
       }
 
     writeHeaders(results, printer);
@@ -436,7 +444,8 @@ public class Main
         String resource = name.replace('.', '/') + ".class";
         URL url = loader.findResource(resource);
         if (url == null)
-          throw new IOException("can't find class file " + resource);
+          throw new IOException("can't find class file " + resource
+				+ " in " + loader);
         InputStream is = url.openStream();
         ClassWrapper result = readClass(is);
         classMap.put(name, result);
diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/Printer.java b/libjava/classpath/tools/gnu/classpath/tools/javah/Printer.java
index 9c4b48d2e5cf..7a896cf62b10 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/javah/Printer.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/javah/Printer.java
@@ -1,5 +1,5 @@
 /* Print.java - abstract base class for printing classes
- Copyright (C) 2006 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2007 Free Software Foundation, Inc.
 
  This file is part of GNU Classpath.
 
@@ -95,7 +95,8 @@ public abstract class Printer
     this.force = force;
   }
 
-  public abstract void printClass(ClassWrapper klass) throws IOException;
+  public abstract void printClass(File filename, ClassWrapper klass)
+    throws IOException;
 
   protected abstract void writePreambleImpl(PrintStream ps);
 
-- 
2.47.3