From 97fceb9fa9ab2bf706c334f20f0ce605fae5a047 Mon Sep 17 00:00:00 2001
From: Rainer Orth <ro@gcc.gnu.org>
Date: Thu, 28 Apr 2016 15:25:14 +0000
Subject: [PATCH] Don't include minor version in GCJ ABI version (PR
java/70839)
PR java/70839
* decl.c (parse_version): Remove minor handling.
From-SVN: r235575
---
gcc/java/decl.c | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/gcc/java/decl.c b/gcc/java/decl.c
index 4e50ce98c23f..36989d380abc 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)
--
GitLab