Skip to content
Permalink
Browse files
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
  • Loading branch information
Kim Barrett committed Sep 21, 2020
1 parent cc7521c commit bca9e55b1e522cc21b6a53a87fadac4a09688799
Showing with 1 addition and 19 deletions.
  1. +0 −7 src/hotspot/cpu/arm/globalDefinitions_arm.hpp
  2. +1 −12 src/hotspot/share/utilities/breakpoint.hpp
@@ -55,11 +55,4 @@ const bool HaveVFP = true;
#define AD_MD_HPP "adfiles/ad_arm_32.hpp"
#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_GLOBALDEFINITIONS_ARM_HPP
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2019, 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_UTILITIES_BREAKPOINT_HPP
#define SHARE_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

1 comment on commit bca9e55

@bridgekeeper

This comment has been minimized.

Copy link

@bridgekeeper bridgekeeper bot commented on bca9e55 Sep 21, 2020

Please sign in to comment.