diff options
| author | Ivan Dubrov <dubrov.ivan@gmail.com> | 2015-12-03 13:48:25 -0800 |
|---|---|---|
| committer | Ivan Dubrov <dubrov.ivan@gmail.com> | 2015-12-03 13:48:25 -0800 |
| commit | d9ea4ebff9269b6fd0765e2e453d3b3587f2a8b8 (patch) | |
| tree | 48c6bc75dd1c1dcd9d3b36e0f0d34964706d6977 | |
| parent | 94b5179822ed292dfaa93a67dbd4b9c5581540e1 (diff) | |
| parent | cd7a9b19d1fead0758a55254c23c724764a1f69a (diff) | |
| download | dcevm-d9ea4ebff9269b6fd0765e2e453d3b3587f2a8b8.tar.gz dcevm-d9ea4ebff9269b6fd0765e2e453d3b3587f2a8b8.zip | |
Merge pull request #92 from skybber/master
Duplicity distro patch removed from full patch.
| -rw-r--r-- | hotspot/.hg/patches/full-jdk7u85-b02.patch | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/hotspot/.hg/patches/full-jdk7u85-b02.patch b/hotspot/.hg/patches/full-jdk7u85-b02.patch index a08d373c..3b942a21 100644 --- a/hotspot/.hg/patches/full-jdk7u85-b02.patch +++ b/hotspot/.hg/patches/full-jdk7u85-b02.patch @@ -14,18 +14,6 @@ index 3de1dea..8bf7f94 100644 # version 4 and above support fvisibility=hidden (matches jni_x86.h file) # except 4.1.2 gives pointless warnings that can't be disabled (afaik) ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0" -diff --git a/make/openjdk_distro b/make/openjdk_distro -index 520b33d..ea7eff0 100644 ---- a/make/openjdk_distro -+++ b/make/openjdk_distro -@@ -27,6 +27,6 @@ - # - - # Don't put quotes (fail windows build). --HOTSPOT_VM_DISTRO=OpenJDK -+HOTSPOT_VM_DISTRO=Dynamic Code Evolution - COMPANY_NAME= - PRODUCT_NAME=OpenJDK diff --git a/src/cpu/x86/vm/templateTable_x86_32.cpp b/src/cpu/x86/vm/templateTable_x86_32.cpp index fc19edc..d2cddd3 100644 --- a/src/cpu/x86/vm/templateTable_x86_32.cpp |