diff options
Diffstat (limited to 'main/gcc/pr70839.patch')
-rw-r--r-- | main/gcc/pr70839.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/main/gcc/pr70839.patch b/main/gcc/pr70839.patch new file mode 100644 index 0000000000..3be1483ac7 --- /dev/null +++ b/main/gcc/pr70839.patch @@ -0,0 +1,42 @@ +https://gcc.gnu.org/ml/gcc-patches/2016-04/msg01791.html + +diff --git a/gcc/java/decl.c b/gcc/java/decl.c +--- 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,9 +533,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 minor release (e.g., from 6.1.0 to ++ 6.2.0). */ ++ abi_version = 100000 * major; + } + if (flag_bootstrap_classes) + abi_version |= FLAG_BOOTSTRAP_LOADER; + |