src/hotspot/cpu/s390/stubGenerator_s390.cpp

@@ -3281,10 +3281,14 @@
      __ z_br(Z_R14);
  
      return start;
    }
  
+   void generate_preuniverse_stubs() {
+     // preuniverse stubs are not needed for s390
+   }
+ 
    void generate_initial_stubs() {
      // Generates all stubs and initializes the entry points.
  
      // Entry points that exist in all platforms.
      // Note: This is code that could be shared among different

@@ -3302,16 +3306,14 @@
      if (UnsafeMemoryAccess::_table == nullptr) {
        UnsafeMemoryAccess::create_table(4); // 4 for setMemory
      }
  
      if (UseCRC32Intrinsics) {
-       StubRoutines::_crc_table_adr     = (address)StubRoutines::zarch::_crc_table;
        StubRoutines::_updateBytesCRC32  = generate_CRC32_updateBytes();
      }
  
      if (UseCRC32CIntrinsics) {
-       StubRoutines::_crc32c_table_addr = (address)StubRoutines::zarch::_crc32c_table;
        StubRoutines::_updateBytesCRC32C = generate_CRC32C_updateBytes();
      }
  
      // Comapct string intrinsics: Translate table for string inflate intrinsic. Used by trot instruction.
      StubRoutines::zarch::_trot_table_addr = (address)StubRoutines::zarch::_trot_table;

@@ -3416,10 +3418,13 @@
    }
  
   public:
    StubGenerator(CodeBuffer* code, StubGenBlobId blob_id) : StubCodeGenerator(code, blob_id) {
      switch(blob_id) {
+     case preuniverse_id:
+       generate_preuniverse_stubs();
+       break;
      case initial_id:
        generate_initial_stubs();
        break;
       case continuation_id:
        generate_continuation_stubs();