components/runtime/openjdk-11/patches/tribblix-sparc1.patch

   1 From a gcc build attempt on sparc.
   2
   3 extern static is an error.
   4
   5 AV_HW1_IDX and AV_HW2_IDX are part of getisax() and are defined on
   6 Solaris 11.4 but not present on illumos (or 11.2).
   7
   8 --- a/src/hotspot/os_cpu/solaris_sparc/vm_version_solaris_sparc.cpp     Thu Mar 30 12:53:34 2023
   9 +++ b/src/hotspot/os_cpu/solaris_sparc/vm_version_solaris_sparc.cpp     Thu Mar 30 12:53:40 2023
  10 @@ -35,7 +35,7 @@
  11  #include <dlfcn.h>
  12  #include <link.h>
  13
  14 -extern "C" static int PICL_visit_cpu_helper(picl_nodehdl_t nodeh, void *result);
  15 +extern "C" int PICL_visit_cpu_helper(picl_nodehdl_t nodeh, void *result);
  16
  17  // Functions from the library we need (signatures should match those in picl.h)
  18  extern "C" {
  19 @@ -221,7 +221,7 @@
  20  };
  21
  22
  23 -extern "C" static int PICL_visit_cpu_helper(picl_nodehdl_t nodeh, void *result) {
  24 +extern "C" int PICL_visit_cpu_helper(picl_nodehdl_t nodeh, void *result) {
  25    return PICL::visit_cpu(nodeh, result);
  26  }
  27
  28 @@ -326,6 +326,14 @@
  29  #define _SC_L2CACHE_LINESZ      527     /* Size of L2 cache line */
  30  #endif
  31
  32 +#ifndef AV_HW1_IDX
  33 +#define AV_HW1_IDX 0
  34 +#endif
  35 +
  36 +#ifndef AV_HW2_IDX
  37 +#define AV_HW2_IDX 1
  38 +#endif
  39 +
  40  void VM_Version::platform_features() {
  41    uint64_t features = ISA_v9_msk;   // Basic SPARC-V9 required (V8 not supported).
  42