From: aph Date: Wed, 25 Apr 2012 10:18:38 +0000 (+0000) Subject: 2012-04-23 Andrew Haley X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=commitdiff_plain;h=e35a015d49393795aae88bd085d8ce477e5047f6;hp=3775425c9dbed2b5eb6166374eddcf00c08b008d 2012-04-23 Andrew Haley * defineclass.cc (MAJOR_1_7, MINOR_1_7): New. (parse): Allow MAJOR_1_7 classfile version. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@186810 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 11dcd7cdfec..5b7e243bcc1 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2012-04-23 Andrew Haley + + * defineclass.cc (MAJOR_1_7, MINOR_1_7): New. + (parse): Allow MAJOR_1_7 classfile version. + 2012-03-22 Release Manager * GCC 4.7.0 released. diff --git a/libjava/defineclass.cc b/libjava/defineclass.cc index 4c4e0a7f45d..17f60816c69 100644 --- a/libjava/defineclass.cc +++ b/libjava/defineclass.cc @@ -361,6 +361,8 @@ _Jv_DefineClass (jclass klass, jbyteArray data, jint offset, jint length, #define MINOR_1_5 0 #define MAJOR_1_6 50 #define MINOR_1_6 0 +#define MAJOR_1_7 51 +#define MINOR_1_7 0 void _Jv_ClassReader::parse () @@ -371,8 +373,8 @@ _Jv_ClassReader::parse () int minor_version = read2u (); int major_version = read2u (); - if (major_version < MAJOR_1_1 || major_version > MAJOR_1_6 - || (major_version == MAJOR_1_6 && minor_version > MINOR_1_6)) + if (major_version < MAJOR_1_1 || major_version > MAJOR_1_7 + || (major_version == MAJOR_1_7 && minor_version > MINOR_1_7)) throw_class_format_error ("unrecognized class file version"); is_15 = (major_version >= MAJOR_1_5);