src/hotspot/os/linux/os_linux.cpp

rev 59103 : imported patch hotspot

*** 316,343 ****
    return privileges;
  }
  
  
  #ifndef SYS_gettid
! // i386: 224, ia64: 1105, amd64: 186, sparc 143
    #ifdef __ia64__
      #define SYS_gettid 1105
    #else
      #ifdef __i386__
        #define SYS_gettid 224
      #else
        #ifdef __amd64__
          #define SYS_gettid 186
        #else
-         #ifdef __sparc__
-           #define SYS_gettid 143
-         #else
            #error define gettid for the arch
          #endif
        #endif
      #endif
-   #endif
  #endif
  
  
  // pid_t gettid()
  //
--- 316,339 ----
    return privileges;
  }
  
  
  #ifndef SYS_gettid
! // i386: 224, ia64: 1105, amd64: 186
    #ifdef __ia64__
      #define SYS_gettid 1105
    #else
      #ifdef __i386__
        #define SYS_gettid 224
      #else
        #ifdef __amd64__
          #define SYS_gettid 186
        #else
          #error define gettid for the arch
        #endif
      #endif
    #endif
  #endif
  
  
  // pid_t gettid()
  //
*** 406,416 ****
    //      shared libraries:
    //        1: ...
    //        ...
    //        7: The default directories, normally /lib and /usr/lib.
  #ifndef OVERRIDE_LIBPATH
!   #if defined(AMD64) || (defined(_LP64) && defined(SPARC)) || defined(PPC64) || defined(S390)
      #define DEFAULT_LIBPATH "/usr/lib64:/lib64:/lib:/usr/lib"
    #else
      #define DEFAULT_LIBPATH "/lib:/usr/lib"
    #endif
  #else
--- 402,412 ----
    //      shared libraries:
    //        1: ...
    //        ...
    //        7: The default directories, normally /lib and /usr/lib.
  #ifndef OVERRIDE_LIBPATH
!   #if defined(AMD64) || defined(PPC64) || defined(S390)
      #define DEFAULT_LIBPATH "/usr/lib64:/lib64:/lib:/usr/lib"
    #else
      #define DEFAULT_LIBPATH "/lib:/usr/lib"
    #endif
  #else
*** 1856,1868 ****
    static const arch_t arch_array[]={
      {EM_386,         EM_386,     ELFCLASS32, ELFDATA2LSB, (char*)"IA 32"},
      {EM_486,         EM_386,     ELFCLASS32, ELFDATA2LSB, (char*)"IA 32"},
      {EM_IA_64,       EM_IA_64,   ELFCLASS64, ELFDATA2LSB, (char*)"IA 64"},
      {EM_X86_64,      EM_X86_64,  ELFCLASS64, ELFDATA2LSB, (char*)"AMD 64"},
-     {EM_SPARC,       EM_SPARC,   ELFCLASS32, ELFDATA2MSB, (char*)"Sparc 32"},
-     {EM_SPARC32PLUS, EM_SPARC,   ELFCLASS32, ELFDATA2MSB, (char*)"Sparc 32"},
-     {EM_SPARCV9,     EM_SPARCV9, ELFCLASS64, ELFDATA2MSB, (char*)"Sparc v9 64"},
      {EM_PPC,         EM_PPC,     ELFCLASS32, ELFDATA2MSB, (char*)"Power PC 32"},
  #if defined(VM_LITTLE_ENDIAN)
      {EM_PPC64,       EM_PPC64,   ELFCLASS64, ELFDATA2LSB, (char*)"Power PC 64 LE"},
      {EM_SH,          EM_SH,      ELFCLASS32, ELFDATA2LSB, (char*)"SuperH"},
  #else
--- 1852,1861 ----
*** 1885,1898 ****
    static  Elf32_Half running_arch_code=EM_386;
  #elif   (defined AMD64) || (defined X32)
    static  Elf32_Half running_arch_code=EM_X86_64;
  #elif  (defined IA64)
    static  Elf32_Half running_arch_code=EM_IA_64;
- #elif  (defined __sparc) && (defined _LP64)
-   static  Elf32_Half running_arch_code=EM_SPARCV9;
- #elif  (defined __sparc) && (!defined _LP64)
-   static  Elf32_Half running_arch_code=EM_SPARC;
  #elif  (defined __powerpc64__)
    static  Elf32_Half running_arch_code=EM_PPC64;
  #elif  (defined __powerpc__)
    static  Elf32_Half running_arch_code=EM_PPC;
  #elif  (defined AARCH64)
--- 1878,1887 ----
*** 1915,1925 ****
    static  Elf32_Half running_arch_code=EM_SH;
  #elif  (defined RISCV)
    static  Elf32_Half running_arch_code=EM_RISCV;
  #else
      #error Method os::dll_load requires that one of following is defined:\
!         AARCH64, ALPHA, ARM, AMD64, IA32, IA64, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc
  #endif
  
    // Identify compatibility class for VM's architecture and library's architecture
    // Obtain string descriptions for architectures
  
--- 1904,1914 ----
    static  Elf32_Half running_arch_code=EM_SH;
  #elif  (defined RISCV)
    static  Elf32_Half running_arch_code=EM_RISCV;
  #else
      #error Method os::dll_load requires that one of following is defined:\
!         AARCH64, ALPHA, ARM, AMD64, IA32, IA64, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH
  #endif
  
    // Identify compatibility class for VM's architecture and library's architecture
    // Obtain string descriptions for architectures
  
*** 2573,2584 ****
  const char* search_string = "CPU";
  #elif defined(PPC64)
  const char* search_string = "cpu";
  #elif defined(S390)
  const char* search_string = "machine =";
- #elif defined(SPARC)
- const char* search_string = "cpu";
  #else
  const char* search_string = "Processor";
  #endif
  
  // Parses the cpuinfo file for string representing the model name.
--- 2562,2571 ----
*** 2626,2637 ****
    strncpy(cpuinfo, "IA64", length);
  #elif defined(PPC)
    strncpy(cpuinfo, "PPC64", length);
  #elif defined(S390)
    strncpy(cpuinfo, "S390", length);
- #elif defined(SPARC)
-   strncpy(cpuinfo, "sparcv9", length);
  #elif defined(ZERO_LIBARCH)
    strncpy(cpuinfo, ZERO_LIBARCH, length);
  #else
    strncpy(cpuinfo, "unknown", length);
  #endif
--- 2613,2622 ----
*** 3806,3817 ****
      AMD64_ONLY(2 * M)
      ARM32_ONLY(2 * M)
      IA32_ONLY(4 * M)
      IA64_ONLY(256 * M)
      PPC_ONLY(4 * M)
!     S390_ONLY(1 * M)
!     SPARC_ONLY(4 * M);
  #endif // ZERO
  
    FILE *fp = fopen("/proc/meminfo", "r");
    if (fp) {
      while (!feof(fp)) {
--- 3791,3801 ----
      AMD64_ONLY(2 * M)
      ARM32_ONLY(2 * M)
      IA32_ONLY(4 * M)
      IA64_ONLY(256 * M)
      PPC_ONLY(4 * M)
!     S390_ONLY(1 * M);
  #endif // ZERO
  
    FILE *fp = fopen("/proc/meminfo", "r");
    if (fp) {
      while (!feof(fp)) {