components/runtime/openjdk-8/patches/0051-patch-jdk_src_solaris_bin_ergo__i586.c.patch

   1 $NetBSD: patch-jdk_src_solaris_bin_ergo__i586.c,v 1.1 2015/07/03 20:40:59 fhajny Exp $
   2
   3 GCC compatability.
   4
   5 --- jdk/src/solaris/bin/ergo_i586.c.orig
   6 +++ jdk/src/solaris/bin/ergo_i586.c
   7 @@ -27,7 +27,7 @@
   8
   9  static unsigned long physical_processors(void);
  10
  11 -#ifdef __solaris__
  12 +#if defined(__solaris__) && !defined(_GNU_SOURCE)
  13
  14  /*
  15   * A utility method for asking the CPU about itself.
  16 @@ -76,7 +76,9 @@
  17    asm(" popl    %ebx");
  18  #endif /* LP64 */
  19  }
  20 +#endif /* __solaris__ && !_GNU_SOURCE */
  21
  22 +#ifdef __solaris__
  23  /* The definition of a server-class machine for solaris-i586/amd64 */
  24  jboolean
  25  ServerClassMachineImpl(void) {
  26 @@ -106,7 +108,7 @@
  27
  28  #endif /* __solaris__ */
  29
  30 -#ifdef __linux__
  31 +#if defined(__linux__) || (defined(__solaris__) && defined(_GNU_SOURCE))
  32
  33  /*
  34   * A utility method for asking the CPU about itself.
  35 @@ -171,6 +173,7 @@
  36  #endif /* _LP64 */
  37  }
  38
  39 +#ifndef __solaris__
  40  /* The definition of a server-class machine for linux-i586 */
  41  jboolean
  42  ServerClassMachineImpl(void) {
  43 @@ -197,6 +200,7 @@
  44             (result == JNI_TRUE ? "true" : "false"));
  45    return result;
  46  }
  47 +#endif /* !__solaris__ */
  48  #endif /* __linux__ */
  49
  50  /*