# HG changeset patch
# User kbarrett
# Date 1600648286 0
#      Mon Sep 21 00:31:26 2020 +0000
# Node ID d34571de2426f2653097440870ecababce4bf84d
# Parent  17b413fd753313de29f3cef3f00535621556094e
8253167: ARM32 builds fail after JDK-8247910
8213483: ARM32: runtime/ErrorHandling/ShowRegistersOnAssertTest.java jtreg test fail
Summary: Removed platform-dependent definitions of BREAKPOINT as asm(breakpoint instruction).
Reviewed-by: coleenp, mikael, bulasevich

diff --git a/src/hotspot/cpu/arm/globalDefinitions_arm.hpp b/src/hotspot/cpu/arm/globalDefinitions_arm.hpp
--- a/src/hotspot/cpu/arm/globalDefinitions_arm.hpp
+++ b/src/hotspot/cpu/arm/globalDefinitions_arm.hpp
@@ -69,11 +69,4 @@
 #endif
 #define C1_LIRGENERATOR_MD_HPP "c1_LIRGenerator_arm.hpp"
 
-#ifdef TARGET_COMPILER_gcc
-#ifdef ARM32
-#undef BREAKPOINT
-#define BREAKPOINT __asm__ volatile ("bkpt")
-#endif
-#endif
-
 #endif // CPU_ARM_VM_GLOBALDEFINITIONS_ARM_HPP
diff --git a/src/hotspot/share/utilities/breakpoint.hpp b/src/hotspot/share/utilities/breakpoint.hpp
--- a/src/hotspot/share/utilities/breakpoint.hpp
+++ b/src/hotspot/share/utilities/breakpoint.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. 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
@@ -25,17 +25,6 @@
 #ifndef SHARE_VM_UTILITIES_BREAKPOINT_HPP
 #define SHARE_VM_UTILITIES_BREAKPOINT_HPP
 
-// Provide BREAKPOINT macro for requesting stop in the debugger.
-
-// We presently only have one non-default definition, so it's not
-// worth going through the COMPILER_HEADER() dispatch, with all
-// non-visCPP files being empty.
-#ifdef TARGET_COMPILER_visCPP
-#ifndef _WIN64
-#define BREAKPOINT __asm { int 3 }
-#endif // _WIN64
-#endif //  TARGET_COMPILER_visCPP
-
 // If no more specific definition provided, default to calling a
 // function that is defined per-platform.  See also os::breakpoint().
 #ifndef BREAKPOINT