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
This commit is contained in:
parent
cc7521c452
commit
bca9e55b1e
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user