37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
--- gcc-6.1.0/gcc/java/decl.c.orig 2016-02-08 16:36:16.000000000 +0100
|
|
+++ gcc-6.1.0/gcc/java/decl.c 2016-05-08 13:57:25.854163381 +0200
|
|
@@ -507,7 +507,7 @@
|
|
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 @@
|
|
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;
|
|
--- gcc-6.1.0/gcc/java/decl.c.orig 2016-05-08 17:15:16.964134546 +0200
|
|
+++ gcc-6.1.0/gcc/java/decl.c 2016-05-08 17:15:25.304134521 +0200
|
|
@@ -535,7 +535,7 @@
|
|
/* 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;
|
|
+ abi_version = 100000 * major;
|
|
}
|
|
if (flag_bootstrap_classes)
|
|
abi_version |= FLAG_BOOTSTRAP_LOADER;
|