From 682ddfaf7c933915470a64fca5668ddc4110a3c6 Mon Sep 17 00:00:00 2001
From: doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 15 Jan 2013 13:58:43 +0000
Subject: [PATCH] 2013-01-10  Matthias Klose <doko@ubuntu.com>

        * tools/gnu/classpath/tools/gjdoc/Main.java: Accept -source 1.5,
        1.6, 1.7.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@195197 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libjava/classpath/ChangeLog                         |   5 +++++
 .../classes/gnu/classpath/tools/gjdoc/Main$10.class | Bin 1221 -> 1691 bytes
 .../classes/gnu/classpath/tools/gjdoc/Main$11.class | Bin 1728 -> 1728 bytes
 .../classes/gnu/classpath/tools/gjdoc/Main$12.class | Bin 1799 -> 1799 bytes
 .../classes/gnu/classpath/tools/gjdoc/Main$13.class | Bin 1799 -> 1799 bytes
 .../classes/gnu/classpath/tools/gjdoc/Main$14.class | Bin 929 -> 929 bytes
 .../classes/gnu/classpath/tools/gjdoc/Main$15.class | Bin 923 -> 923 bytes
 .../classes/gnu/classpath/tools/gjdoc/Main$16.class | Bin 1715 -> 1715 bytes
 .../classes/gnu/classpath/tools/gjdoc/Main$17.class | Bin 828 -> 828 bytes
 .../classes/gnu/classpath/tools/gjdoc/Main$18.class | Bin 809 -> 809 bytes
 .../classes/gnu/classpath/tools/gjdoc/Main$19.class | Bin 809 -> 809 bytes
 .../classes/gnu/classpath/tools/gjdoc/Main$20.class | Bin 1382 -> 1382 bytes
 .../classes/gnu/classpath/tools/gjdoc/Main$21.class | Bin 1400 -> 1400 bytes
 .../classes/gnu/classpath/tools/gjdoc/Main$22.class | Bin 809 -> 809 bytes
 .../classes/gnu/classpath/tools/gjdoc/Main$23.class | Bin 809 -> 809 bytes
 .../classes/gnu/classpath/tools/gjdoc/Main$24.class | Bin 809 -> 809 bytes
 .../classes/gnu/classpath/tools/gjdoc/Main$25.class | Bin 809 -> 809 bytes
 .../classes/gnu/classpath/tools/gjdoc/Main.class    | Bin 28819 -> 28819 bytes
 .../tools/gnu/classpath/tools/gjdoc/Main.java       |  11 ++++++++---
 19 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 37d11a3..0fd8752 100644
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-10  Matthias Klose <doko@ubuntu.com>
+
+	* tools/gnu/classpath/tools/gjdoc/Main.java: Accept -source 1.5,
+	1.6, 1.7.
+
 2012-12-17  Andrew Haley  <aph@redhat.com>
 
 	PR gcc/55716
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$10.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$10.class
index b89326a1af714e698d510f85560448e2591f5c2a..d9aa037e68da199160132c8edbbf74d817b8271e 100644
GIT binary patch
delta 730
zcmZuuO-~b16g_XI;|!Cc_)sc@z<?;VrL8Trh1M_d13@SsRk5Ori40^&J2OtF#;zK7
zuAR8B{s47}F@;E?D>ts)`vd$B#y4$3YxFJdJLjGI?mPFsZ(VP@<?p{ge*qB3<30HY
zAxZZqd0k6M2ovz}Xu1m##6(01dUn-kYOJUlJF$GV>}VxFE+WpdG}|UPz0{O-Gq!5$
zhLd+}O)X_bOcDe-E;>xynXBl<EzOpYBpBP6UC%A#<}*sUVp*o`DBGqzpqQ4Un}!l8
zn-%+srpQPj?T3hIm+)r-9?kfX#U+Acs%2@$7C|KFu94na%SX#*=WAIBS6CB@URJc{
zmS*cE&2ZGBSL&J{vzQ~09FzHG1_@3DFZ@#|E8_-kiMUD7`=4h0n8!33hiG{NC>jzL
znj=g|xYGoa5|*1_O2mr$f*Y3C2%fGO#j4`CAGqbS*}t4+lz22b!9vOl>8Okx(r!P$
z$QSU?-R9rde!&Nh{hb^71Ubwn4$wyjJ$!(n21e@`p}|f{X{b%#VEiK{4v{F(sePo5
zgc*9dftd!bHgNqNGW7P5!U~4zVw=|L7^F*WUPt#Kas|4&kM*y6%om5_EQTNh!VqL(
z82y5RpfG~8Fp5oK47<WPRE6_+DFpFK2;&6H?`!ph9-L&1b%#9ef(;J$7~^ms8*KL>
VFn|ZxWRS8$!gg=*2;h;A`vXYYrf~oO

delta 255
zcmbQudz6#w)W2Q(7#J7~8EiLlU14N2ntY#eDz7mIgEk`rv!R{|JA>}zugvnC`iu<0
z{&_i-3X|nneEIdb7<3p6c^KFkj2Ib2H6{l#icIcf@nW`Qu$p|EWd&y!12Y2?&{U_%
zJ**P-+CmyyTNt=@Fvx9VP@2UcBcz4Q<=xGo6Dg#(oxx!LMxYiZ20kDu#lXhEz$(YU
z#VXGr$*RDh!K%n$&Z^Ad$g0M`50n>!7|$TUAPD3EEn+ZcFkt{XnZXpuV`4C4FbC2s
a4B`wH4C2;6rVvn&5lDjoGf>!ug$V!+2Pd!q

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$11.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$11.class
index 4c2f6db71e8a5631f5b9a93868fe9cda9d79cb05..83f5cf394e43daa48b427b22b967224600105e14 100644
GIT binary patch
delta 75
zcmX@Wdw_RC1}mfP<V@BbmIe&ctcDCqtVRr~Kw1+>>#&+I7_yo&ShJcjII~(Xgs@sN
Y!~p38R%?cQpnNe<T^XzG<S4c@03iDfUH||9

delta 75
zcmX@Wdw_RC1}me+<V@Bbmf8%`tU3%zthx-UKw1+>>#*uG7_u5LShE^3II|ivgs_@0
Y!~p38Rx^ftpnNe<T^Xyz<S4c@02Toa4gdfE

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$12.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$12.class
index 0869d61f60191c5181573d9d50364771b1aba57d..286f38be883c6fedcdd6b59e4f17ebe18de1b6f7 100644
GIT binary patch
delta 75
zcmZqYYv<c=gq6{8@=?~cmaYuEtZobftnLh=tey;VtX>T2tlkU;tUe5etiBA!K-!Yk
bkHL-ApCJfHhp`4SqyW`tvj$II%@zXyMzaoj

delta 75
zcmZqYYv<c=gq6`|@=?~cmJSTOtd0x<tWFG~tS$_4tgZ~|tZobjtnLhktR4);K-!Yk
blfjMEiy;U|hq3xFqyW`tv-(Y5%@zXyJGl-j

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$13.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$13.class
index 021d8852511211be7a5a9273199d9fe408d2cb7c..2754c8e4cb6fc11e397f801f68f6572bd3fcfc3f 100644
GIT binary patch
delta 75
zcmZqYYv<c=gq1OL@=?~cmXQp+tWgXCtkDdjtg#GotZ@wLtnmy6tO*Q;tceW9K-!Wu
biNTFEnIQ;Bhq0zIqyW`tv!+j8%@zXya+?pj

delta 75
zcmZqYYv<c=gq1O1@=?~cmLUwhtf347tYHkItPu=ytdR`rtWgXGtkDdHtT7D6K-!Wu
bmcflRjv)w0hp{FwqyW`tvnEYm%@zXyXQ2;j

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$14.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$14.class
index e4806c7148a48ce8d3e7480c3d3aa17a73e90aaf..97a338b76995b66c6e30720fb736c909e7259026 100644
GIT binary patch
delta 23
ecmZ3;zL0$bCo^N#WG-ee)_evI)`H2A%pL$oHU)|R

delta 23
ecmZ3;zL0$bCo^N}WG-ee)+`1N*6hiV%pL$nr3HHc

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$15.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$15.class
index ed5da320b81d4c0e1c7758595670e5b201986bce..acad8f219a2f39fd43670366dca601cf24b75e45 100644
GIT binary patch
delta 26
gcmbQuKAU|3Gh@+YMrL2uat3bJ3Lr~-au%~809kAXA^-pY

delta 26
gcmbQuKAU|3Gh^;#MrL2uA_i{OVjxR=au%~809c;}6951J

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$16.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$16.class
index e0066d314d8f4ee9e6a7007d9c0cb684eb233f64..3a934b8c909026f7a7ad1c04e5bc2d6e1fb054a9 100644
GIT binary patch
delta 99
zcmdnYyP0>xFBZnC$-i0N2G%pMur@HTu{JVrvNkdBur@PDu(mKLu(mR&v9>elv34++
zvUV}pvUW4Lu=X-|vi32=vrb@0VV%fO!8)0thII-<AM136*{m}dmILY4tg|LtvQ+^9
D1NIqv

delta 99
zcmdnYyP0>xFBZnq$-i0N239e!uvRm$vDPqfveq*2u+}k1u+}puur@HLu{JU2u{JZ9
zvbHkVvbHg}uy!zbvUW1WvvxD2u=X%iu=X+3u=X?bu})%`%{rN3Ignn>I(4!oTNMEB
Cs~HUd

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$17.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$17.class
index 0c49dc9f9e8504d359afdaeff4bcf8f41b33d5af..73076d604a07afdabfb69b3a2a19f7ce830683f2 100644
GIT binary patch
delta 23
fcmdnPwuf!QA|}Q;lNU4jur6faVqG-(3zG)`Ww!_-

delta 23
fcmdnPwuf!QA|}S^lNU4ju+CxNVx2qr3zG)`WhMv{

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$18.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$18.class
index 04172f0e42bd36fbd9fde35a9fc4f69c180a7be9..c439b2f8c0ab456a4bab4c662e2fe4aba016ffb6 100644
GIT binary patch
delta 23
fcmZ3<wvuhbL?*^1lP58Gv94g?U|l)+A(ICHVBrVZ

delta 23
fcmZ3<wvuhbL?*`hlP58Gu`XudU|ll#A(ICHU{D9j

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$19.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$19.class
index c27b42a9a33d58c2741b13c6da4f8d1d700f845a..865a19592333e7f89f1fda394209ab93586b64e7 100644
GIT binary patch
delta 23
fcmZ3<wvuhbL?*`7lP58Gv94#}VBIkJA(ICHVXO!4

delta 23
fcmZ3<wvuhbL?*^%lP58Gv94m^U|l`=A(ICHVH*eE

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$20.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$20.class
index 7b0d498bdb266b811092430bb2f744898940bab6..d075ea4b910eac2e72552f59e8dfc45602fddde3 100644
GIT binary patch
delta 31
ncmaFH^^9vn7YpO2$=xh9yxSSXSa&jrv+iOrV%;-Ygf$2Nvat!z

delta 31
ncmaFH^^9vn7YpOs$=xh9yqg%rShp~Uvu<TDV%<Jjgf$2Nv0@3f

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$21.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$21.class
index 9a0f9ee2d5dbf30642d3a5dfb7efb37461ca573b..1b510d379287f2a55f5307df02e7b1e8324308fc 100644
GIT binary patch
delta 31
ncmeyt^@D4}Di+3llUK7;@E&5|VLi;C%X);tjP>Yb16B_Jz!wUI

delta 31
ncmeyt^@D4}Di+3_lUK7;@a|>cVco}|%etSzjP<}|16B_JzQ_t}

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$22.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$22.class
index bea6401401fdeb9d43c0def6184b34743510a9d8..65887318895192eab9e28dbfd255d94a6a7ef67e 100644
GIT binary patch
delta 23
fcmZ3<wvuhbL?*`LlP58Gv7Tn&U_CSWA(ICHWY`Eo

