Skip to content

Commit bca9e55

Browse files
author
Kim Barrett
committed
8253167: ARM32 builds fail after JDK-8247910
8213483: ARM32: runtime/ErrorHandling/ShowRegistersOnAssertTest.java jtreg test fail Removed platform-dependent definitions of BREAKPOINT as asm(breakpoint instruction). Reviewed-by: coleenp, mikael, bulasevich
1 parent cc7521c commit bca9e55

File tree

2 files changed

+1
-19
lines changed

2 files changed

+1
-19
lines changed

src/hotspot/cpu/arm/globalDefinitions_arm.hpp

-7
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,4 @@ const bool HaveVFP = true;
5555
#define AD_MD_HPP "adfiles/ad_arm_32.hpp"
5656
#define C1_LIRGENERATOR_MD_HPP "c1_LIRGenerator_arm.hpp"
5757

58-
#ifdef TARGET_COMPILER_gcc
59-
#ifdef ARM32
60-
#undef BREAKPOINT
61-
#define BREAKPOINT __asm__ volatile ("bkpt")
62-
#endif
63-
#endif
64-
6558
#endif // CPU_ARM_GLOBALDEFINITIONS_ARM_HPP

src/hotspot/share/utilities/breakpoint.hpp

+1-12
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -25,17 +25,6 @@
2525
#ifndef SHARE_UTILITIES_BREAKPOINT_HPP
2626
#define SHARE_UTILITIES_BREAKPOINT_HPP
2727

28-
// Provide BREAKPOINT macro for requesting stop in the debugger.
29-
30-
// We presently only have one non-default definition, so it's not
31-
// worth going through the COMPILER_HEADER() dispatch, with all
32-
// non-visCPP files being empty.
33-
#ifdef TARGET_COMPILER_visCPP
34-
#ifndef _WIN64
35-
#define BREAKPOINT __asm { int 3 }
36-
#endif // _WIN64
37-
#endif // TARGET_COMPILER_visCPP
38-
3928
// If no more specific definition provided, default to calling a
4029
// function that is defined per-platform. See also os::breakpoint().
4130
#ifndef BREAKPOINT

0 commit comments

Comments
 (0)