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 ++++++++++++
 .../classpath/tools/javah/CniIncludePrinter.class  | Bin 1928 -> 1933 bytes
 .../gnu/classpath/tools/javah/CniStubPrinter.class | Bin 3940 -> 3996 bytes
 .../classpath/tools/javah/JniIncludePrinter.class  | Bin 4363 -> 4428 bytes
 .../gnu/classpath/tools/javah/JniStubPrinter.class | Bin 3478 -> 3530 bytes
 .../classes/gnu/classpath/tools/javah/Main$1.class | Bin 1002 -> 1002 bytes
 .../gnu/classpath/tools/javah/Main$10.class        | Bin 928 -> 928 bytes
 .../classes/gnu/classpath/tools/javah/Main$2.class | Bin 1106 -> 1106 bytes
 .../classes/gnu/classpath/tools/javah/Main$3.class | Bin 1111 -> 1111 bytes
 .../classes/gnu/classpath/tools/javah/Main$4.class | Bin 994 -> 994 bytes
 .../classes/gnu/classpath/tools/javah/Main$5.class | Bin 1056 -> 1056 bytes
 .../classes/gnu/classpath/tools/javah/Main$6.class | Bin 926 -> 926 bytes
 .../classes/gnu/classpath/tools/javah/Main$7.class | Bin 1004 -> 1004 bytes
 .../classes/gnu/classpath/tools/javah/Main$8.class | Bin 924 -> 924 bytes
 .../classes/gnu/classpath/tools/javah/Main$9.class | Bin 960 -> 960 bytes
 .../classes/gnu/classpath/tools/javah/Main.class   | Bin 10514 -> 10929 bytes
 .../gnu/classpath/tools/javah/Printer.class        | Bin 2145 -> 2159 bytes
 .../classpath/tools/javah/CniIncludePrinter.java   |   6 ++---
 .../gnu/classpath/tools/javah/CniStubPrinter.java  |   6 ++---
 .../classpath/tools/javah/JniIncludePrinter.java   |   3 ++-
 .../gnu/classpath/tools/javah/JniStubPrinter.java  |   5 ++--
 .../tools/gnu/classpath/tools/javah/Main.java      |  29 ++++++++++++++-------
 .../tools/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 985d959..0f68f91 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
zcmW-cIZFd^6vThK*=Sf-q7gJ|At;FEFeHc);+?}Q#&};<5XHzQ5ihW^u(7d_wb8=Q
zV2G@sU@O?!`&q=7E&jv2ng1K+-Fol5E#H6dpFotoMpT91{dCv;Uu!k-pti&Zvd4wX
zLZn!UWQyiNqV}VP6@Q#D12^Leu7SZ#oj8*QQ%qYW&2RN+oz}DF@p(ups6$6}J6*Rk
z)}=PwFlR8&g7u>HH)IW#$XUNyF_|}5spmDGoEFRHW?3h|n!!5l3c90ZE===Er<+ZK
zt@>B@zF9dtQ1Bc|v2vkQyK(20>nbiZIVK%?WzZL~i9X?V_^9wlv})jk_|6-Npv{DD
z#wKMm8?sr<g}=lN+bo9!R^@F}B}hdV3^<s<U=}}fbjlGi78qfXQL-fDk|}bGr&y-R
hS#Vm&LbFWLhizI>9M(&p#Kvf&L&995?uf3k`wv=nO$h)1

delta 383
zcmXAk%P&J=5XFDr?QJXdNvU{*M1+u5MG=iuskeHxTCaL;Zm3soszIAr+Syphwc$Tt
zC*%?mTZz4Y#zK5$F_SYhXXc!_^j>%?KYw1|fgZNpXoBF?Xv5V{)kE}Ja|HbfRXu)d
zK2g)lpk#=cz+E)VLN>K4Xt%ocwpi3dgb|68Q9+GAacC5ckZI)hLQAK|2f4jyAXCP;
zK<nBsF()Nc#04%RpU>uYtRub8H6xj2&brgvT}jD2DeFr=h%HDKSyF;|b>`H}2^{`F
z#zO}yk_@#1&);OKV47zh8d;O9mlmAc=F!RHxic-&_vkp(d(*)u0=|$<&n@0R+^_Hr
z`a{PXk@ZsNh3GTGzA>8#Tk&lY$<7Z&=(I@(Ra#cDYBjl=;$h`B!W;u6h>>JmS&oyU
eTnRP*%OR;yl@g|fRs><HsiPiE;SJT-*!%@G@K4YH

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
zcmYk4U2GIp6vuzJozBcorvwME9aHIA4Yqt(@u5PC@?avtG)>UNqy#bRGPG01t#qeb
zu++t`0)BvH6mhLzfP&!H+B$7PN>S8AUwtDnN_;W#MPGbF&umRJH@SD_p8x;+&pqe=
z>+*@Fy6>-_p99wNtwB}vi%O4QuPv{8L|?qVrK>+v$h7$bZTI_u*E#-kV^n9<PR{9;
zazch}YS>~Cve)KGMxwOY5dCJj(IvyE?=%@zRNs-!CV*lB*soX<?KYM~8_nhVGd9oi
zT$D9e=wmhqI2au<gF9bTShxDQY%sLLOK(V+FDD|6CP$KFefL^4uqnk(j@m@L8r_m=
zYCOhqgVz;{D#Z?ke$dwC=R=z}C`H>+E7B9ZZSa=D`46x;^aeBGz@W`Lyc?ZJHP@f8
zImt$ap2=pteBR=HP8)m>T}?GLo#8`;>F2vMp<nP6TFd6vtrn{|XY&ysN3M0>;!kas
zaid9Dp+-z5qrkeS=L^Ns2MXQZ@I&FCpX==ser|2LrP*X!vNX50N}FbdFj~t57i_+y
zUt#oR^4;E^FnQ~o%_X)dYO=vVUX;z9GKgH}@yWle<5k6LXqYm(KUc?iCA9MDDRw!5
zb8}3td*ubfo@olJV)i)uVxEe5T5!+L)6k*0+IIqXwU|S$mH?d>rg<r$3(z^dfR1^k
zf{^R+Szc3g)M)McX$o%5EN?1`^Q1cr*O=nH8BUdu(6(iI3A4hgZr5Ec3En=#*_gX3
zmn&UujcZKv$-mOhXB83W^O$;9bEf3@AH<0lqBF@Mn&%azzsC~l#j-p*DlWRI*g}?8
z9uxcSpdF99#T*;xrH4MY(~r+C0$Bs(7?FL9Cpg4z4l^hY%5zLic9J2^P@v2((k(8s
zmn-7fAB6EE`?$&|*Cfa96#0Yw)Qb3n3!Q%$n>zWGAu!JksLI!N9;J$<{KR^0qgsl)
jEQPI;arq*CnXkmuft2z!OVCB6mkv5HgndQ$RebXgcI@jc

