Bug 255905 - java/openjdk16: Fix compile error with clang 12
Summary: java/openjdk16: Fix compile error with clang 12
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: freebsd-java (Nobody)
URL:
Keywords:
Depends on:
Blocks: 255570
  Show dependency treegraph
 
Reported: 2021-05-15 15:58 UTC by Dimitry Andric
Modified: 2021-05-29 14:15 UTC (History)
0 users

See Also:
bugzilla: maintainer-feedback? (java)


Attachments
Fix java/openjdk16 build with clang 12 (1.28 KB, patch)
2021-05-15 15:58 UTC, Dimitry Andric
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Dimitry Andric freebsd_committer 2021-05-15 15:58:17 UTC
Created attachment 224972 [details]
Fix java/openjdk16 build with clang 12

During an exp-run for llvm 12 (see bug 255570), it turned out that at least openjdk11 and openjdk12 do not build with clang 12.0.0. The exp-run therefore skipped openjdk16.

Building this manually shows that it results in a compile error:

gmake[4]: Leaving directory '/wrkdirs/share/dim/ports/java/openjdk16/work/jdk16u-jdk-16.0.1-9-1/make'
/wrkdirs/share/dim/ports/java/openjdk16/work/jdk16u-jdk-16.0.1-9-1/src/hotspot/cpu/x86/vm_version_ext_x86.cpp:748:3: error: suspicious concatenation of string literals in an array initialization; did you mean to separate the elements with a comma? [-Werror,-Wstring-concatenation]
  "",
  ^
/wrkdirs/share/dim/ports/java/openjdk16/work/jdk16u-jdk-16.0.1-9-1/src/hotspot/cpu/x86/vm_version_ext_x86.cpp:747:3: note: place parentheses around the string literal to silence warning
  "Opteron QC/Phenom"  // Barcelona et.al.
  ^
1 error generated.

This is due to a missing backport of this commit [1]:

commit f8a9602a0a65cdc98eb940aac9529256ded2bf42
Author: Yasumasa Suenaga <ysuenaga@openjdk.org>
Date:   Thu Jan 21 06:08:13 2021 +0000

    8260025: Missing comma in VM_Version_Ext::_family_id_amd

    Reviewed-by: dholmes, stuefe

I have attached a patch that adds this commits as an additional patch.

[1] https://github.com/openjdk/jdk/commit/f8a9602a0a65cdc98eb940aac9529256ded2bf42
Comment 1 commit-hook freebsd_committer 2021-05-29 14:09:44 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6601c2af093e30e2d60a9b29548a9bc71e4c8bcf

commit 6601c2af093e30e2d60a9b29548a9bc71e4c8bcf
Author:     Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2021-05-15 15:54:36 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2021-05-29 14:08:19 +0000

    java/openjdk16: fix build with clang 12

    During an exp-run for llvm 12 (see bug 255570), it turned out that at
    least openjdk11 and openjdk12 do not build with clang 12.0.0. The
    exp-run therefore skipped openjdk16.

    Building this manually shows that it results in a compile error:

    gmake[4]: Leaving directory '/wrkdirs/usr/ports/java/openjdk16/work/jdk16u-jdk-16.0.1-9-1/make'
    /wrkdirs/usr/ports/java/openjdk16/work/jdk16u-jdk-16.0.1-9-1/src/hotspot/cpu/x86/vm_version_ext_x86.cpp:748:3: error: suspicious concatenation of string literals in an array initialization; did you mean to separate the elements with a comma? [-Werror,-Wstring-concatenation]
      "",
      ^
    /wrkdirs/usr/ports/java/openjdk16/work/jdk16u-jdk-16.0.1-9-1/src/hotspot/cpu/x86/vm_version_ext_x86.cpp:747:3: note: place parentheses around the string literal to silence warning
      "Opteron QC/Phenom"  // Barcelona et.al.
      ^
    1 error generated.

    This is due to a missing backport of this upstream commit:

    commit f8a9602a0a65cdc98eb940aac9529256ded2bf42
    Author: Yasumasa Suenaga <ysuenaga@openjdk.org>
    Date:   Thu Jan 21 06:08:13 2021 +0000

        8260025: Missing comma in VM_Version_Ext::_family_id_amd

        Reviewed-by: dholmes, stuefe

    Approved by:    maintainer timeout (2 weeks)
    PR:             255905
    MFH:            2021Q2

 .../openjdk16/files/patch-commit-f8a9602a0a6 (new) | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)