correct merge problems

adinn · Nov 19, 2024 · 653a303 · 653a303
1 parent a8042ad
commit 653a303
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 54 deletions.
diff --git a/src/hotspot/cpu/riscv/stubDeclarations_riscv.hpp b/src/hotspot/cpu/riscv/stubDeclarations_riscv.hpp
@@ -35,26 +35,6 @@
   do_arch_entry(riscv, initial, get_previous_sp,                        \
                 get_previous_sp_entry,                                  \
                 get_previous_sp_entry)                                  \
-  do_stub(initial, f2i_fixup)                                           \
-  do_arch_entry(riscv, initial, f2i_fixup, f2i_fixup, f2i_fixup)        \
-  do_stub(initial, f2l_fixup)                                           \
-  do_arch_entry(riscv, initial, f2l_fixup, f2l_fixup, f2l_fixup)        \
-  do_stub(initial, d2i_fixup)                                           \
-  do_arch_entry(riscv, initial, d2i_fixup, d2i_fixup, d2i_fixup)        \
-  do_stub(initial, d2l_fixup)                                           \
-  do_arch_entry(riscv, initial, d2l_fixup, d2l_fixup, d2l_fixup)        \
-  do_stub(initial, float_sign_mask)                                     \
-  do_arch_entry(riscv, initial, float_sign_mask, float_sign_mask,       \
-                float_sign_mask)                                        \
-  do_stub(initial, float_sign_flip)                                     \
-  do_arch_entry(riscv, initial, float_sign_flip, float_sign_flip,       \
-                float_sign_flip)                                        \
-  do_stub(initial, double_sign_mask)                                    \
-  do_arch_entry(riscv, initial, double_sign_mask, double_sign_mask,     \
-                double_sign_mask)                                       \
-  do_stub(initial, double_sign_flip)                                    \
-  do_arch_entry(riscv, initial, double_sign_flip, double_sign_flip,     \
-                double_sign_flip)                                       \
 
 
 #define STUBGEN_CONTINUATION_BLOBS_ARCH_DO(do_stub,                     \

diff --git a/src/hotspot/cpu/riscv/stubRoutines_riscv.hpp b/src/hotspot/cpu/riscv/stubRoutines_riscv.hpp
@@ -70,39 +70,6 @@ class riscv {
 
  public:
 
-<<<<<<< HEAD
-  static address zero_blocks() {
-    return _zero_blocks;
-  }
-
-  static address compare_long_string_LL() {
-    return _compare_long_string_LL;
-  }
-
-  static address compare_long_string_LU() {
-    return _compare_long_string_LU;
-  }
-
-  static address compare_long_string_UL() {
-    return _compare_long_string_UL;
-  }
-
-  static address compare_long_string_UU() {
-    return _compare_long_string_UU;
-  }
-
-  static address string_indexof_linear_ul() {
-    return _string_indexof_linear_ul;
-  }
-
-  static address string_indexof_linear_ll() {
-    return _string_indexof_linear_ll;
-  }
-
-  static address string_indexof_linear_uu() {
-    return _string_indexof_linear_uu;
-  }
-=======
   // declare getters for arch-specific entries
 
 #define DEFINE_ARCH_ENTRY_GETTER(arch, blob_name, stub_name, field_name, getter_name) \
@@ -115,7 +82,6 @@ class riscv {
 
 #undef DEFINE_ARCH_ENTRY_GETTER_INIT
 #undef DEFINE_ARCH_ENTRY_GETTER
->>>>>>> 84b733b3b36 (add arch-specific stub declarations for riscv)
 
   static bool complete() {
     return _completed;