8349070: Fix riscv and ppc build errors caused by JDK-8343767

Reviewed-by: mdoerr, fyang, jwaters

Author: adinn

src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp

@@ -1,10 +1,6 @@
 /*
  * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
-<<<<<<< HEAD
  * Copyright (c) 2014, 2025, Red Hat Inc. All rights reserved.
-=======
- * Copyright (c) 2014, 2024, Red Hat Inc. All rights reserved.
->>>>>>> master
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

src/hotspot/cpu/arm/stubRoutines_arm.cpp

@@ -1,9 +1,5 @@
 /*
-<<<<<<< HEAD
- * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
-=======
  * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
->>>>>>> master
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

src/hotspot/cpu/ppc/stubGenerator_ppc.cpp

@@ -1,10 +1,6 @@
 /*
  * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
-<<<<<<< HEAD
  * Copyright (c) 2012, 2025 SAP SE. All rights reserved.
-=======
- * Copyright (c) 2012, 2024 SAP SE. All rights reserved.
->>>>>>> master
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -4599,21 +4595,13 @@ void generate_lookup_secondary_supers_table_stub() {
       r_bitmap       = R11_scratch1,
       result         = R8_ARG6;
 
-<<<<<<< HEAD
     for (int slot = 0; slot < Klass::SECONDARY_SUPERS_TABLE_SIZE; slot++) {
       StubRoutines::_lookup_secondary_supers_table_stubs[slot] = __ pc();
-      __ lookup_secondary_supers_table(r_sub_klass, r_super_klass,
-                                       r_array_base, r_array_length, r_array_index,
-                                       r_bitmap, result, slot);
+      __ lookup_secondary_supers_table_const(r_sub_klass, r_super_klass,
+                                             r_array_base, r_array_length, r_array_index,
+                                             r_bitmap, result, slot);
       __ blr();
     }
-=======
-    __ lookup_secondary_supers_table_const(r_sub_klass, r_super_klass,
-                                           r_array_base, r_array_length, r_array_index,
-                                           r_bitmap, result, super_klass_index);
-    __ blr();
->>>>>>> master
-
   }
 
   // Slow path implementation for UseSecondarySupersTable.

src/hotspot/cpu/riscv/stubGenerator_riscv.cpp

@@ -1,10 +1,6 @@
 /*
  * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
-<<<<<<< HEAD
  * Copyright (c) 2014, 2025, Red Hat Inc. All rights reserved.
-=======
- * Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
->>>>>>> master
  * Copyright (c) 2020, 2023, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -3034,28 +3030,16 @@ class StubGenerator: public StubCodeGenerator {
       result         = x15,
       r_bitmap       = x16;
 
-<<<<<<< HEAD
     for (int slot = 0; slot < Klass::SECONDARY_SUPERS_TABLE_SIZE; slot++) {
       StubRoutines::_lookup_secondary_supers_table_stubs[slot] = __ pc();
       Label L_success;
       __ enter();
-      __ lookup_secondary_supers_table(r_sub_klass, r_super_klass, result,
-                                       r_array_base, r_array_length, r_array_index,
-                                       r_bitmap, slot, /*stub_is_near*/true);
+      __ lookup_secondary_supers_table_const(r_sub_klass, r_super_klass, result,
+                                             r_array_base, r_array_length, r_array_index,
+                                             r_bitmap, slot, /*stub_is_near*/true);
       __ leave();
       __ ret();
     }
-=======
-    Label L_success;
-    __ enter();
-    __ lookup_secondary_supers_table_const(r_sub_klass, r_super_klass, result,
-                                           r_array_base, r_array_length, r_array_index,
-                                           r_bitmap, super_klass_index, /*stub_is_near*/ true);
-    __ leave();
-    __ ret();
-
-    return start;
->>>>>>> master
   }
 
   // Slow path implementation for UseSecondarySupersTable.

src/hotspot/cpu/riscv/stubRoutines_riscv.cpp

@@ -1,11 +1,6 @@
 /*
-<<<<<<< HEAD
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2014, 2024, Red Hat Inc. All rights reserved.
-=======
  * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2014, Red Hat Inc. All rights reserved.
->>>>>>> master
+ * Copyright (c) 2014, 2025, Red Hat Inc. All rights reserved.
  * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *

src/hotspot/cpu/s390/stubRoutines_s390.cpp

@@ -1,9 +1,5 @@
 /*
-<<<<<<< HEAD
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
-=======
  * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
->>>>>>> master
  * Copyright (c) 2016, 2023 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *

src/hotspot/cpu/zero/stubRoutines_zero.cpp

@@ -1,9 +1,5 @@
 /*
-<<<<<<< HEAD
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
-=======
  * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
->>>>>>> master
  * Copyright 2008, 2009 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *