src/hotspot/os/bsd/os_bsd.cpp

rev 59103 : imported patch hotspot

*** 220,235 ****
  static char cpu_arch[] = "amd64";
  #elif defined(ARM)
  static char cpu_arch[] = "arm";
  #elif defined(PPC32)
  static char cpu_arch[] = "ppc";
- #elif defined(SPARC)
-   #ifdef _LP64
- static char cpu_arch[] = "sparcv9";
-   #else
- static char cpu_arch[] = "sparc";
-   #endif
  #else
    #error Add appropriate cpu_arch setting
  #endif
  
  // Compiler variant
--- 220,229 ----
*** 1371,1383 ****
    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"},
      {EM_PPC64,       EM_PPC64,   ELFCLASS64, ELFDATA2MSB, (char*)"Power PC 64"},
      {EM_ARM,         EM_ARM,     ELFCLASS32,   ELFDATA2LSB, (char*)"ARM"},
      {EM_S390,        EM_S390,    ELFCLASSNONE, ELFDATA2MSB, (char*)"IBM System/390"},
      {EM_ALPHA,       EM_ALPHA,   ELFCLASS64, ELFDATA2LSB, (char*)"Alpha"},
--- 1365,1374 ----
*** 1391,1404 ****
    static  Elf32_Half running_arch_code=EM_386;
    #elif   (defined AMD64)
    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 ARM)
--- 1382,1391 ----
*** 1415,1425 ****
    static  Elf32_Half running_arch_code=EM_MIPS;
    #elif  (defined M68K)
    static  Elf32_Half running_arch_code=EM_68K;
    #else
      #error Method os::dll_load requires that one of following is defined:\
!          IA32, AMD64, IA64, __sparc, __powerpc__, ARM, S390, ALPHA, MIPS, MIPSEL, PARISC, M68K
    #endif
  
    // Identify compatability class for VM's architecture and library's architecture
    // Obtain string descriptions for architectures
  
--- 1402,1412 ----
    static  Elf32_Half running_arch_code=EM_MIPS;
    #elif  (defined M68K)
    static  Elf32_Half running_arch_code=EM_68K;
    #else
      #error Method os::dll_load requires that one of following is defined:\
!          IA32, AMD64, IA64, __powerpc__, ARM, S390, ALPHA, MIPS, MIPSEL, PARISC, M68K
    #endif
  
    // Identify compatability class for VM's architecture and library's architecture
    // Obtain string descriptions for architectures