diff options
| author | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-04-28 16:21:41 +0000 |
|---|---|---|
| committer | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-04-28 16:21:41 +0000 |
| commit | dfe918945dbb659ea9ecf72f1310d2989e7a64cf (patch) | |
| tree | 579fced337aa6c05dcb9d54e931d59d32388da19 | |
| parent | 0ce7d61e96d530d157f99a9e9dbbba9bbbfc7c3d (diff) | |
Don't include minor version in GCJ ABI version (PR java/70839)
PR java/70839
* decl.c (parse_version): Remove minor handling.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch@235578 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/java/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/java/decl.c | 13 |
2 files changed, 8 insertions, 10 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index ef9db2937ea..c7d3ba11fa5 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +2016-04-28 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + PR java/70839 + * decl.c (parse_version): Remove minor handling. + 2016-04-28 Matthias Klose <doko@ubuntu.com> * decl.c (parse_version): Don't encode the minor version in the abi diff --git a/gcc/java/decl.c b/gcc/java/decl.c index 4e50ce98c23..36989d380ab 100644 --- a/gcc/java/decl.c +++ b/gcc/java/decl.c @@ -507,7 +507,7 @@ static void parse_version (void) { const char *p = version_string; - unsigned int major = 0, minor = 0; + unsigned int major = 0; unsigned int abi_version; /* Skip leading junk. */ @@ -525,13 +525,6 @@ parse_version (void) gcc_assert (*p == '.' && ISDIGIT (p[1])); ++p; - /* Extract minor version. */ - while (ISDIGIT (*p)) - { - minor = minor * 10 + *p - '0'; - ++p; - } - if (flag_indirect_dispatch) { abi_version = GCJ_CURRENT_BC_ABI_VERSION; @@ -540,8 +533,8 @@ parse_version (void) else /* C++ ABI */ { /* Implicit in this computation is the idea that we won't break the - old-style binary ABI in a sub-minor release (e.g., from 6.0 to - 6.1). */ + old-style binary ABI in a minor release (e.g., from 6.1.0 to + 6.2.0). */ abi_version = 100000 * major; } if (flag_bootstrap_classes) |