Update (2024.10.16)

34860: [MIPS] build with gtest failed after JDK-8300806
loongson · Oct 16, 2024 · c6583c8 · c6583c8
1 parent 6d0dc6b
commit c6583c8
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/hotspot/cpu/mips/register_mips.hpp b/src/hotspot/cpu/mips/register_mips.hpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2015, 2022, Loongson Technology. All rights reserved.
+ * Copyright (c) 2015, 2024, Loongson Technology. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -105,8 +105,9 @@ CONSTANT_REGISTER_DECLARATION(Register, i31,   (31));
 #define NOREG ((Register)(noreg_RegisterEnumValue))
 
 #define I0 ((Register)(i0_RegisterEnumValue))
-#define I1 ((Register)(i1_RegisterEnumValue))
-#define I2 ((Register)(i2_RegisterEnumValue))
+// Conflict with I1 and I2 in googlemock/include/gmock/gmock-actions.h
+//#define I1 ((Register)(i1_RegisterEnumValue))
+//#define I2 ((Register)(i2_RegisterEnumValue))
 #define I3 ((Register)(i3_RegisterEnumValue))
 #define I4 ((Register)(i4_RegisterEnumValue))
 #define I5 ((Register)(i5_RegisterEnumValue))