delta 861
zcmX|<+fP(?5XV2iW%uma!_k;i5lN^}FDR_5Q4&Nzo2CzK6U6wYjn=HoS{Bv?-DMSl
zZmHL*ZKc1~%X(|;1?#1{1rH$JZPMt2_Qhvo^bhdCXLXJyeVP1zGvAr{&dm3C#fuq}
z9=^VQ3s}TIL45j|svLY>T&Q1X_`>t_U9)=lkzuNmPPW=?qel_UMw8v~l^YdR`c-gF
zO`}DIUYh{rCjE+{1+kdt%GrF&fWnA&b;VPyiirNiD$&hmxv|4$C%bgYtTOi4?B#o%
zH<MKd6xOUnDwgbSjaN3A{OHwcTW&F(&q8cu(B@~ft_xL^|H|PYhZK|BquJ=f?o1-N
zusM;=*c{=g-W;kjj&UN$aeX3GT6B_AdNee%^mm&-_}JqUi^bDvi!+=Ha#p_#Ra6Xd
zUSTHEEzwLO8&~+}eNp|TMVJdV7rCStSf5V$%cg{BCRY`z*W_<KU@cQ4`nFZp<VwcO
z>gq<5F$wk;bByaY6ST{=+M?-}__mBU#Z8-AtWpGG$<DNNQ3=IVJrJ5YTwC1d%RR(T
zP!91T>=Mu8FN8<vaFWi4E~ynY6J*wSjxn;MY<K!xzH#|Zpu6udy(RLm;3F>kA|B4!
zFAxtbAm@koNSB|yxOfka^NXUv@2?9C(NX3fC$G3euCl=>Ge-DrjMI6HAy$<H@&vu4
zqPjrD3(XzlPnX4>t0pqP%oyde_l`JMyy{NDr8MFUi~T?9TzeN873(z`SLELeO3saf
z4C=!YyPJ>1u18NywsT=(%x43&w6cUa^>X(nzGgLTtfgIE9b%JgB1I3KBBL($u$cpF
z;UH<W2=5f#oF*%W+sYNu>@`77u${Z~@_;@b)6WyB@su3TMWe;i{`2>nZ^mYleB}sy
uC7k3w{Krye3)fl-LaCl2A<@rm*_dCbcx68j?e_@11{yIW=bq&Ixc?SKjM{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
zcmZXSOK1~O6o$V$ouotSqv@uOsEby##Ka&dXu7e2tqbYSg>;pQmP$?W(OR{2()vJc
zRbs?Pd@S4ql%gT+BvGlM6bfpoC?YB%Xnl0ojkt>*XR;7w;GBE@^K;HOb7!dbd2Q9x
z;=^%Z9pB5*6l>y*OXEdfx}nvm+El-NZ=@#@>gWnJb#(4-NW@fqreMryhOtNLXk=ez
zxH4K+vlcJqpjHM(*^;BF#s7%SI|B*d;w4tVCRJcpSU2@4^t7qlbenqhJ)1UD4?3}W
z#HL-e`~PdMIqmi{ZW?n_)=6TJrTIL|6=6?`X48|WPEp`-*lT)6Eyi;^N#acrlob=s
z3elO&F=aC?+KZAVFfXNi{b#NW=~X0ujXAvjfT?GBBh3=Y+kX(G^Zsx64<)vbX-ht>
zMuo(?_$BVg;2^6w#A?Yw4iKW7_4KfT!-VOjks~y7lopP$gFag6r;X#ZV-Y1L?g3E;
zIU&y(PLbd=SLAeuvy5<#2Mm#Am`Tp_4C?}~xX3#(&2ou3E;BFopIoKLHRa*DsvxO+
z+)y>#R4cfp>bOm%pl);Tlm#r5N^X}=_)yL%CNLU?TE=I#QYJ6)L$C(X1t-o)!SV>u
RMrIfBMSc#&SDB#k?Kigfo<INq

delta 581
zcmZ9JOGuPa6vuyeoEe8K7(Z}f;6|axd|jnn1V&K<g^O}gi;$8a7ZEKg%e3cLL(;<v
z2C>JKfs2?ZLWZ$BGZrQx3eiKP=!FznwrSC-O)z!tH$)%@{+D~s|D6B--21$?w>J8$
zI5G;X<a;>*g`3>4I9aUBtl1G!Zl9-?XJ1BM1+sT5_LX^IY@ovKF!4N_w!|K>zSUl$
z4bfeO!91IDY<2D!wi|Z3hV&TiEqan*MjJY{bKkIAudv`eFznIJ(7c4t%J`+Mj}Lv!
zS@fhRVub=Vil$(icy+Kqonnl~O`+=0Fr#^%qzI>3rk$sDvQ3WXnKZo6&QvKQ^3&RR
zBNJ_Vw<7gt#JY>QI>%e>l+@q<*Y!PpG<g54&)AybQ%2q`zyiU0!~_ozp@StHVyT>(
zgVb}FRdmwG5mwX1TDpmIlxB|6!g027f>ut_#wptI*vo15b4EH6!a6I_!#RmQ&U4%2
z0)t#6O)pt4QQ)$yeuW7kO_Aia&_2-5XRb2GHGXiNpWNUVDSmTPDQ>9{15}9Bb)}DF
tA&cZDUn;^LN){;cg^jXSJ@3Rwf-*6Y@QqXjMWB&cz7i7ZH|Yy7_ZJaNpQ8W(

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
zcmYk3%}-NN5XFD5-aZOK^6c)V3s)q?01XnNRE-HF22wyl`KSc&fkldZxIh*xEFpog
zfDjg_sWC`QY*4;x$+bX22pa+`*KWkWz_lA;+NyDL=gzrv&Y8LM(s$ysPJZw10~LJE
z!)4%K{NYbt4=JnK-!SNmJAvqE;7)WXa%1t-mwKmK+#XNAq$AF7>Sz8hBesu8p72jg
zHPvxcvUHo<X=<CU>`@=iBv!!c(S*`8f1%aet_f?pq}n;4B&ck4BqUpDBDV4lXa;Td
zA1j-Chc%-DKHFi;Am~m=t$T+FgM%28LDM$3nMyMg$4n6Vqm=>Y(ky6}{vl<W*MF_v
zh^9Ec%{tg-?#a8HLsv3EEZ!T$&t7FHACfYpivl@ca9Peq8M}#?hr3ubQ%(y3iB;U=
z8uz)$18&hu4Q<rZPM8iJ@sOu<GC~&<bTds4vx3g!5T}=A`bhAYH6o<wXO|}&GQcrW
zz6$S~u)j0JMX|5T{dxn16iF%zV3kW4+1phrrB_QxAEki{($Ff!d_sx9bCF-iEe*7>
N!KSRwU`tpolIQz`e^3Ab

delta 462
zcmXYt%PWLo6vltw_&(&4F)Pz7*r;KAgosguEaZOA-MCI8v6u}DBMU1fM2w_KncPjL
zuR$?8H4FX){s~K*8G7q^-}9X3Jm<V8X4|)!W8aU@Kq;XVObYhxPkX4UMKw9>+aI>w
zEH(T7MXlHF)6>3`+*6X}z`Mhs+K(D?gsF?r*jD&N^PpolFC)h%DOZ$&cKucIy1|TY
zaT|E_xYS%?9ye%-hn59{Md6kn@G3afAj4Mmffa=)YfjCog;|fV;U_sreZnSAZAREK
z*!z!*3=aM}9Eq83ITmA|Zq*XJ<s`uc1mni13jUvfsLw+30TXG0tK<r{l0qA)v}2}|
zV!9}iyMhiX>BdP9HS|(PA5HYjYk(mJnGtj|f|pTzjIqu*8%(gggNuD8IcACg(*#9&
z%`9Q&c$AW;6vpuI#ysiLzV>gUWRNM5?3OahQDm4G&S{WQD>)>e3zEdi!zEX!(zaDx
NZ_q?}D^(`$egPZ`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
ncmaFG{)&Br8#Ckb$?nWyysH`58P+lgGpu6}W!Nxz6|(~XpQ#Bc

delta 31
ncmaFG{)&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
fcmZ3$zJPthA0|f5$$y#RSa}&Z82KhAFgpMMS|A2i

delta 23
fcmZ3$zJPthA0|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
vcmcb_afxF?4m0Dy$+^rEM2|9XF&twMVK~kp$8dr{gW)8D0mG@uLM#pd{v``&

delta 39
vcmcb_afxF?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
vcmcc4ah+pBAv5Ed$wkZ)L@zOLF<fR4VYtE|$8eQFgW(#30mJpl;w%mT2H^|Z

delta 39
vcmcc4ah+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
fcmaFF{)l~p2{Yr($)?O1talkW817A8#Owe7W*Z0x

delta 23
fcmaFF{)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
ncmZ3$v4CSk7&GI8$>Gd3yw4c87@jkTFuY)pVR$+D0kZ=Dq<acK

delta 31
ncmZ3$v4CSk7&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
fcmbQoK97CFFDAy<lYcYCvA$>EVE8aOj@bbKa~KHm

delta 23
fcmbQoK97CFFDAxUlYcYCvA$#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
ncmaFE{)T;n4m0DY$-2x%yx$nO7``)zF#KSUVfZ<D4YLCPv0n<6

delta 31
ncmaFE{)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
fcmbQkK8Jn74<^RnlYcVBvHoY^U}Tsa!|VV6Z&C;t

delta 23
fcmbQkK8Jn74<^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
zcmX@Wet><#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
zcmX@Wet><#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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

delta 3594
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
X#hQyT`tpd8pIFuCoozE@2BiKM%61h&

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
zcmaDT@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
zcmaDa@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 fb007b1..445f902 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 d91f367..3acec23 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 dc19af2..6c1a8e1 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 758ec21..d4b34fc 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 729af47..250844d 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 9c4b48d..7a896cf 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.7.4