delta 23
fcmZ3<wvuhbL?*^VlP58Gu^waKU_CzhA(ICHWJd@y

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$23.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$23.class
index e2571d3b48c89bea16fc39756c9fb77b63136495..bded03e1e8e0b40e1c42fc8b828bf8d746c8480a 100644
GIT binary patch
delta 23
fcmZ3<wvuhbL?*^_lP58Gv0h@}V7)x~A(ICHWupjJ

delta 23
fcmZ3<wvuhbL?*_QlP58Gv7Tk%U_CeaA(ICHWfBNT

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$24.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$24.class
index 6b6b275563d9450e8a3fce2e7c154951824e3543..923b3290719b44e253f91fdd5584f37be2b6a0b0 100644
GIT binary patch
delta 23
fcmZ3<wvuhbL?*_olP58GvEF3hV7)c@A(ICHW^M><

delta 23
fcmZ3<wvuhbL?*@ylP58Gv0h=|V7)r|A(ICHW!(r}

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$25.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$25.class
index e02f015bd256874e8c41ecad3392601cfc57b5f4..c9a98f62b7be48e378ce69728e316d4ea0ab94e2 100644
GIT binary patch
delta 23
fcmZ3<wvuhbL?*^NlP58Gu|8nnV0}3GA(ICHXE_Lg

delta 23
fcmZ3<wvuhbL?*`TlP58GvEF9jV7)W>A(ICHW~c~q

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main.class
index a50c91d36d23e4f8bcdf5d283cb3ced0b03615a4..141d3c293f81af20004d301b40c54f270295f059 100644
GIT binary patch
delta 392
zcmWNJJxG;t6vm(PUe7tbT{W+Y*vGvJ22G+4g_4j$H7E!MlB>x5uvZ&&5fKE%!66XO
z5W#KH2DvVxLoF(ZqL7q}+Th^D$wj5|Ge7z-KOTP1!(&;pEX~H_uPSlEFUaEty2p+5
znA@n1-%$(qQYQ~kKd0#ff1yd9p|3ng8@xzaUZYd~;e~n2E9YJBDeqe*p2#~y0Ux25
zk8z)WTQo5olMq-Kz6c6M5tBQp5g)bAH%izR5`BIlLQ>=wV^)`}p$Q8d)Al)8OVhTU
zd`)u}O}&jQyPp+AWEDlS?0(j4H1&pmLS)l+Q_cPkRDK~UJ67FQPkYwmcrc&oQX2Z>
zs=vsU6BNrSO63e?a*ii*fhxJgGx>*?a)oBOMyuSQU2f6gTv9!}*ANCZ2P4WDQ^B|@
zJ~@}xyO`22GMbBTnujIL$GXekHG(Dp<p?=$q8kqYs}7!1iFF4}{zIrfLcYdqDX6E4
J`K#b#&VR+CWpDrh

