Mercurial > hg > openjdk > jdk7u > hotspot
changeset 5702:6e42747134be jdk7u101-b00
Merge
author | andrew |
---|---|
date | Fri, 15 Apr 2016 04:31:10 +0100 |
parents | 986d0464b2a9 (current diff) 67b4da0ad88d (diff) |
children | b9b4bc1e05e2 |
files | |
diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/make/linux/makefiles/dtrace.make Thu Apr 14 02:44:12 2016 +0100 +++ b/make/linux/makefiles/dtrace.make Fri Apr 15 04:31:10 2016 +0100 @@ -31,8 +31,8 @@ REASON = "This JDK does not support SDT probes" else -# We need a recent GCC for the default -ifeq "$(shell expr \( $(CC_VER_MAJOR) \>= 4 \) \& \( $(CC_VER_MINOR) \>= 4 \) )" "0" +# We need a recent GCC for the default (4.4 or later) +ifeq "$(shell expr \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 4 \) \) \| \( $(CC_VER_MAJOR) \>= 5 \) )" "0" REASON = "gcc version is too old" else
--- a/src/os_cpu/linux_zero/vm/os_linux_zero.cpp Thu Apr 14 02:44:12 2016 +0100 +++ b/src/os_cpu/linux_zero/vm/os_linux_zero.cpp Fri Apr 15 04:31:10 2016 +0100 @@ -55,8 +55,8 @@ #include "utilities/vmError.hpp" address os::current_stack_pointer() { - address dummy = (address) &dummy; - return dummy; + // return the address of the current function + return (address)__builtin_frame_address(0); } frame os::get_sender_for_C_frame(frame* fr) {