diff options
| author | Matthias Klose <doko@ubuntu.com> | 2016-04-28 08:22:10 +0000 |
|---|---|---|
| committer | Matthias Klose <doko@gcc.gnu.org> | 2016-04-28 08:22:10 +0000 |
| commit | a564d350951a990136fe6a5010b7eaa165f17c58 (patch) | |
| tree | 112f70e85cf38af50c30bdd9f553556e963928e7 /gcc/java | |
| parent | cc5999c8e32f0d2ba7c73e1ec372b614064b7066 (diff) | |
| download | gcc-a564d350951a990136fe6a5010b7eaa165f17c58.zip gcc-a564d350951a990136fe6a5010b7eaa165f17c58.tar.gz gcc-a564d350951a990136fe6a5010b7eaa165f17c58.tar.bz2 | |
decl.c (parse_version): Don't encode the minor version in the abi version.
2016-04-28 Matthias Klose <doko@ubuntu.com>
* decl.c (parse_version): Don't encode the minor version in the abi
version.
From-SVN: r235546
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/java/decl.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 7c20b06..5ed24e4 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +2016-04-28 Matthias Klose <doko@ubuntu.com> + + * decl.c (parse_version): Don't encode the minor version in the abi + version. + 2016-04-18 Michael Matz <matz@suse.de> * class.c (add_method_1): Use SET_DECL_ALIGN. diff --git a/gcc/java/decl.c b/gcc/java/decl.c index 93304da..4e50ce9 100644 --- a/gcc/java/decl.c +++ b/gcc/java/decl.c @@ -540,9 +540,9 @@ 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 4.0.0 to - 4.0.1). */ - abi_version = 100000 * major + 1000 * minor; + old-style binary ABI in a sub-minor release (e.g., from 6.0 to + 6.1). */ + abi_version = 100000 * major; } if (flag_bootstrap_classes) abi_version |= FLAG_BOOTSTRAP_LOADER; |