delta 392
zcmWNJPe{{o7{;IXx4rMzAI{lwq!YG01a@mX7*2Ny(!&HvFLssKKYp%D1RjK-^3XvD
z-op@-AfdxR2s~7WG1;kHhcQ79hA{AA(O=U{a{0Y{c=$XIkG4o#^g5FnyN+WXA%{n)
zn^Sa+?@*F6G|5G}#}8?qOSHr<=q10RH@r?C`5m>mMkoBi>Ewnpz`M>6?`t`e?K;FI
z{){kxL4?0*H2XNlZLk2Y5H5>@nD~$oKZdQpC8Cw=1Gfu43EIU|P397`q@HC-S98O(
zraQTDTGwcPCRDLMRfJ>{JyNkhHC@b4^A<$v`YAu*HeqBNQE6(tkfJ>;S{`ha3x*zj
zv(<M5<Ojm?6MgavSLFzU@*6kg7&qkvx8)Be<P=l#7kA|hv)1M09QUP-1^JIB26$!&
z&y9m+>sAb7%?QfI;H~LE)wp<XbKL}x1~34hWdn2Q2Q==DQb^~#w0i}{^de{?TJ=&C
J+xX{|{1+PFY0v-w

diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Main.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Main.java
index f2315a9..df9c8d9 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Main.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Main.java
@@ -1308,12 +1308,17 @@ public final class Main
           void process(String[] args)
           {
             option_source = args[0];
-            if (!"1.2".equals(option_source)
+            if ("1.5".equals(option_source)
+                || "1.6".equals(option_source)
+                || "1.7".equals(option_source)) {
+              System.err.println("WARNING: support for option -source " + option_source + " is experimental");
+            }
+            else if (!"1.2".equals(option_source)
                 && !"1.3".equals(option_source)
                 && !"1.4".equals(option_source)) {
 
-              throw new RuntimeException("Only he following values are currently"
-                                         + " supported for option -source: 1.2, 1.3, 1.4.");
+              throw new RuntimeException("Only the following values are currently"
+                                         + " supported for option -source: 1.2, 1.3, 1.4; experimental: 1.5, 1.6, 1.7.");
             }
           }
         });
-- 
2.7.4