procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't include minor version in GCJ ABI version (PR java/70839)

Browse source 
PR java/70839
	* decl.c (parse_version): Remove minor handling.

From-SVN: r235575
This commit is contained in:
Rainer Orth 2016-04-28 15:25:14 +00:00
parent 713dedcd5d
commit 97fceb9fa9
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gcc/java/decl.c
View file

@ -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)