Mercurial > hg > release > icedtea7-2.3
changeset 2648:10333436ab3e
PR1363: Fedora 19 / rawhide FTBFS SIGILL
PR1401: Fix Zero build on 2.3.8
2013-04-08 Andrew John Hughes <gnu.andrew@member.fsf.org>
* Makefile.am:
(ICEDTEA_PATCHES): Obtain revert-7017193 patch
from HotSpot-dependent directory.
* hotspot.map: Update zero to bring in removal
of debuginfo files & ARM fix.
* patches/hotspot/zero/7089790-bsd_port.patch:
Regenerated.
* patches/hotspot/zero/revert-7017193.patch:
Taken from 2.1.
* patches/revert-7017193.patch: Moved to ...
* patches/hotspot/original/revert-7017193.patch:
... here.
* NEWS: Updated.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Wed, 17 Apr 2013 14:31:42 +0100 |
| parents | 87982c9fedc5 |
| children | 4624e54bf5ef |
| files | ChangeLog Makefile.am NEWS hotspot.map patches/hotspot/default/revert-7017193.patch patches/hotspot/zero/7089790-bsd_port.patch patches/hotspot/zero/revert-7017193.patch patches/revert-7017193.patch |
| diffstat | 8 files changed, 751 insertions(+), 593 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Mar 12 21:34:03 2013 +0000 +++ b/ChangeLog Wed Apr 17 14:31:42 2013 +0100 @@ -1,3 +1,21 @@ +2013-04-08 Andrew John Hughes <gnu.andrew@member.fsf.org> + + PR1363: Fedora 19 / rawhide FTBFS SIGILL + PR1401: Fix Zero build on 2.3.8 + * Makefile.am: + (ICEDTEA_PATCHES): Obtain revert-7017193 patch + from HotSpot-dependent directory. + * hotspot.map: Update zero to bring in removal + of debuginfo files & ARM fix. + * patches/hotspot/zero/7089790-bsd_port.patch: + Regenerated. + * patches/hotspot/zero/revert-7017193.patch: + Taken from 2.1. + * patches/revert-7017193.patch: Moved to ... + * patches/hotspot/original/revert-7017193.patch: + ... here. + * NEWS: Updated. + 2013-03-12 Andrew John Hughes <gnu.andrew@member.fsf.org> * patches/8006179-lookup_using_findvirtual.patch,
--- a/Makefile.am Tue Mar 12 21:34:03 2013 +0000 +++ b/Makefile.am Wed Apr 17 14:31:42 2013 +0100 @@ -241,7 +241,7 @@ # Patch list ICEDTEA_PATCHES = \ - patches/revert-7017193.patch + patches/hotspot/$(HSBUILD)/revert-7017193.patch # Conditional patches
--- a/NEWS Tue Mar 12 21:34:03 2013 +0000 +++ b/NEWS Wed Apr 17 14:31:42 2013 +0100 @@ -12,6 +12,10 @@ New in release 2.3.9 (2013-04-XX): +* Bug fixes + - PR1363: Fedora 19 / rawhide FTBFS SIGILL + - PR1401: Fix Zero build on 2.3.8 + New in release 2.3.8 (2013-03-11): * Security fixes
--- a/hotspot.map Tue Mar 12 21:34:03 2013 +0000 +++ b/hotspot.map Wed Apr 17 14:31:42 2013 +0100 @@ -1,3 +1,3 @@ # version url changeset sha256sum -default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 23888f3dec52 6d77e26134d47e62621a35b259c70d8e98070724af9a718ec2b85cf84b954614 -zero http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot d8b22e079abe 28883ebefcfff1ba8b356a7fabf8e449c25fe7fffe1d563f1f58f887100063f0 +default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot ad5a321edea2 c184f29b13626e7327f58e4c1df506daf2b57d8084b7a2d2106504ab0fd5eaac +zero http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot 4e4dd75d54e7 46b4bb240e3ebea1e151c57aa9afb0cb4706f4fc467b651a6c5090101352853d
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/hotspot/default/revert-7017193.patch Wed Apr 17 14:31:42 2013 +0100 @@ -0,0 +1,138 @@ +diff --git a/src/os/linux/vm/os_linux.cpp b/src/os/linux/vm/os_linux.cpp +--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp +@@ -2763,39 +2763,47 @@ + // writing thread stacks don't use growable mappings (i.e. those + // creeated with MAP_GROWSDOWN), and aren't marked "[stack]", so this + // only applies to the main thread. +- +-static +-bool get_stack_bounds(uintptr_t *bottom, uintptr_t *top) { +- +- char buf[128]; +- int fd, sz; +- +- if ((fd = ::open("/proc/self/maps", O_RDONLY)) < 0) { ++static bool ++get_stack_bounds(uintptr_t *bottom, uintptr_t *top) ++{ ++ FILE *f = fopen("/proc/self/maps", "r"); ++ if (f == NULL) + return false; +- } +- +- const char kw[] = "[stack]"; +- const int kwlen = sizeof(kw)-1; +- +- // Address part of /proc/self/maps couldn't be more than 128 bytes +- while ((sz = os::get_line_chars(fd, buf, sizeof(buf))) > 0) { +- if (sz > kwlen && ::memcmp(buf+sz-kwlen, kw, kwlen) == 0) { +- // Extract addresses +- if (sscanf(buf, "%" SCNxPTR "-%" SCNxPTR, bottom, top) == 2) { +- uintptr_t sp = (uintptr_t) __builtin_frame_address(0); +- if (sp >= *bottom && sp <= *top) { +- ::close(fd); +- return true; +- } ++ ++ while (!feof(f)) { ++ size_t dummy; ++ char *str = NULL; ++ ssize_t len = getline(&str, &dummy, f); ++ if (len == -1) { ++ fclose(f); ++ if (str != NULL) ++ free(str); ++ return false; ++ } ++ ++ if (len > 0 && str[len-1] == '\n') { ++ str[len-1] = 0; ++ len--; ++ } ++ ++ static const char *stack_str = "[stack]"; ++ if (len > (ssize_t)strlen(stack_str) ++ && (strcmp(str + len - strlen(stack_str), stack_str) == 0)) { ++ if (sscanf(str, "%" SCNxPTR "-%" SCNxPTR, bottom, top) == 2) { ++ uintptr_t sp = (uintptr_t)__builtin_frame_address(0); ++ if (sp >= *bottom && sp <= *top) { ++ free(str); ++ fclose(f); ++ return true; + } +- } +- } +- +- ::close(fd); ++ } ++ } ++ free(str); ++ } ++ fclose(f); + return false; + } + +- + // If the (growable) stack mapping already extends beyond the point + // where we're going to put our guard pages, truncate the mapping at + // that point by munmap()ping it. This ensures that when we later +diff --git a/src/share/vm/runtime/os.cpp b/src/share/vm/runtime/os.cpp +--- openjdk/hotspot/src/share/vm/runtime/os.cpp ++++ openjdk/hotspot/src/share/vm/runtime/os.cpp +@@ -1331,41 +1331,3 @@ + } + return result; + } +- +-// Read file line by line, if line is longer than bsize, +-// skip rest of line. +-int os::get_line_chars(int fd, char* buf, const size_t bsize){ +- size_t sz, i = 0; +- +- // read until EOF, EOL or buf is full +- while ((sz = (int) read(fd, &buf[i], 1)) == 1 && i < (bsize-2) && buf[i] != '\n') { +- ++i; +- } +- +- if (buf[i] == '\n') { +- // EOL reached so ignore EOL character and return +- +- buf[i] = 0; +- return (int) i; +- } +- +- buf[i+1] = 0; +- +- if (sz != 1) { +- // EOF reached. if we read chars before EOF return them and +- // return EOF on next call otherwise return EOF +- +- return (i == 0) ? -1 : (int) i; +- } +- +- // line is longer than size of buf, skip to EOL +- char ch; +- while (read(fd, &ch, 1) == 1 && ch != '\n') { +- // Do nothing +- } +- +- // return initial part of line that fits in buf. +- // If we reached EOF, it will be returned on next call. +- +- return (int) i; +-} +diff --git a/src/share/vm/runtime/os.hpp b/src/share/vm/runtime/os.hpp +--- openjdk/hotspot/src/share/vm/runtime/os.hpp ++++ openjdk/hotspot/src/share/vm/runtime/os.hpp +@@ -672,10 +672,6 @@ + // Hook for os specific jvm options that we don't want to abort on seeing + static bool obsolete_option(const JavaVMOption *option); + +- // Read file line by line. If line is longer than bsize, +- // rest of line is skipped. Returns number of bytes read or -1 on EOF +- static int get_line_chars(int fd, char *buf, const size_t bsize); +- + // Extensions + #include "runtime/os_ext.hpp" +
--- a/patches/hotspot/zero/7089790-bsd_port.patch Tue Mar 12 21:34:03 2013 +0000 +++ b/patches/hotspot/zero/7089790-bsd_port.patch Wed Apr 17 14:31:42 2013 +0100 @@ -1,6 +1,6 @@ diff -Nru openjdk.orig/hotspot/agent/make/Makefile openjdk/hotspot/agent/make/Makefile ---- openjdk.orig/hotspot/agent/make/Makefile 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/agent/make/Makefile 2012-07-25 15:09:16.172836100 +0100 +--- openjdk.orig/hotspot/agent/make/Makefile 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/agent/make/Makefile 2013-04-08 01:49:33.578321427 +0100 @@ -53,6 +53,9 @@ sun.jvm.hotspot.compiler \ sun.jvm.hotspot.debugger \ @@ -43,7 +43,7 @@ sun/jvm/hotspot/runtime/linux_amd64/*.java \ diff -Nru openjdk.orig/hotspot/agent/src/os/bsd/BsdDebuggerLocal.c openjdk/hotspot/agent/src/os/bsd/BsdDebuggerLocal.c --- openjdk.orig/hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 2012-07-25 15:09:16.172836100 +0100 ++++ openjdk/hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 2013-04-08 01:49:33.578321427 +0100 @@ -0,0 +1,413 @@ +/* + * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved. @@ -460,7 +460,7 @@ +} diff -Nru openjdk.orig/hotspot/agent/src/os/bsd/elfmacros.h openjdk/hotspot/agent/src/os/bsd/elfmacros.h --- openjdk.orig/hotspot/agent/src/os/bsd/elfmacros.h 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/agent/src/os/bsd/elfmacros.h 2012-07-25 15:09:16.172836100 +0100 ++++ openjdk/hotspot/agent/src/os/bsd/elfmacros.h 2013-04-08 01:49:33.578321427 +0100 @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved. @@ -522,7 +522,7 @@ +#endif /* _ELFMACROS_H_ */ diff -Nru openjdk.orig/hotspot/agent/src/os/bsd/libproc.h openjdk/hotspot/agent/src/os/bsd/libproc.h --- openjdk.orig/hotspot/agent/src/os/bsd/libproc.h 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/agent/src/os/bsd/libproc.h 2012-07-25 15:09:16.172836100 +0100 ++++ openjdk/hotspot/agent/src/os/bsd/libproc.h 2013-04-08 01:49:33.578321427 +0100 @@ -0,0 +1,127 @@ +/* + * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. @@ -653,7 +653,7 @@ +#endif //__LIBPROC_H_ diff -Nru openjdk.orig/hotspot/agent/src/os/bsd/libproc_impl.c openjdk/hotspot/agent/src/os/bsd/libproc_impl.c --- openjdk.orig/hotspot/agent/src/os/bsd/libproc_impl.c 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/agent/src/os/bsd/libproc_impl.c 2012-07-25 15:09:16.172836100 +0100 ++++ openjdk/hotspot/agent/src/os/bsd/libproc_impl.c 2013-04-08 01:49:33.578321427 +0100 @@ -0,0 +1,452 @@ +/* + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. @@ -1109,7 +1109,7 @@ +} diff -Nru openjdk.orig/hotspot/agent/src/os/bsd/libproc_impl.h openjdk/hotspot/agent/src/os/bsd/libproc_impl.h --- openjdk.orig/hotspot/agent/src/os/bsd/libproc_impl.h 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/agent/src/os/bsd/libproc_impl.h 2012-07-25 15:09:16.172836100 +0100 ++++ openjdk/hotspot/agent/src/os/bsd/libproc_impl.h 2013-04-08 01:49:33.578321427 +0100 @@ -0,0 +1,130 @@ +/* + * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. @@ -1243,7 +1243,7 @@ +#endif //_LIBPROC_IMPL_H_ diff -Nru openjdk.orig/hotspot/agent/src/os/bsd/Makefile openjdk/hotspot/agent/src/os/bsd/Makefile --- openjdk.orig/hotspot/agent/src/os/bsd/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/agent/src/os/bsd/Makefile 2012-07-25 15:09:16.172836100 +0100 ++++ openjdk/hotspot/agent/src/os/bsd/Makefile 2013-04-08 01:49:33.578321427 +0100 @@ -0,0 +1,78 @@ +# +# Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved. @@ -1325,7 +1325,7 @@ + diff -Nru openjdk.orig/hotspot/agent/src/os/bsd/mapfile openjdk/hotspot/agent/src/os/bsd/mapfile --- openjdk.orig/hotspot/agent/src/os/bsd/mapfile 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/agent/src/os/bsd/mapfile 2012-07-25 15:09:16.172836100 +0100 ++++ openjdk/hotspot/agent/src/os/bsd/mapfile 2013-04-08 01:49:33.578321427 +0100 @@ -0,0 +1,66 @@ +# + @@ -1395,7 +1395,7 @@ +}; diff -Nru openjdk.orig/hotspot/agent/src/os/bsd/ps_core.c openjdk/hotspot/agent/src/os/bsd/ps_core.c --- openjdk.orig/hotspot/agent/src/os/bsd/ps_core.c 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/agent/src/os/bsd/ps_core.c 2012-07-25 15:09:16.172836100 +0100 ++++ openjdk/hotspot/agent/src/os/bsd/ps_core.c 2013-04-08 01:49:33.578321427 +0100 @@ -0,0 +1,1023 @@ +/* + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. @@ -2422,7 +2422,7 @@ +} diff -Nru openjdk.orig/hotspot/agent/src/os/bsd/ps_proc.c openjdk/hotspot/agent/src/os/bsd/ps_proc.c --- openjdk.orig/hotspot/agent/src/os/bsd/ps_proc.c 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/agent/src/os/bsd/ps_proc.c 2012-07-25 15:09:16.172836100 +0100 ++++ openjdk/hotspot/agent/src/os/bsd/ps_proc.c 2013-04-08 01:49:33.578321427 +0100 @@ -0,0 +1,444 @@ +/* + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. @@ -2870,7 +2870,7 @@ +} diff -Nru openjdk.orig/hotspot/agent/src/os/bsd/salibelf.c openjdk/hotspot/agent/src/os/bsd/salibelf.c --- openjdk.orig/hotspot/agent/src/os/bsd/salibelf.c 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/agent/src/os/bsd/salibelf.c 2012-07-25 15:09:16.172836100 +0100 ++++ openjdk/hotspot/agent/src/os/bsd/salibelf.c 2013-04-08 01:49:33.578321427 +0100 @@ -0,0 +1,126 @@ +/* + * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved. @@ -3000,7 +3000,7 @@ +} diff -Nru openjdk.orig/hotspot/agent/src/os/bsd/salibelf.h openjdk/hotspot/agent/src/os/bsd/salibelf.h --- openjdk.orig/hotspot/agent/src/os/bsd/salibelf.h 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/agent/src/os/bsd/salibelf.h 2012-07-25 15:09:16.172836100 +0100 ++++ openjdk/hotspot/agent/src/os/bsd/salibelf.h 2013-04-08 01:49:33.578321427 +0100 @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. @@ -3056,7 +3056,7 @@ +#endif /* _SALIBELF_H_ */ diff -Nru openjdk.orig/hotspot/agent/src/os/bsd/StubDebuggerLocal.c openjdk/hotspot/agent/src/os/bsd/StubDebuggerLocal.c --- openjdk.orig/hotspot/agent/src/os/bsd/StubDebuggerLocal.c 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/agent/src/os/bsd/StubDebuggerLocal.c 2012-07-25 15:09:16.172836100 +0100 ++++ openjdk/hotspot/agent/src/os/bsd/StubDebuggerLocal.c 2013-04-08 01:49:33.578321427 +0100 @@ -0,0 +1,120 @@ +/* + * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. @@ -3180,7 +3180,7 @@ +} diff -Nru openjdk.orig/hotspot/agent/src/os/bsd/symtab.c openjdk/hotspot/agent/src/os/bsd/symtab.c --- openjdk.orig/hotspot/agent/src/os/bsd/symtab.c 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/agent/src/os/bsd/symtab.c 2012-07-25 15:09:16.172836100 +0100 ++++ openjdk/hotspot/agent/src/os/bsd/symtab.c 2013-04-08 01:49:33.578321427 +0100 @@ -0,0 +1,239 @@ +/* + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. @@ -3423,7 +3423,7 @@ +} diff -Nru openjdk.orig/hotspot/agent/src/os/bsd/symtab.h openjdk/hotspot/agent/src/os/bsd/symtab.h --- openjdk.orig/hotspot/agent/src/os/bsd/symtab.h 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/agent/src/os/bsd/symtab.h 2012-07-25 15:09:16.172836100 +0100 ++++ openjdk/hotspot/agent/src/os/bsd/symtab.h 2013-04-08 01:49:33.582321490 +0100 @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. @@ -3477,7 +3477,7 @@ +#endif /*_SYMTAB_H_*/ diff -Nru openjdk.orig/hotspot/agent/src/os/bsd/test.c openjdk/hotspot/agent/src/os/bsd/test.c --- openjdk.orig/hotspot/agent/src/os/bsd/test.c 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/agent/src/os/bsd/test.c 2012-07-25 15:09:16.172836100 +0100 ++++ openjdk/hotspot/agent/src/os/bsd/test.c 2013-04-08 01:49:33.582321490 +0100 @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. @@ -3540,7 +3540,7 @@ +} diff -Nru openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/BsdVtblAccess.java openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/BsdVtblAccess.java --- openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/BsdVtblAccess.java 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/BsdVtblAccess.java 2012-07-25 15:09:16.172836100 +0100 ++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/BsdVtblAccess.java 2013-04-08 01:49:33.582321490 +0100 @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved. @@ -3594,8 +3594,8 @@ + } +} diff -Nru openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java ---- openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2012-07-25 15:09:16.192836435 +0100 +--- openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2013-04-08 01:49:33.582321490 +0100 @@ -29,6 +29,7 @@ import java.rmi.*; import sun.jvm.hotspot.*; @@ -3669,7 +3669,7 @@ debugger setup. Should not be called when startupMode is diff -Nru openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/BsdAMD64CFrame.java openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/BsdAMD64CFrame.java --- openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/BsdAMD64CFrame.java 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/BsdAMD64CFrame.java 2012-07-25 15:09:16.196836500 +0100 ++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/BsdAMD64CFrame.java 2013-04-08 01:49:33.582321490 +0100 @@ -0,0 +1,75 @@ +/* + * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. @@ -3748,7 +3748,7 @@ +} diff -Nru openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/BsdAMD64ThreadContext.java openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/BsdAMD64ThreadContext.java --- openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/BsdAMD64ThreadContext.java 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/BsdAMD64ThreadContext.java 2012-07-25 15:09:16.196836500 +0100 ++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/BsdAMD64ThreadContext.java 2013-04-08 01:49:33.582321490 +0100 @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. @@ -3798,7 +3798,7 @@ +} diff -Nru openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdAddress.java openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdAddress.java --- openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdAddress.java 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdAddress.java 2012-07-25 15:09:16.192836435 +0100 ++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdAddress.java 2013-04-08 01:49:33.582321490 +0100 @@ -0,0 +1,399 @@ +/* + * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved. @@ -4201,7 +4201,7 @@ +} diff -Nru openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java --- openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java 2012-07-25 15:09:16.196836500 +0100 ++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java 2013-04-08 01:49:33.582321490 +0100 @@ -0,0 +1,121 @@ +/* + * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved. @@ -4326,7 +4326,7 @@ +} diff -Nru openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebugger.java openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebugger.java --- openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebugger.java 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebugger.java 2012-07-25 15:09:16.196836500 +0100 ++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebugger.java 2013-04-08 01:49:33.582321490 +0100 @@ -0,0 +1,82 @@ +/* + * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved. @@ -4412,7 +4412,7 @@ +} diff -Nru openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebuggerLocal.java openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebuggerLocal.java --- openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebuggerLocal.java 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebuggerLocal.java 2012-07-25 15:09:16.196836500 +0100 ++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebuggerLocal.java 2013-04-08 01:49:33.582321490 +0100 @@ -0,0 +1,595 @@ +/* + * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved. @@ -5011,7 +5011,7 @@ +} diff -Nru openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdOopHandle.java openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdOopHandle.java --- openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdOopHandle.java 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdOopHandle.java 2012-07-25 15:09:16.196836500 +0100 ++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdOopHandle.java 2013-04-08 01:49:33.582321490 +0100 @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved. @@ -5076,7 +5076,7 @@ +} diff -Nru openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java --- openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 2012-07-25 15:09:16.196836500 +0100 ++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 2013-04-08 01:49:33.582321490 +0100 @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved. @@ -5122,7 +5122,7 @@ +} diff -Nru openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThread.java openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThread.java --- openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThread.java 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThread.java 2012-07-25 15:09:16.196836500 +0100 ++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThread.java 2013-04-08 01:49:33.582321490 +0100 @@ -0,0 +1,81 @@ +/* + * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved. @@ -5207,7 +5207,7 @@ +} diff -Nru openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/SharedObject.java openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/SharedObject.java --- openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/SharedObject.java 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/SharedObject.java 2012-07-25 15:09:16.196836500 +0100 ++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/SharedObject.java 2013-04-08 01:49:33.582321490 +0100 @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. @@ -5259,7 +5259,7 @@ +} diff -Nru openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86CFrame.java openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86CFrame.java --- openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86CFrame.java 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86CFrame.java 2012-07-25 15:09:16.196836500 +0100 ++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86CFrame.java 2013-04-08 01:49:33.582321490 +0100 @@ -0,0 +1,75 @@ +/* + * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. @@ -5338,7 +5338,7 @@ +} diff -Nru openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86ThreadContext.java openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86ThreadContext.java --- openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86ThreadContext.java 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86ThreadContext.java 2012-07-25 15:09:16.196836500 +0100 ++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86ThreadContext.java 2013-04-08 01:49:33.582321490 +0100 @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. @@ -5387,8 +5387,8 @@ + } +} diff -Nru openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java ---- openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2012-07-25 15:09:16.172836100 +0100 +--- openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2013-04-08 01:49:33.582321490 +0100 @@ -28,6 +28,7 @@ import java.net.*; import java.rmi.*; @@ -5460,7 +5460,7 @@ REMOTE_MODE. */ diff -Nru openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java --- openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java 2012-07-25 15:09:16.196836500 +0100 ++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java 2013-04-08 01:49:33.582321490 +0100 @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. @@ -5534,7 +5534,7 @@ +} diff -Nru openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_amd64/BsdAMD64JavaThreadPDAccess.java openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_amd64/BsdAMD64JavaThreadPDAccess.java --- openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_amd64/BsdAMD64JavaThreadPDAccess.java 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_amd64/BsdAMD64JavaThreadPDAccess.java 2012-07-25 15:09:16.196836500 +0100 ++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_amd64/BsdAMD64JavaThreadPDAccess.java 2013-04-08 01:49:33.582321490 +0100 @@ -0,0 +1,132 @@ +/* + * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. @@ -5670,7 +5670,7 @@ +} diff -Nru openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java --- openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java 2012-07-25 15:09:16.196836500 +0100 ++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java 2013-04-08 01:49:33.582321490 +0100 @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved. @@ -5744,7 +5744,7 @@ +} diff -Nru openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdX86JavaThreadPDAccess.java openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdX86JavaThreadPDAccess.java --- openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdX86JavaThreadPDAccess.java 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdX86JavaThreadPDAccess.java 2012-07-25 15:09:16.196836500 +0100 ++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdX86JavaThreadPDAccess.java 2013-04-08 01:49:33.582321490 +0100 @@ -0,0 +1,131 @@ +/* + * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved. @@ -5878,8 +5878,8 @@ + } +} diff -Nru openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java ---- openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2012-07-25 15:09:16.196836500 +0100 +--- openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2013-04-08 01:49:33.582321490 +0100 @@ -37,6 +37,8 @@ import sun.jvm.hotspot.runtime.linux_ia64.LinuxIA64JavaThreadPDAccess; import sun.jvm.hotspot.runtime.linux_amd64.LinuxAMD64JavaThreadPDAccess; @@ -5904,8 +5904,8 @@ if (access == null) { diff -Nru openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java ---- openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2012-07-25 15:09:16.196836500 +0100 +--- openjdk.orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2013-04-08 01:49:33.582321490 +0100 @@ -37,6 +37,14 @@ return "solaris"; } else if (os.equals("Linux")) { @@ -5923,7 +5923,7 @@ } else { diff -Nru openjdk.orig/hotspot/make/bsd/adlc_updater openjdk/hotspot/make/bsd/adlc_updater --- openjdk.orig/hotspot/make/bsd/adlc_updater 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/adlc_updater 2012-07-25 15:09:16.196836500 +0100 ++++ openjdk/hotspot/make/bsd/adlc_updater 2013-04-08 01:49:33.582321490 +0100 @@ -0,0 +1,20 @@ +#! /bin/sh +# @@ -5947,7 +5947,7 @@ +( [ -f $3/$1 ] && echo Updating $3/$1 ; touch $2/made-change ; mv $2/$1 $3/$1 ) diff -Nru openjdk.orig/hotspot/make/bsd/build.sh openjdk/hotspot/make/bsd/build.sh --- openjdk.orig/hotspot/make/bsd/build.sh 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/build.sh 2012-07-25 15:09:16.196836500 +0100 ++++ openjdk/hotspot/make/bsd/build.sh 2013-04-08 01:49:33.582321490 +0100 @@ -0,0 +1,95 @@ +#! /bin/sh +# @@ -6046,7 +6046,7 @@ +${GNUMAKE} -f ${Location}/make/bsd/Makefile $Build_Options GAMMADIR=${Location} diff -Nru openjdk.orig/hotspot/make/bsd/Makefile openjdk/hotspot/make/bsd/Makefile --- openjdk.orig/hotspot/make/bsd/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/Makefile 2012-07-25 15:09:16.196836500 +0100 ++++ openjdk/hotspot/make/bsd/Makefile 2013-04-08 01:49:33.586321555 +0100 @@ -0,0 +1,371 @@ +# +# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. @@ -6421,7 +6421,7 @@ +.PHONY: checks check_os_version check_j2se_version diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/adjust-mflags.sh openjdk/hotspot/make/bsd/makefiles/adjust-mflags.sh --- openjdk.orig/hotspot/make/bsd/makefiles/adjust-mflags.sh 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/adjust-mflags.sh 2012-07-25 15:09:16.196836500 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/adjust-mflags.sh 2013-04-08 01:49:33.586321555 +0100 @@ -0,0 +1,87 @@ +#! /bin/sh +# @@ -6512,7 +6512,7 @@ +echo "${MFLAGS}" diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/adlc.make openjdk/hotspot/make/bsd/makefiles/adlc.make --- openjdk.orig/hotspot/make/bsd/makefiles/adlc.make 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/adlc.make 2012-07-25 15:09:16.196836500 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/adlc.make 2013-04-08 01:49:33.586321555 +0100 @@ -0,0 +1,226 @@ +# +# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. @@ -6742,7 +6742,7 @@ +.PHONY: all dump refresh_adfiles clean cleanall diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/amd64.make openjdk/hotspot/make/bsd/makefiles/amd64.make --- openjdk.orig/hotspot/make/bsd/makefiles/amd64.make 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/amd64.make 2012-07-25 15:09:16.196836500 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/amd64.make 2013-04-08 01:49:33.586321555 +0100 @@ -0,0 +1,39 @@ +# +# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. @@ -6785,7 +6785,7 @@ +OPT_CFLAGS/compactingPermGenGen.o = -O1 diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/arm.make openjdk/hotspot/make/bsd/makefiles/arm.make --- openjdk.orig/hotspot/make/bsd/makefiles/arm.make 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/arm.make 2012-07-25 15:09:16.196836500 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/arm.make 2013-04-08 01:49:33.586321555 +0100 @@ -0,0 +1,29 @@ +# +# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. @@ -6818,7 +6818,7 @@ +CFLAGS += -DVM_LITTLE_ENDIAN diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/buildtree.make openjdk/hotspot/make/bsd/makefiles/buildtree.make --- openjdk.orig/hotspot/make/bsd/makefiles/buildtree.make 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/buildtree.make 2012-07-25 15:09:16.196836500 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/buildtree.make 2013-04-08 01:49:33.586321555 +0100 @@ -0,0 +1,409 @@ +# +# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. @@ -7231,7 +7231,7 @@ +.PHONY: all FORCE diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/build_vm_def.sh openjdk/hotspot/make/bsd/makefiles/build_vm_def.sh --- openjdk.orig/hotspot/make/bsd/makefiles/build_vm_def.sh 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/build_vm_def.sh 2012-07-25 15:09:16.196836500 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/build_vm_def.sh 2013-04-08 01:49:33.586321555 +0100 @@ -0,0 +1,12 @@ +#!/bin/sh + @@ -7247,7 +7247,7 @@ + ' diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/compiler1.make openjdk/hotspot/make/bsd/makefiles/compiler1.make --- openjdk.orig/hotspot/make/bsd/makefiles/compiler1.make 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/compiler1.make 2012-07-25 15:09:16.196836500 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/compiler1.make 2013-04-08 01:49:33.586321555 +0100 @@ -0,0 +1,31 @@ +# +# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. @@ -7282,7 +7282,7 @@ +CFLAGS += -DCOMPILER1 diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/compiler2.make openjdk/hotspot/make/bsd/makefiles/compiler2.make --- openjdk.orig/hotspot/make/bsd/makefiles/compiler2.make 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/compiler2.make 2012-07-25 15:09:16.196836500 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/compiler2.make 2013-04-08 01:49:33.586321555 +0100 @@ -0,0 +1,31 @@ +# +# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. @@ -7317,7 +7317,7 @@ +CFLAGS += -DCOMPILER2 diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/core.make openjdk/hotspot/make/bsd/makefiles/core.make --- openjdk.orig/hotspot/make/bsd/makefiles/core.make 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/core.make 2012-07-25 15:09:16.196836500 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/core.make 2013-04-08 01:49:33.586321555 +0100 @@ -0,0 +1,33 @@ +# +# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. @@ -7354,7 +7354,7 @@ +# Note: macros.hpp defines CORE diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/cscope.make openjdk/hotspot/make/bsd/makefiles/cscope.make --- openjdk.orig/hotspot/make/bsd/makefiles/cscope.make 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/cscope.make 2012-07-25 15:09:16.200836563 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/cscope.make 2013-04-08 01:49:33.586321555 +0100 @@ -0,0 +1,160 @@ +# +# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. @@ -7518,7 +7518,7 @@ +.PHONY: cscope cscope.clean TAGS.clean nametable.clean FORCE diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/debug.make openjdk/hotspot/make/bsd/makefiles/debug.make --- openjdk.orig/hotspot/make/bsd/makefiles/debug.make 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/debug.make 2012-07-25 15:09:16.200836563 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/debug.make 2013-04-08 01:49:33.586321555 +0100 @@ -0,0 +1,44 @@ +# +# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. @@ -7566,7 +7566,7 @@ +PICFLAGS = DEFAULT diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/defs.make openjdk/hotspot/make/bsd/makefiles/defs.make --- openjdk.orig/hotspot/make/bsd/makefiles/defs.make 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/defs.make 2012-07-25 15:09:16.200836563 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/defs.make 2013-04-08 01:49:33.586321555 +0100 @@ -0,0 +1,170 @@ +# +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. @@ -7740,7 +7740,7 @@ +EXPORT_LIST += $(ADD_SA_BINARIES/$(HS_ARCH)) diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/dtrace.make openjdk/hotspot/make/bsd/makefiles/dtrace.make --- openjdk.orig/hotspot/make/bsd/makefiles/dtrace.make 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/dtrace.make 2012-07-25 15:09:16.200836563 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/dtrace.make 2013-04-08 01:49:33.586321555 +0100 @@ -0,0 +1,27 @@ +# +# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. @@ -7771,7 +7771,7 @@ + diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/fastdebug.make openjdk/hotspot/make/bsd/makefiles/fastdebug.make --- openjdk.orig/hotspot/make/bsd/makefiles/fastdebug.make 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/fastdebug.make 2012-07-25 15:09:16.200836563 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/fastdebug.make 2013-04-08 01:49:33.586321555 +0100 @@ -0,0 +1,64 @@ +# +# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. @@ -7839,7 +7839,7 @@ +PICFLAGS = DEFAULT diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/gcc.make openjdk/hotspot/make/bsd/makefiles/gcc.make --- openjdk.orig/hotspot/make/bsd/makefiles/gcc.make 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/gcc.make 2012-07-25 15:09:16.200836563 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/gcc.make 2013-04-08 01:49:33.586321555 +0100 @@ -0,0 +1,267 @@ +# +# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. @@ -8110,7 +8110,7 @@ +endif diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/hp1.make openjdk/hotspot/make/bsd/makefiles/hp1.make --- openjdk.orig/hotspot/make/bsd/makefiles/hp1.make 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/hp1.make 2012-07-25 15:09:16.200836563 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/hp1.make 2013-04-08 01:49:33.586321555 +0100 @@ -0,0 +1,29 @@ +# +# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. @@ -8143,7 +8143,7 @@ +CFLAGS += -DCOMPILER1 diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/hp.make openjdk/hotspot/make/bsd/makefiles/hp.make --- openjdk.orig/hotspot/make/bsd/makefiles/hp.make 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/hp.make 2012-07-25 15:09:16.200836563 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/hp.make 2013-04-08 01:49:33.586321555 +0100 @@ -0,0 +1,29 @@ +# +# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. @@ -8176,7 +8176,7 @@ +CFLAGS += -DCOMPILER2 diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/i486.make openjdk/hotspot/make/bsd/makefiles/i486.make --- openjdk.orig/hotspot/make/bsd/makefiles/i486.make 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/i486.make 2012-07-25 15:09:16.200836563 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/i486.make 2013-04-08 01:49:33.586321555 +0100 @@ -0,0 +1,34 @@ +# +# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. @@ -8214,7 +8214,7 @@ +OPT_CFLAGS/compactingPermGenGen.o = -O1 diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/ia64.make openjdk/hotspot/make/bsd/makefiles/ia64.make --- openjdk.orig/hotspot/make/bsd/makefiles/ia64.make 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/ia64.make 2012-07-25 15:09:16.200836563 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/ia64.make 2013-04-08 01:49:33.586321555 +0100 @@ -0,0 +1,43 @@ +# +# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. @@ -8261,7 +8261,7 @@ +LDNOMAP=true diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/jsig.make openjdk/hotspot/make/bsd/makefiles/jsig.make --- openjdk.orig/hotspot/make/bsd/makefiles/jsig.make 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/jsig.make 2012-07-25 15:09:16.200836563 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/jsig.make 2013-04-08 01:49:33.586321555 +0100 @@ -0,0 +1,67 @@ +# +# Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved. @@ -8332,7 +8332,7 @@ +.PHONY: install_jsig diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/jvmg.make openjdk/hotspot/make/bsd/makefiles/jvmg.make --- openjdk.orig/hotspot/make/bsd/makefiles/jvmg.make 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/jvmg.make 2012-07-25 15:09:16.200836563 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/jvmg.make 2013-04-08 01:49:33.586321555 +0100 @@ -0,0 +1,41 @@ +# +# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. @@ -8377,7 +8377,7 @@ +PICFLAGS = DEFAULT diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/jvmti.make openjdk/hotspot/make/bsd/makefiles/jvmti.make --- openjdk.orig/hotspot/make/bsd/makefiles/jvmti.make 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/jvmti.make 2012-07-25 15:09:16.200836563 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/jvmti.make 2013-04-08 01:49:33.586321555 +0100 @@ -0,0 +1,117 @@ +# +# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. @@ -8498,7 +8498,7 @@ + diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/launcher.make openjdk/hotspot/make/bsd/makefiles/launcher.make --- openjdk.orig/hotspot/make/bsd/makefiles/launcher.make 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/launcher.make 2012-07-25 15:09:16.200836563 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/launcher.make 2013-04-08 01:49:33.586321555 +0100 @@ -0,0 +1,93 @@ +# +# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. @@ -8595,7 +8595,7 @@ + diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/mapfile-vers-debug openjdk/hotspot/make/bsd/makefiles/mapfile-vers-debug --- openjdk.orig/hotspot/make/bsd/makefiles/mapfile-vers-debug 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/mapfile-vers-debug 2012-07-25 15:09:16.200836563 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/mapfile-vers-debug 2013-04-08 01:49:33.586321555 +0100 @@ -0,0 +1,291 @@ +# +# @(#)mapfile-vers-debug 1.18 07/10/25 16:47:35 @@ -8890,7 +8890,7 @@ + diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/mapfile-vers-jsig openjdk/hotspot/make/bsd/makefiles/mapfile-vers-jsig --- openjdk.orig/hotspot/make/bsd/makefiles/mapfile-vers-jsig 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/mapfile-vers-jsig 2012-07-25 15:09:16.200836563 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/mapfile-vers-jsig 2013-04-08 01:49:33.586321555 +0100 @@ -0,0 +1,40 @@ +# + @@ -8934,7 +8934,7 @@ +}; diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/mapfile-vers-product openjdk/hotspot/make/bsd/makefiles/mapfile-vers-product --- openjdk.orig/hotspot/make/bsd/makefiles/mapfile-vers-product 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/mapfile-vers-product 2012-07-25 15:09:16.200836563 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/mapfile-vers-product 2013-04-08 01:49:33.586321555 +0100 @@ -0,0 +1,286 @@ +# +# @(#)mapfile-vers-product 1.19 08/02/12 10:56:37 @@ -9224,7 +9224,7 @@ + diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/optimized.make openjdk/hotspot/make/bsd/makefiles/optimized.make --- openjdk.orig/hotspot/make/bsd/makefiles/optimized.make 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/optimized.make 2012-07-25 15:09:16.200836563 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/optimized.make 2013-04-08 01:49:33.586321555 +0100 @@ -0,0 +1,44 @@ +# +# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. @@ -9272,7 +9272,7 @@ +VERSION = optimized diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/ppc.make openjdk/hotspot/make/bsd/makefiles/ppc.make --- openjdk.orig/hotspot/make/bsd/makefiles/ppc.make 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/ppc.make 2012-07-25 15:09:16.200836563 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/ppc.make 2013-04-08 01:49:33.590321620 +0100 @@ -0,0 +1,30 @@ +# +# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. @@ -9306,7 +9306,7 @@ + diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/product.make openjdk/hotspot/make/bsd/makefiles/product.make --- openjdk.orig/hotspot/make/bsd/makefiles/product.make 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/product.make 2012-07-25 15:09:16.200836563 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/product.make 2013-04-08 01:49:33.590321620 +0100 @@ -0,0 +1,58 @@ +# +# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. @@ -9368,7 +9368,7 @@ +# LINK_LIB.CC/POST_HOOK += $(STRIP_$(LINK_INTO)) diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/profiled.make openjdk/hotspot/make/bsd/makefiles/profiled.make --- openjdk.orig/hotspot/make/bsd/makefiles/profiled.make 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/profiled.make 2012-07-25 15:09:16.200836563 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/profiled.make 2013-04-08 01:49:33.590321620 +0100 @@ -0,0 +1,30 @@ +# +# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. @@ -9402,7 +9402,7 @@ +LDNOMAP = true diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/rules.make openjdk/hotspot/make/bsd/makefiles/rules.make --- openjdk.orig/hotspot/make/bsd/makefiles/rules.make 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/rules.make 2012-07-25 15:09:16.200836563 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/rules.make 2013-04-08 01:49:33.590321620 +0100 @@ -0,0 +1,216 @@ +# +# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. @@ -9622,7 +9622,7 @@ +.PHONY: default diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/sa.make openjdk/hotspot/make/bsd/makefiles/sa.make --- openjdk.orig/hotspot/make/bsd/makefiles/sa.make 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/sa.make 2012-07-25 15:09:16.200836563 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/sa.make 2013-04-08 01:49:33.590321620 +0100 @@ -0,0 +1,121 @@ +# +# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. @@ -9747,7 +9747,7 @@ + rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST) diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/saproc.make openjdk/hotspot/make/bsd/makefiles/saproc.make --- openjdk.orig/hotspot/make/bsd/makefiles/saproc.make 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/saproc.make 2012-07-25 15:09:16.200836563 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/saproc.make 2013-04-08 01:49:33.590321620 +0100 @@ -0,0 +1,107 @@ +# +# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. @@ -9858,7 +9858,7 @@ +.PHONY: install_saproc diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/shark.make openjdk/hotspot/make/bsd/makefiles/shark.make --- openjdk.orig/hotspot/make/bsd/makefiles/shark.make 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/shark.make 2012-07-25 15:09:16.200836563 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/shark.make 2013-04-08 01:49:33.590321620 +0100 @@ -0,0 +1,32 @@ +# +# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. @@ -9894,7 +9894,7 @@ +CFLAGS += -DSHARK diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/sparc.make openjdk/hotspot/make/bsd/makefiles/sparc.make --- openjdk.orig/hotspot/make/bsd/makefiles/sparc.make 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/sparc.make 2012-07-25 15:09:16.200836563 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/sparc.make 2013-04-08 01:49:33.590321620 +0100 @@ -0,0 +1,24 @@ +# +# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. @@ -9922,7 +9922,7 @@ + diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/sparcv9.make openjdk/hotspot/make/bsd/makefiles/sparcv9.make --- openjdk.orig/hotspot/make/bsd/makefiles/sparcv9.make 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/sparcv9.make 2012-07-25 15:09:16.200836563 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/sparcv9.make 2013-04-08 01:49:33.590321620 +0100 @@ -0,0 +1,27 @@ +# +# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. @@ -9953,7 +9953,7 @@ +CFLAGS += -D_LP64=1 diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/sparcWorks.make openjdk/hotspot/make/bsd/makefiles/sparcWorks.make --- openjdk.orig/hotspot/make/bsd/makefiles/sparcWorks.make 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/sparcWorks.make 2012-07-25 15:09:16.200836563 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/sparcWorks.make 2013-04-08 01:49:33.590321620 +0100 @@ -0,0 +1,104 @@ +# +# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. @@ -10061,7 +10061,7 @@ + diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/tiered.make openjdk/hotspot/make/bsd/makefiles/tiered.make --- openjdk.orig/hotspot/make/bsd/makefiles/tiered.make 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/tiered.make 2012-07-25 15:09:16.200836563 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/tiered.make 2013-04-08 01:49:33.590321620 +0100 @@ -0,0 +1,31 @@ +# +# Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved. @@ -10096,7 +10096,7 @@ +CFLAGS += -DCOMPILER2 -DCOMPILER1 diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/top.make openjdk/hotspot/make/bsd/makefiles/top.make --- openjdk.orig/hotspot/make/bsd/makefiles/top.make 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/top.make 2012-07-25 15:09:16.200836563 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/top.make 2013-04-08 01:49:33.590321620 +0100 @@ -0,0 +1,142 @@ +# +# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. @@ -10242,7 +10242,7 @@ +.PHONY: checks check_os_version install diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/vm.make openjdk/hotspot/make/bsd/makefiles/vm.make --- openjdk.orig/hotspot/make/bsd/makefiles/vm.make 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/vm.make 2012-07-25 15:09:16.200836563 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/vm.make 2013-04-08 01:49:33.590321620 +0100 @@ -0,0 +1,329 @@ +# +# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. @@ -10575,7 +10575,7 @@ +.PHONY: default build install install_jvm diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/zero.make openjdk/hotspot/make/bsd/makefiles/zero.make --- openjdk.orig/hotspot/make/bsd/makefiles/zero.make 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/zero.make 2012-07-25 15:09:16.200836563 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/zero.make 2013-04-08 01:49:33.590321620 +0100 @@ -0,0 +1,32 @@ +# +# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. @@ -10611,7 +10611,7 @@ +VM_SUBDIR = server diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/zeroshark.make openjdk/hotspot/make/bsd/makefiles/zeroshark.make --- openjdk.orig/hotspot/make/bsd/makefiles/zeroshark.make 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/makefiles/zeroshark.make 2012-07-25 15:09:16.200836563 +0100 ++++ openjdk/hotspot/make/bsd/makefiles/zeroshark.make 2013-04-08 01:49:33.590321620 +0100 @@ -0,0 +1,62 @@ +# +# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. @@ -10677,7 +10677,7 @@ +OPT_CFLAGS/compactingPermGenGen.o = -O1 diff -Nru openjdk.orig/hotspot/make/bsd/platform_amd64 openjdk/hotspot/make/bsd/platform_amd64 --- openjdk.orig/hotspot/make/bsd/platform_amd64 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/platform_amd64 2012-07-25 15:09:16.200836563 +0100 ++++ openjdk/hotspot/make/bsd/platform_amd64 2013-04-08 01:49:33.590321620 +0100 @@ -0,0 +1,15 @@ +os_family = bsd + @@ -10696,7 +10696,7 @@ +sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DAMD64 diff -Nru openjdk.orig/hotspot/make/bsd/platform_amd64.suncc openjdk/hotspot/make/bsd/platform_amd64.suncc --- openjdk.orig/hotspot/make/bsd/platform_amd64.suncc 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/platform_amd64.suncc 2012-07-25 15:09:16.200836563 +0100 ++++ openjdk/hotspot/make/bsd/platform_amd64.suncc 2013-04-08 01:49:33.590321620 +0100 @@ -0,0 +1,17 @@ +os_family = bsd + @@ -10717,7 +10717,7 @@ +sysdefs = -D_ALLBSD_SOURCE -DSPARC_WORKS -D_GNU_SOURCE -DAMD64 diff -Nru openjdk.orig/hotspot/make/bsd/platform_i486 openjdk/hotspot/make/bsd/platform_i486 --- openjdk.orig/hotspot/make/bsd/platform_i486 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/platform_i486 2012-07-25 15:09:16.200836563 +0100 ++++ openjdk/hotspot/make/bsd/platform_i486 2013-04-08 01:49:33.590321620 +0100 @@ -0,0 +1,15 @@ +os_family = bsd + @@ -10736,7 +10736,7 @@ +sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DIA32 diff -Nru openjdk.orig/hotspot/make/bsd/platform_i486.suncc openjdk/hotspot/make/bsd/platform_i486.suncc --- openjdk.orig/hotspot/make/bsd/platform_i486.suncc 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/platform_i486.suncc 2012-07-25 15:09:16.200836563 +0100 ++++ openjdk/hotspot/make/bsd/platform_i486.suncc 2013-04-08 01:49:33.590321620 +0100 @@ -0,0 +1,17 @@ +os_family = bsd + @@ -10757,7 +10757,7 @@ +sysdefs = -D_ALLBSD_SOURCE -DSPARC_WORKS -D_GNU_SOURCE -DIA32 diff -Nru openjdk.orig/hotspot/make/bsd/platform_ia64 openjdk/hotspot/make/bsd/platform_ia64 --- openjdk.orig/hotspot/make/bsd/platform_ia64 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/platform_ia64 2012-07-25 15:09:16.200836563 +0100 ++++ openjdk/hotspot/make/bsd/platform_ia64 2013-04-08 01:49:33.590321620 +0100 @@ -0,0 +1,15 @@ +os_family = bsd + @@ -10776,7 +10776,7 @@ +mark_style = alignment diff -Nru openjdk.orig/hotspot/make/bsd/platform_sparc openjdk/hotspot/make/bsd/platform_sparc --- openjdk.orig/hotspot/make/bsd/platform_sparc 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/platform_sparc 2012-07-25 15:09:16.200836563 +0100 ++++ openjdk/hotspot/make/bsd/platform_sparc 2013-04-08 01:49:33.590321620 +0100 @@ -0,0 +1,15 @@ +os_family = bsd + @@ -10795,7 +10795,7 @@ +sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DSPARC diff -Nru openjdk.orig/hotspot/make/bsd/platform_sparcv9 openjdk/hotspot/make/bsd/platform_sparcv9 --- openjdk.orig/hotspot/make/bsd/platform_sparcv9 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/platform_sparcv9 2012-07-25 15:09:16.200836563 +0100 ++++ openjdk/hotspot/make/bsd/platform_sparcv9 2013-04-08 01:49:33.590321620 +0100 @@ -0,0 +1,15 @@ +os_family = bsd + @@ -10814,7 +10814,7 @@ +sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DSPARC diff -Nru openjdk.orig/hotspot/make/bsd/platform_zero.in openjdk/hotspot/make/bsd/platform_zero.in --- openjdk.orig/hotspot/make/bsd/platform_zero.in 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/platform_zero.in 2012-07-25 15:09:16.200836563 +0100 ++++ openjdk/hotspot/make/bsd/platform_zero.in 2013-04-08 01:49:33.590321620 +0100 @@ -0,0 +1,17 @@ +os_family = bsd + @@ -10835,7 +10835,7 @@ +sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DCC_INTERP -DZERO -D@ZERO_ARCHDEF@ -DZERO_LIBARCH=\"@ZERO_LIBARCH@\" diff -Nru openjdk.orig/hotspot/make/bsd/README openjdk/hotspot/make/bsd/README --- openjdk.orig/hotspot/make/bsd/README 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/make/bsd/README 2012-07-25 15:09:16.196836500 +0100 ++++ openjdk/hotspot/make/bsd/README 2013-04-08 01:49:33.590321620 +0100 @@ -0,0 +1,26 @@ +Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. +DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -10864,8 +10864,8 @@ +for instructions how to build the Solaris versions. + diff -Nru openjdk.orig/hotspot/make/cscope.make openjdk/hotspot/make/cscope.make ---- openjdk.orig/hotspot/make/cscope.make 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/make/cscope.make 2012-07-25 15:09:16.200836563 +0100 +--- openjdk.orig/hotspot/make/cscope.make 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/make/cscope.make 2013-04-08 01:49:33.590321620 +0100 @@ -63,7 +63,7 @@ # space-separated list of identifiers to include only those systems. ifdef CS_OS @@ -10876,8 +10876,8 @@ # CPU-specific files for all processors are included by default. Set CS_CPU diff -Nru openjdk.orig/hotspot/make/defs.make openjdk/hotspot/make/defs.make ---- openjdk.orig/hotspot/make/defs.make 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/make/defs.make 2012-07-25 15:09:16.204836626 +0100 +--- openjdk.orig/hotspot/make/defs.make 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/make/defs.make 2013-04-08 01:49:33.590321620 +0100 @@ -118,13 +118,23 @@ # Windows should have OS predefined ifeq ($(OS),) @@ -10905,8 +10905,8 @@ OSNAME=solaris endif diff -Nru openjdk.orig/hotspot/make/linux/makefiles/arm.make openjdk/hotspot/make/linux/makefiles/arm.make ---- openjdk.orig/hotspot/make/linux/makefiles/arm.make 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/make/linux/makefiles/arm.make 2012-07-25 15:09:16.204836626 +0100 +--- openjdk.orig/hotspot/make/linux/makefiles/arm.make 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/make/linux/makefiles/arm.make 2013-04-08 01:49:33.590321620 +0100 @@ -1,6 +1,25 @@ # # Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. @@ -10935,8 +10935,8 @@ Obj_Files += linux_arm.o diff -Nru openjdk.orig/hotspot/make/linux/makefiles/defs.make openjdk/hotspot/make/linux/makefiles/defs.make ---- openjdk.orig/hotspot/make/linux/makefiles/defs.make 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/make/linux/makefiles/defs.make 2012-07-25 15:12:47.168329890 +0100 +--- openjdk.orig/hotspot/make/linux/makefiles/defs.make 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/make/linux/makefiles/defs.make 2013-04-08 01:50:51.543574767 +0100 @@ -177,13 +177,16 @@ JDK_INCLUDE_SUBDIR=linux @@ -10954,8 +10954,8 @@ +EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX) ifneq ($(ZERO_BUILD), true) ifneq ($(OBJCOPY),) - EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo -@@ -195,7 +198,7 @@ + ifneq ($(STRIP_POLICY),no_strip) +@@ -197,7 +200,7 @@ ifndef BUILD_CLIENT_ONLY EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt @@ -10963,17 +10963,17 @@ +EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX) ifneq ($(ZERO_BUILD), true) ifneq ($(OBJCOPY),) - EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo -@@ -206,7 +209,7 @@ + ifneq ($(STRIP_POLICY),no_strip) +@@ -210,7 +213,7 @@ ifneq ($(ZERO_BUILD), true) ifeq ($(ARCH_DATA_MODEL), 32) EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX) ifneq ($(OBJCOPY),) - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo - endif -@@ -215,9 +218,9 @@ + ifneq ($(STRIP_POLICY),no_strip) + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo +@@ -221,9 +224,9 @@ # Serviceability Binaries # No SA Support for PPC, IA64, ARM or zero @@ -10986,8 +10986,8 @@ ifneq ($(ZERO_BUILD), true) ifneq ($(OBJCOPY),) diff -Nru openjdk.orig/hotspot/make/linux/makefiles/ppc.make openjdk/hotspot/make/linux/makefiles/ppc.make ---- openjdk.orig/hotspot/make/linux/makefiles/ppc.make 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/make/linux/makefiles/ppc.make 2012-07-25 15:09:16.204836626 +0100 +--- openjdk.orig/hotspot/make/linux/makefiles/ppc.make 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/make/linux/makefiles/ppc.make 2013-04-08 01:49:33.590321620 +0100 @@ -1,6 +1,25 @@ # # Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. @@ -11016,8 +11016,8 @@ # The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized diff -Nru openjdk.orig/hotspot/make/Makefile openjdk/hotspot/make/Makefile ---- openjdk.orig/hotspot/make/Makefile 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/make/Makefile 2012-07-25 15:09:16.196836500 +0100 +--- openjdk.orig/hotspot/make/Makefile 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/make/Makefile 2013-04-08 01:49:33.594321684 +0100 @@ -323,28 +323,28 @@ ifneq ($(OSNAME),windows) ifeq ($(ZERO_BUILD), true) @@ -11058,8 +11058,8 @@ # Debug info for shared library diff -Nru openjdk.orig/hotspot/make/sa.files openjdk/hotspot/make/sa.files ---- openjdk.orig/hotspot/make/sa.files 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/make/sa.files 2012-07-25 15:09:16.204836626 +0100 +--- openjdk.orig/hotspot/make/sa.files 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/make/sa.files 2013-04-08 01:49:33.594321684 +0100 @@ -51,6 +51,9 @@ $(AGENT_SRC_DIR)/sun/jvm/hotspot/compiler/*.java \ $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/*.java \ @@ -11081,8 +11081,8 @@ $(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/linux/*.java \ $(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/linux_amd64/*.java \ diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/defs.make openjdk/hotspot/make/solaris/makefiles/defs.make ---- openjdk.orig/hotspot/make/solaris/makefiles/defs.make 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/make/solaris/makefiles/defs.make 2012-07-25 15:11:37.743155281 +0100 +--- openjdk.orig/hotspot/make/solaris/makefiles/defs.make 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/make/solaris/makefiles/defs.make 2013-04-08 01:49:33.594321684 +0100 @@ -134,13 +134,16 @@ JDK_INCLUDE_SUBDIR=solaris @@ -11153,8 +11153,8 @@ EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo endif diff -Nru openjdk.orig/hotspot/make/windows/makefiles/defs.make openjdk/hotspot/make/windows/makefiles/defs.make ---- openjdk.orig/hotspot/make/windows/makefiles/defs.make 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/make/windows/makefiles/defs.make 2012-07-25 15:09:16.204836626 +0100 +--- openjdk.orig/hotspot/make/windows/makefiles/defs.make 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/make/windows/makefiles/defs.make 2013-04-08 01:49:33.594321684 +0100 @@ -109,6 +109,9 @@ JDK_INCLUDE_SUBDIR=win32 @@ -11195,8 +11195,8 @@ EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.map EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar diff -Nru openjdk.orig/hotspot/src/cpu/x86/vm/bytes_x86.hpp openjdk/hotspot/src/cpu/x86/vm/bytes_x86.hpp ---- openjdk.orig/hotspot/src/cpu/x86/vm/bytes_x86.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/cpu/x86/vm/bytes_x86.hpp 2012-07-25 15:09:16.204836626 +0100 +--- openjdk.orig/hotspot/src/cpu/x86/vm/bytes_x86.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/cpu/x86/vm/bytes_x86.hpp 2013-04-08 01:49:33.594321684 +0100 @@ -81,6 +81,9 @@ #ifdef TARGET_OS_ARCH_windows_x86 # include "bytes_windows_x86.inline.hpp" @@ -11208,8 +11208,8 @@ #endif // CPU_X86_VM_BYTES_X86_HPP diff -Nru openjdk.orig/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp openjdk/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp ---- openjdk.orig/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp 2012-07-25 15:09:16.204836626 +0100 +--- openjdk.orig/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp 2013-04-08 01:49:33.594321684 +0100 @@ -427,8 +427,8 @@ // Fetch the exception from TLS and clear out exception related thread state __ get_thread(rsi); @@ -11222,8 +11222,8 @@ __ bind(_unwind_handler_entry); __ verify_not_null_oop(rax); diff -Nru openjdk.orig/hotspot/src/cpu/x86/vm/copy_x86.hpp openjdk/hotspot/src/cpu/x86/vm/copy_x86.hpp ---- openjdk.orig/hotspot/src/cpu/x86/vm/copy_x86.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/cpu/x86/vm/copy_x86.hpp 2012-07-25 15:09:16.204836626 +0100 +--- openjdk.orig/hotspot/src/cpu/x86/vm/copy_x86.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/cpu/x86/vm/copy_x86.hpp 2013-04-08 01:49:33.594321684 +0100 @@ -37,6 +37,9 @@ #ifdef TARGET_OS_ARCH_windows_x86 # include "copy_windows_x86.inline.hpp" @@ -11235,8 +11235,8 @@ static void pd_fill_to_words(HeapWord* tohw, size_t count, juint value) { diff -Nru openjdk.orig/hotspot/src/cpu/x86/vm/globals_x86.hpp openjdk/hotspot/src/cpu/x86/vm/globals_x86.hpp ---- openjdk.orig/hotspot/src/cpu/x86/vm/globals_x86.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/cpu/x86/vm/globals_x86.hpp 2012-07-25 15:09:16.204836626 +0100 +--- openjdk.orig/hotspot/src/cpu/x86/vm/globals_x86.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/cpu/x86/vm/globals_x86.hpp 2013-04-08 01:49:33.594321684 +0100 @@ -70,7 +70,11 @@ define_pd_global(bool, RewriteBytecodes, true); define_pd_global(bool, RewriteFrequentPairs, true); @@ -11250,8 +11250,8 @@ // GC Ergo Flags define_pd_global(intx, CMSYoungGenPerWorker, 64*M); // default max size of CMS young gen, per GC worker thread diff -Nru openjdk.orig/hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp openjdk/hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp ---- openjdk.orig/hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp 2012-07-25 15:09:16.204836626 +0100 +--- openjdk.orig/hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp 2013-04-08 01:49:33.594321684 +0100 @@ -45,6 +45,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -11281,8 +11281,8 @@ // used on 64bits imulptr(index, reg2); diff -Nru openjdk.orig/hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp openjdk/hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp ---- openjdk.orig/hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp 2012-07-25 15:09:16.204836626 +0100 +--- openjdk.orig/hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp 2013-04-08 01:49:33.594321684 +0100 @@ -45,6 +45,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -11294,8 +11294,8 @@ // Implementation of InterpreterMacroAssembler diff -Nru openjdk.orig/hotspot/src/cpu/x86/vm/jni_x86.h openjdk/hotspot/src/cpu/x86/vm/jni_x86.h ---- openjdk.orig/hotspot/src/cpu/x86/vm/jni_x86.h 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/cpu/x86/vm/jni_x86.h 2012-07-25 15:09:16.204836626 +0100 +--- openjdk.orig/hotspot/src/cpu/x86/vm/jni_x86.h 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/cpu/x86/vm/jni_x86.h 2013-04-08 01:49:33.594321684 +0100 @@ -26,7 +26,7 @@ #ifndef _JAVASOFT_JNI_MD_H_ #define _JAVASOFT_JNI_MD_H_ @@ -11306,8 +11306,8 @@ #if defined(__GNUC__) && (__GNUC__ > 4) || (__GNUC__ == 4) && (__GNUC_MINOR__ > 2) #define JNIEXPORT __attribute__((visibility("default"))) diff -Nru openjdk.orig/hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp openjdk/hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp ---- openjdk.orig/hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp 2012-07-25 15:09:16.204836626 +0100 +--- openjdk.orig/hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp 2013-04-08 01:49:33.594321684 +0100 @@ -47,6 +47,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -11319,8 +11319,8 @@ #include "opto/runtime.hpp" #endif diff -Nru openjdk.orig/hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp openjdk/hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp ---- openjdk.orig/hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp 2012-07-25 15:09:16.204836626 +0100 +--- openjdk.orig/hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp 2013-04-08 01:49:33.594321684 +0100 @@ -47,6 +47,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -11332,8 +11332,8 @@ #include "opto/runtime.hpp" #endif diff -Nru openjdk.orig/hotspot/src/cpu/x86/vm/stubRoutines_x86_32.cpp openjdk/hotspot/src/cpu/x86/vm/stubRoutines_x86_32.cpp ---- openjdk.orig/hotspot/src/cpu/x86/vm/stubRoutines_x86_32.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/cpu/x86/vm/stubRoutines_x86_32.cpp 2012-07-25 15:09:16.208836690 +0100 +--- openjdk.orig/hotspot/src/cpu/x86/vm/stubRoutines_x86_32.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/cpu/x86/vm/stubRoutines_x86_32.cpp 2013-04-08 01:49:33.594321684 +0100 @@ -35,6 +35,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -11345,8 +11345,8 @@ // Implementation of the platform-specific part of StubRoutines - for // a description of how to extend it, see the stubRoutines.hpp file. diff -Nru openjdk.orig/hotspot/src/cpu/x86/vm/stubRoutines_x86_64.cpp openjdk/hotspot/src/cpu/x86/vm/stubRoutines_x86_64.cpp ---- openjdk.orig/hotspot/src/cpu/x86/vm/stubRoutines_x86_64.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/cpu/x86/vm/stubRoutines_x86_64.cpp 2012-07-25 15:09:16.208836690 +0100 +--- openjdk.orig/hotspot/src/cpu/x86/vm/stubRoutines_x86_64.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/cpu/x86/vm/stubRoutines_x86_64.cpp 2013-04-08 01:49:33.594321684 +0100 @@ -35,6 +35,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -11358,8 +11358,8 @@ // Implementation of the platform-specific part of StubRoutines - for // a description of how to extend it, see the stubRoutines.hpp file. diff -Nru openjdk.orig/hotspot/src/cpu/x86/vm/vm_version_x86.cpp openjdk/hotspot/src/cpu/x86/vm/vm_version_x86.cpp ---- openjdk.orig/hotspot/src/cpu/x86/vm/vm_version_x86.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/cpu/x86/vm/vm_version_x86.cpp 2012-07-25 15:09:16.208836690 +0100 +--- openjdk.orig/hotspot/src/cpu/x86/vm/vm_version_x86.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/cpu/x86/vm/vm_version_x86.cpp 2013-04-08 01:49:33.598321747 +0100 @@ -37,6 +37,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "os_windows.inline.hpp" @@ -11371,8 +11371,8 @@ int VM_Version::_cpu; diff -Nru openjdk.orig/hotspot/src/cpu/zero/vm/bytes_zero.hpp openjdk/hotspot/src/cpu/zero/vm/bytes_zero.hpp ---- openjdk.orig/hotspot/src/cpu/zero/vm/bytes_zero.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/cpu/zero/vm/bytes_zero.hpp 2012-07-25 15:09:16.208836690 +0100 +--- openjdk.orig/hotspot/src/cpu/zero/vm/bytes_zero.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/cpu/zero/vm/bytes_zero.hpp 2013-04-08 01:49:33.598321747 +0100 @@ -168,6 +168,9 @@ #ifdef TARGET_OS_ARCH_linux_zero # include "bytes_linux_zero.inline.hpp" @@ -11384,8 +11384,8 @@ #endif // VM_LITTLE_ENDIAN diff -Nru openjdk.orig/hotspot/src/cpu/zero/vm/globals_zero.hpp openjdk/hotspot/src/cpu/zero/vm/globals_zero.hpp ---- openjdk.orig/hotspot/src/cpu/zero/vm/globals_zero.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/cpu/zero/vm/globals_zero.hpp 2012-07-25 15:09:16.208836690 +0100 +--- openjdk.orig/hotspot/src/cpu/zero/vm/globals_zero.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/cpu/zero/vm/globals_zero.hpp 2013-04-08 01:49:33.598321747 +0100 @@ -52,7 +52,11 @@ define_pd_global(bool, RewriteBytecodes, true); define_pd_global(bool, RewriteFrequentPairs, true); @@ -11399,8 +11399,8 @@ // GC Ergo Flags define_pd_global(intx, CMSYoungGenPerWorker, 16*M); // default max size of CMS young gen, per GC worker thread diff -Nru openjdk.orig/hotspot/src/cpu/zero/vm/interp_masm_zero.cpp openjdk/hotspot/src/cpu/zero/vm/interp_masm_zero.cpp ---- openjdk.orig/hotspot/src/cpu/zero/vm/interp_masm_zero.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/cpu/zero/vm/interp_masm_zero.cpp 2012-07-25 15:09:16.208836690 +0100 +--- openjdk.orig/hotspot/src/cpu/zero/vm/interp_masm_zero.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/cpu/zero/vm/interp_masm_zero.cpp 2013-04-08 01:49:33.598321747 +0100 @@ -40,5 +40,8 @@ #ifdef TARGET_OS_FAMILY_linux # include "thread_linux.inline.hpp" @@ -11411,8 +11411,8 @@ // This file is intentionally empty diff -Nru openjdk.orig/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp openjdk/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp ---- openjdk.orig/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp 2012-07-25 15:09:16.208836690 +0100 +--- openjdk.orig/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp 2013-04-08 01:49:33.598321747 +0100 @@ -43,6 +43,9 @@ #ifdef TARGET_OS_FAMILY_linux # include "thread_linux.inline.hpp" @@ -11424,8 +11424,8 @@ #include "opto/runtime.hpp" #endif diff -Nru openjdk.orig/hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp openjdk/hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp ---- openjdk.orig/hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp 2012-07-25 15:09:16.208836690 +0100 +--- openjdk.orig/hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp 2013-04-08 01:49:33.598321747 +0100 @@ -30,3 +30,6 @@ #ifdef TARGET_OS_FAMILY_linux # include "thread_linux.inline.hpp" @@ -11434,8 +11434,8 @@ +# include "thread_bsd.inline.hpp" +#endif diff -Nru openjdk.orig/hotspot/src/cpu/zero/vm/vm_version_zero.cpp openjdk/hotspot/src/cpu/zero/vm/vm_version_zero.cpp ---- openjdk.orig/hotspot/src/cpu/zero/vm/vm_version_zero.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/cpu/zero/vm/vm_version_zero.cpp 2012-07-25 15:09:16.208836690 +0100 +--- openjdk.orig/hotspot/src/cpu/zero/vm/vm_version_zero.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/cpu/zero/vm/vm_version_zero.cpp 2013-04-08 01:49:33.598321747 +0100 @@ -32,5 +32,8 @@ #ifdef TARGET_OS_FAMILY_linux # include "os_linux.inline.hpp" @@ -11447,7 +11447,7 @@ // This file is intentionally empty diff -Nru openjdk.orig/hotspot/src/os/bsd/vm/attachListener_bsd.cpp openjdk/hotspot/src/os/bsd/vm/attachListener_bsd.cpp --- openjdk.orig/hotspot/src/os/bsd/vm/attachListener_bsd.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2012-07-25 15:09:16.208836690 +0100 ++++ openjdk/hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2013-04-08 01:49:33.598321747 +0100 @@ -0,0 +1,520 @@ +/* + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. @@ -11971,7 +11971,7 @@ +} diff -Nru openjdk.orig/hotspot/src/os/bsd/vm/c1_globals_bsd.hpp openjdk/hotspot/src/os/bsd/vm/c1_globals_bsd.hpp --- openjdk.orig/hotspot/src/os/bsd/vm/c1_globals_bsd.hpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os/bsd/vm/c1_globals_bsd.hpp 2012-07-25 15:09:16.208836690 +0100 ++++ openjdk/hotspot/src/os/bsd/vm/c1_globals_bsd.hpp 2013-04-08 01:49:33.598321747 +0100 @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. @@ -12011,7 +12011,7 @@ +#endif // OS_BSD_VM_C1_GLOBALS_BSD_HPP diff -Nru openjdk.orig/hotspot/src/os/bsd/vm/c2_globals_bsd.hpp openjdk/hotspot/src/os/bsd/vm/c2_globals_bsd.hpp --- openjdk.orig/hotspot/src/os/bsd/vm/c2_globals_bsd.hpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os/bsd/vm/c2_globals_bsd.hpp 2012-07-25 15:09:16.208836690 +0100 ++++ openjdk/hotspot/src/os/bsd/vm/c2_globals_bsd.hpp 2013-04-08 01:49:33.598321747 +0100 @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. @@ -12051,7 +12051,7 @@ +#endif // OS_BSD_VM_C2_GLOBALS_BSD_HPP diff -Nru openjdk.orig/hotspot/src/os/bsd/vm/chaitin_bsd.cpp openjdk/hotspot/src/os/bsd/vm/chaitin_bsd.cpp --- openjdk.orig/hotspot/src/os/bsd/vm/chaitin_bsd.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os/bsd/vm/chaitin_bsd.cpp 2012-07-25 15:09:16.208836690 +0100 ++++ openjdk/hotspot/src/os/bsd/vm/chaitin_bsd.cpp 2013-04-08 01:49:33.598321747 +0100 @@ -0,0 +1,42 @@ +/* + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. @@ -12097,7 +12097,7 @@ +// End diff -Nru openjdk.orig/hotspot/src/os/bsd/vm/decoder_bsd.cpp openjdk/hotspot/src/os/bsd/vm/decoder_bsd.cpp --- openjdk.orig/hotspot/src/os/bsd/vm/decoder_bsd.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os/bsd/vm/decoder_bsd.cpp 2012-07-25 15:09:16.208836690 +0100 ++++ openjdk/hotspot/src/os/bsd/vm/decoder_bsd.cpp 2013-04-08 01:49:33.598321747 +0100 @@ -0,0 +1,66 @@ +/* + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -12167,7 +12167,7 @@ +} diff -Nru openjdk.orig/hotspot/src/os/bsd/vm/dtraceJSDT_bsd.cpp openjdk/hotspot/src/os/bsd/vm/dtraceJSDT_bsd.cpp --- openjdk.orig/hotspot/src/os/bsd/vm/dtraceJSDT_bsd.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os/bsd/vm/dtraceJSDT_bsd.cpp 2012-07-25 15:09:16.208836690 +0100 ++++ openjdk/hotspot/src/os/bsd/vm/dtraceJSDT_bsd.cpp 2013-04-08 01:49:33.598321747 +0100 @@ -0,0 +1,47 @@ +/* + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -12218,7 +12218,7 @@ +} diff -Nru openjdk.orig/hotspot/src/os/bsd/vm/globals_bsd.hpp openjdk/hotspot/src/os/bsd/vm/globals_bsd.hpp --- openjdk.orig/hotspot/src/os/bsd/vm/globals_bsd.hpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os/bsd/vm/globals_bsd.hpp 2012-07-25 15:09:16.208836690 +0100 ++++ openjdk/hotspot/src/os/bsd/vm/globals_bsd.hpp 2013-04-08 01:49:33.598321747 +0100 @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. @@ -12277,7 +12277,7 @@ +#endif // OS_BSD_VM_GLOBALS_BSD_HPP diff -Nru openjdk.orig/hotspot/src/os/bsd/vm/interfaceSupport_bsd.hpp openjdk/hotspot/src/os/bsd/vm/interfaceSupport_bsd.hpp --- openjdk.orig/hotspot/src/os/bsd/vm/interfaceSupport_bsd.hpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os/bsd/vm/interfaceSupport_bsd.hpp 2012-07-25 15:09:16.208836690 +0100 ++++ openjdk/hotspot/src/os/bsd/vm/interfaceSupport_bsd.hpp 2013-04-08 01:49:33.598321747 +0100 @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. @@ -12315,7 +12315,7 @@ +#endif // OS_BSD_VM_INTERFACESUPPORT_BSD_HPP diff -Nru openjdk.orig/hotspot/src/os/bsd/vm/jsig.c openjdk/hotspot/src/os/bsd/vm/jsig.c --- openjdk.orig/hotspot/src/os/bsd/vm/jsig.c 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os/bsd/vm/jsig.c 2012-07-25 15:09:16.208836690 +0100 ++++ openjdk/hotspot/src/os/bsd/vm/jsig.c 2013-04-08 01:49:33.598321747 +0100 @@ -0,0 +1,225 @@ +/* + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. @@ -12544,7 +12544,7 @@ +} diff -Nru openjdk.orig/hotspot/src/os/bsd/vm/jvm_bsd.cpp openjdk/hotspot/src/os/bsd/vm/jvm_bsd.cpp --- openjdk.orig/hotspot/src/os/bsd/vm/jvm_bsd.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os/bsd/vm/jvm_bsd.cpp 2012-07-25 15:09:16.208836690 +0100 ++++ openjdk/hotspot/src/os/bsd/vm/jvm_bsd.cpp 2013-04-08 01:49:33.598321747 +0100 @@ -0,0 +1,192 @@ +/* + * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. @@ -12740,7 +12740,7 @@ +} diff -Nru openjdk.orig/hotspot/src/os/bsd/vm/jvm_bsd.h openjdk/hotspot/src/os/bsd/vm/jvm_bsd.h --- openjdk.orig/hotspot/src/os/bsd/vm/jvm_bsd.h 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os/bsd/vm/jvm_bsd.h 2012-07-25 15:09:16.208836690 +0100 ++++ openjdk/hotspot/src/os/bsd/vm/jvm_bsd.h 2013-04-08 01:49:33.598321747 +0100 @@ -0,0 +1,120 @@ +/* + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. @@ -12864,7 +12864,7 @@ +#endif // OS_BSD_VM_JVM_BSD_H diff -Nru openjdk.orig/hotspot/src/os/bsd/vm/mutex_bsd.cpp openjdk/hotspot/src/os/bsd/vm/mutex_bsd.cpp --- openjdk.orig/hotspot/src/os/bsd/vm/mutex_bsd.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os/bsd/vm/mutex_bsd.cpp 2012-07-25 15:09:16.208836690 +0100 ++++ openjdk/hotspot/src/os/bsd/vm/mutex_bsd.cpp 2013-04-08 01:49:33.598321747 +0100 @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. @@ -12901,7 +12901,7 @@ +# include <signal.h> diff -Nru openjdk.orig/hotspot/src/os/bsd/vm/mutex_bsd.inline.hpp openjdk/hotspot/src/os/bsd/vm/mutex_bsd.inline.hpp --- openjdk.orig/hotspot/src/os/bsd/vm/mutex_bsd.inline.hpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os/bsd/vm/mutex_bsd.inline.hpp 2012-07-25 15:09:16.208836690 +0100 ++++ openjdk/hotspot/src/os/bsd/vm/mutex_bsd.inline.hpp 2013-04-08 01:49:33.598321747 +0100 @@ -0,0 +1,37 @@ +/* + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. @@ -12942,7 +12942,7 @@ +#endif // OS_BSD_VM_MUTEX_BSD_INLINE_HPP diff -Nru openjdk.orig/hotspot/src/os/bsd/vm/os_bsd.cpp openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp --- openjdk.orig/hotspot/src/os/bsd/vm/os_bsd.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp 2012-07-25 15:09:16.212836757 +0100 ++++ openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp 2013-04-08 01:49:33.602321812 +0100 @@ -0,0 +1,5709 @@ +/* + * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. @@ -18655,7 +18655,7 @@ +} diff -Nru openjdk.orig/hotspot/src/os/bsd/vm/os_bsd.hpp openjdk/hotspot/src/os/bsd/vm/os_bsd.hpp --- openjdk.orig/hotspot/src/os/bsd/vm/os_bsd.hpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os/bsd/vm/os_bsd.hpp 2012-07-25 15:09:16.212836757 +0100 ++++ openjdk/hotspot/src/os/bsd/vm/os_bsd.hpp 2013-04-08 01:49:33.602321812 +0100 @@ -0,0 +1,368 @@ +/* + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. @@ -19027,7 +19027,7 @@ +#endif // OS_BSD_VM_OS_BSD_HPP diff -Nru openjdk.orig/hotspot/src/os/bsd/vm/os_bsd.inline.hpp openjdk/hotspot/src/os/bsd/vm/os_bsd.inline.hpp --- openjdk.orig/hotspot/src/os/bsd/vm/os_bsd.inline.hpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2012-07-25 15:09:16.212836757 +0100 ++++ openjdk/hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2013-04-08 01:49:33.602321812 +0100 @@ -0,0 +1,302 @@ +/* + * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. @@ -19333,7 +19333,7 @@ +#endif // OS_BSD_VM_OS_BSD_INLINE_HPP diff -Nru openjdk.orig/hotspot/src/os/bsd/vm/os_share_bsd.hpp openjdk/hotspot/src/os/bsd/vm/os_share_bsd.hpp --- openjdk.orig/hotspot/src/os/bsd/vm/os_share_bsd.hpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os/bsd/vm/os_share_bsd.hpp 2012-07-25 15:09:16.212836757 +0100 ++++ openjdk/hotspot/src/os/bsd/vm/os_share_bsd.hpp 2013-04-08 01:49:33.602321812 +0100 @@ -0,0 +1,37 @@ +/* + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. @@ -19374,7 +19374,7 @@ +#endif // OS_BSD_VM_OS_SHARE_BSD_HPP diff -Nru openjdk.orig/hotspot/src/os/bsd/vm/osThread_bsd.cpp openjdk/hotspot/src/os/bsd/vm/osThread_bsd.cpp --- openjdk.orig/hotspot/src/os/bsd/vm/osThread_bsd.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os/bsd/vm/osThread_bsd.cpp 2012-07-25 15:09:16.208836690 +0100 ++++ openjdk/hotspot/src/os/bsd/vm/osThread_bsd.cpp 2013-04-08 01:49:33.602321812 +0100 @@ -0,0 +1,67 @@ +/* + * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. @@ -19445,7 +19445,7 @@ +} diff -Nru openjdk.orig/hotspot/src/os/bsd/vm/osThread_bsd.hpp openjdk/hotspot/src/os/bsd/vm/osThread_bsd.hpp --- openjdk.orig/hotspot/src/os/bsd/vm/osThread_bsd.hpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os/bsd/vm/osThread_bsd.hpp 2012-07-25 15:09:16.208836690 +0100 ++++ openjdk/hotspot/src/os/bsd/vm/osThread_bsd.hpp 2013-04-08 01:49:33.602321812 +0100 @@ -0,0 +1,165 @@ +/* + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. @@ -19614,7 +19614,7 @@ +#endif // OS_BSD_VM_OSTHREAD_BSD_HPP diff -Nru openjdk.orig/hotspot/src/os/bsd/vm/perfMemory_bsd.cpp openjdk/hotspot/src/os/bsd/vm/perfMemory_bsd.cpp --- openjdk.orig/hotspot/src/os/bsd/vm/perfMemory_bsd.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os/bsd/vm/perfMemory_bsd.cpp 2012-07-25 15:09:16.212836757 +0100 ++++ openjdk/hotspot/src/os/bsd/vm/perfMemory_bsd.cpp 2013-04-08 01:49:33.602321812 +0100 @@ -0,0 +1,1041 @@ +/* + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. @@ -20659,7 +20659,7 @@ +} diff -Nru openjdk.orig/hotspot/src/os/bsd/vm/stubRoutines_bsd.cpp openjdk/hotspot/src/os/bsd/vm/stubRoutines_bsd.cpp --- openjdk.orig/hotspot/src/os/bsd/vm/stubRoutines_bsd.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os/bsd/vm/stubRoutines_bsd.cpp 2012-07-25 15:09:16.212836757 +0100 ++++ openjdk/hotspot/src/os/bsd/vm/stubRoutines_bsd.cpp 2013-04-08 01:49:33.602321812 +0100 @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. @@ -20690,7 +20690,7 @@ +#include "runtime/stubRoutines.hpp" diff -Nru openjdk.orig/hotspot/src/os/bsd/vm/thread_bsd.inline.hpp openjdk/hotspot/src/os/bsd/vm/thread_bsd.inline.hpp --- openjdk.orig/hotspot/src/os/bsd/vm/thread_bsd.inline.hpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os/bsd/vm/thread_bsd.inline.hpp 2012-07-25 15:09:16.212836757 +0100 ++++ openjdk/hotspot/src/os/bsd/vm/thread_bsd.inline.hpp 2013-04-08 01:49:33.602321812 +0100 @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. @@ -20741,7 +20741,7 @@ +#endif // OS_BSD_VM_THREAD_BSD_INLINE_HPP diff -Nru openjdk.orig/hotspot/src/os/bsd/vm/threadCritical_bsd.cpp openjdk/hotspot/src/os/bsd/vm/threadCritical_bsd.cpp --- openjdk.orig/hotspot/src/os/bsd/vm/threadCritical_bsd.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os/bsd/vm/threadCritical_bsd.cpp 2012-07-25 15:09:16.212836757 +0100 ++++ openjdk/hotspot/src/os/bsd/vm/threadCritical_bsd.cpp 2013-04-08 01:49:33.602321812 +0100 @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. @@ -20812,7 +20812,7 @@ +} diff -Nru openjdk.orig/hotspot/src/os/bsd/vm/vmError_bsd.cpp openjdk/hotspot/src/os/bsd/vm/vmError_bsd.cpp --- openjdk.orig/hotspot/src/os/bsd/vm/vmError_bsd.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os/bsd/vm/vmError_bsd.cpp 2012-07-25 15:09:16.212836757 +0100 ++++ openjdk/hotspot/src/os/bsd/vm/vmError_bsd.cpp 2013-04-08 01:49:33.602321812 +0100 @@ -0,0 +1,115 @@ +/* + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. @@ -20930,8 +20930,8 @@ + os::signal(SIGBUS, CAST_FROM_FN_PTR(void *, crash_handler)); +} diff -Nru openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp ---- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2012-07-25 15:09:16.212836757 +0100 +--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp 2013-04-08 01:48:11.805006641 +0100 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2013-04-08 01:49:33.606321876 +0100 @@ -22,8 +22,6 @@ * */ @@ -20942,8 +20942,8 @@ #include "classfile/classLoader.hpp" #include "classfile/systemDictionary.hpp" diff -Nru openjdk.orig/hotspot/src/os/posix/launcher/java_md.c openjdk/hotspot/src/os/posix/launcher/java_md.c ---- openjdk.orig/hotspot/src/os/posix/launcher/java_md.c 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/os/posix/launcher/java_md.c 2012-07-25 15:09:16.216836827 +0100 +--- openjdk.orig/hotspot/src/os/posix/launcher/java_md.c 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/os/posix/launcher/java_md.c 2013-04-08 01:49:33.606321876 +0100 @@ -41,14 +41,21 @@ #include "version_comp.h" #endif @@ -21098,8 +21098,8 @@ pthread_attr_t attr; pthread_attr_init(&attr); diff -Nru openjdk.orig/hotspot/src/os/posix/launcher/launcher.script openjdk/hotspot/src/os/posix/launcher/launcher.script ---- openjdk.orig/hotspot/src/os/posix/launcher/launcher.script 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/os/posix/launcher/launcher.script 2012-07-25 15:09:16.216836827 +0100 +--- openjdk.orig/hotspot/src/os/posix/launcher/launcher.script 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/os/posix/launcher/launcher.script 2013-04-08 01:49:33.606321876 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh @@ -21108,7 +21108,7 @@ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. diff -Nru openjdk.orig/hotspot/src/os_cpu/bsd_x86/vm/assembler_bsd_x86.cpp openjdk/hotspot/src/os_cpu/bsd_x86/vm/assembler_bsd_x86.cpp --- openjdk.orig/hotspot/src/os_cpu/bsd_x86/vm/assembler_bsd_x86.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os_cpu/bsd_x86/vm/assembler_bsd_x86.cpp 2012-07-25 15:09:16.216836827 +0100 ++++ openjdk/hotspot/src/os_cpu/bsd_x86/vm/assembler_bsd_x86.cpp 2013-04-08 01:49:33.606321876 +0100 @@ -0,0 +1,87 @@ +/* + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. @@ -21199,7 +21199,7 @@ +#endif diff -Nru openjdk.orig/hotspot/src/os_cpu/bsd_x86/vm/atomic_bsd_x86.inline.hpp openjdk/hotspot/src/os_cpu/bsd_x86/vm/atomic_bsd_x86.inline.hpp --- openjdk.orig/hotspot/src/os_cpu/bsd_x86/vm/atomic_bsd_x86.inline.hpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os_cpu/bsd_x86/vm/atomic_bsd_x86.inline.hpp 2012-07-25 15:09:16.216836827 +0100 ++++ openjdk/hotspot/src/os_cpu/bsd_x86/vm/atomic_bsd_x86.inline.hpp 2013-04-08 01:49:33.606321876 +0100 @@ -0,0 +1,221 @@ +/* + * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. @@ -21424,7 +21424,7 @@ +#endif // OS_CPU_BSD_X86_VM_ATOMIC_BSD_X86_INLINE_HPP diff -Nru openjdk.orig/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.ad openjdk/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.ad --- openjdk.orig/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.ad 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.ad 2012-07-25 15:09:16.216836827 +0100 ++++ openjdk/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.ad 2013-04-08 01:49:33.606321876 +0100 @@ -0,0 +1,160 @@ +// +// Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. @@ -21588,7 +21588,7 @@ +%} diff -Nru openjdk.orig/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s openjdk/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s --- openjdk.orig/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s 2012-07-25 15:09:16.216836827 +0100 ++++ openjdk/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s 2013-04-08 01:49:33.606321876 +0100 @@ -0,0 +1,689 @@ +# +# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. @@ -22281,7 +22281,7 @@ + diff -Nru openjdk.orig/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.ad openjdk/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.ad --- openjdk.orig/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.ad 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.ad 2012-07-25 15:09:16.216836827 +0100 ++++ openjdk/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.ad 2013-04-08 01:49:33.606321876 +0100 @@ -0,0 +1,173 @@ +// +// Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved. @@ -22458,7 +22458,7 @@ +%} diff -Nru openjdk.orig/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s openjdk/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s --- openjdk.orig/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s 2012-07-25 15:09:16.216836827 +0100 ++++ openjdk/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s 2013-04-08 01:49:33.606321876 +0100 @@ -0,0 +1,410 @@ +# +# Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved. @@ -22872,7 +22872,7 @@ + ret diff -Nru openjdk.orig/hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp openjdk/hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp --- openjdk.orig/hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp 2012-07-25 15:09:16.216836827 +0100 ++++ openjdk/hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp 2013-04-08 01:49:33.606321876 +0100 @@ -0,0 +1,116 @@ +/* + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. @@ -22992,7 +22992,7 @@ +#endif // OS_CPU_BSD_X86_VM_BYTES_BSD_X86_INLINE_HPP diff -Nru openjdk.orig/hotspot/src/os_cpu/bsd_x86/vm/copy_bsd_x86.inline.hpp openjdk/hotspot/src/os_cpu/bsd_x86/vm/copy_bsd_x86.inline.hpp --- openjdk.orig/hotspot/src/os_cpu/bsd_x86/vm/copy_bsd_x86.inline.hpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os_cpu/bsd_x86/vm/copy_bsd_x86.inline.hpp 2012-07-25 15:09:16.216836827 +0100 ++++ openjdk/hotspot/src/os_cpu/bsd_x86/vm/copy_bsd_x86.inline.hpp 2013-04-08 01:49:33.606321876 +0100 @@ -0,0 +1,309 @@ +/* + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. @@ -23305,7 +23305,7 @@ +#endif // OS_CPU_BSD_X86_VM_COPY_BSD_X86_INLINE_HPP diff -Nru openjdk.orig/hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp openjdk/hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp --- openjdk.orig/hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp 2012-07-25 15:09:16.216836827 +0100 ++++ openjdk/hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp 2013-04-08 01:49:33.606321876 +0100 @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. @@ -23363,7 +23363,7 @@ +#endif // OS_CPU_BSD_X86_VM_GLOBALS_BSD_X86_HPP diff -Nru openjdk.orig/hotspot/src/os_cpu/bsd_x86/vm/orderAccess_bsd_x86.inline.hpp openjdk/hotspot/src/os_cpu/bsd_x86/vm/orderAccess_bsd_x86.inline.hpp --- openjdk.orig/hotspot/src/os_cpu/bsd_x86/vm/orderAccess_bsd_x86.inline.hpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os_cpu/bsd_x86/vm/orderAccess_bsd_x86.inline.hpp 2012-07-25 15:09:16.216836827 +0100 ++++ openjdk/hotspot/src/os_cpu/bsd_x86/vm/orderAccess_bsd_x86.inline.hpp 2013-04-08 01:49:33.606321876 +0100 @@ -0,0 +1,215 @@ +/* + * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. @@ -23582,7 +23582,7 @@ +#endif // OS_CPU_BSD_X86_VM_ORDERACCESS_BSD_X86_INLINE_HPP diff -Nru openjdk.orig/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp openjdk/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp --- openjdk.orig/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2012-07-25 15:09:16.216836827 +0100 ++++ openjdk/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2013-04-08 01:49:33.610321941 +0100 @@ -0,0 +1,1124 @@ +/* + * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. @@ -24710,7 +24710,7 @@ +} diff -Nru openjdk.orig/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.hpp openjdk/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.hpp --- openjdk.orig/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.hpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.hpp 2012-07-25 15:09:16.216836827 +0100 ++++ openjdk/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.hpp 2013-04-08 01:49:33.610321941 +0100 @@ -0,0 +1,37 @@ +/* + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. @@ -24751,7 +24751,7 @@ +#endif // OS_CPU_BSD_X86_VM_OS_BSD_X86_HPP diff -Nru openjdk.orig/hotspot/src/os_cpu/bsd_x86/vm/prefetch_bsd_x86.inline.hpp openjdk/hotspot/src/os_cpu/bsd_x86/vm/prefetch_bsd_x86.inline.hpp --- openjdk.orig/hotspot/src/os_cpu/bsd_x86/vm/prefetch_bsd_x86.inline.hpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os_cpu/bsd_x86/vm/prefetch_bsd_x86.inline.hpp 2012-07-25 15:09:16.216836827 +0100 ++++ openjdk/hotspot/src/os_cpu/bsd_x86/vm/prefetch_bsd_x86.inline.hpp 2013-04-08 01:49:33.610321941 +0100 @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. @@ -24802,7 +24802,7 @@ +#endif // OS_CPU_BSD_X86_VM_PREFETCH_BSD_X86_INLINE_HPP diff -Nru openjdk.orig/hotspot/src/os_cpu/bsd_x86/vm/thread_bsd_x86.cpp openjdk/hotspot/src/os_cpu/bsd_x86/vm/thread_bsd_x86.cpp --- openjdk.orig/hotspot/src/os_cpu/bsd_x86/vm/thread_bsd_x86.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os_cpu/bsd_x86/vm/thread_bsd_x86.cpp 2012-07-25 15:09:16.216836827 +0100 ++++ openjdk/hotspot/src/os_cpu/bsd_x86/vm/thread_bsd_x86.cpp 2013-04-08 01:49:33.610321941 +0100 @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. @@ -24890,7 +24890,7 @@ +void JavaThread::cache_global_variables() { } diff -Nru openjdk.orig/hotspot/src/os_cpu/bsd_x86/vm/thread_bsd_x86.hpp openjdk/hotspot/src/os_cpu/bsd_x86/vm/thread_bsd_x86.hpp --- openjdk.orig/hotspot/src/os_cpu/bsd_x86/vm/thread_bsd_x86.hpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os_cpu/bsd_x86/vm/thread_bsd_x86.hpp 2012-07-25 15:09:16.216836827 +0100 ++++ openjdk/hotspot/src/os_cpu/bsd_x86/vm/thread_bsd_x86.hpp 2013-04-08 01:49:33.610321941 +0100 @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. @@ -24964,7 +24964,7 @@ +#endif // OS_CPU_BSD_X86_VM_THREAD_BSD_X86_HPP diff -Nru openjdk.orig/hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.cpp openjdk/hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.cpp --- openjdk.orig/hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.cpp 2012-07-25 15:09:16.216836827 +0100 ++++ openjdk/hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.cpp 2013-04-08 01:49:33.610321941 +0100 @@ -0,0 +1,92 @@ +/* + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. @@ -25060,7 +25060,7 @@ +} diff -Nru openjdk.orig/hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp openjdk/hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp --- openjdk.orig/hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp 2012-07-25 15:09:16.216836827 +0100 ++++ openjdk/hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp 2013-04-08 01:49:33.610321941 +0100 @@ -0,0 +1,56 @@ +/* + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. @@ -25120,7 +25120,7 @@ +#endif // OS_CPU_BSD_X86_VM_THREADLS_BSD_X86_HPP diff -Nru openjdk.orig/hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp openjdk/hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp --- openjdk.orig/hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2012-07-25 15:09:16.216836827 +0100 ++++ openjdk/hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2013-04-08 01:49:33.610321941 +0100 @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. @@ -25189,7 +25189,7 @@ +#endif // OS_CPU_BSD_X86_VM_VMSTRUCTS_BSD_X86_HPP diff -Nru openjdk.orig/hotspot/src/os_cpu/bsd_x86/vm/vm_version_bsd_x86.cpp openjdk/hotspot/src/os_cpu/bsd_x86/vm/vm_version_bsd_x86.cpp --- openjdk.orig/hotspot/src/os_cpu/bsd_x86/vm/vm_version_bsd_x86.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os_cpu/bsd_x86/vm/vm_version_bsd_x86.cpp 2012-07-25 15:09:16.216836827 +0100 ++++ openjdk/hotspot/src/os_cpu/bsd_x86/vm/vm_version_bsd_x86.cpp 2013-04-08 01:49:33.610321941 +0100 @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. @@ -25220,7 +25220,7 @@ +#include "vm_version_x86.hpp" diff -Nru openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/assembler_bsd_zero.cpp openjdk/hotspot/src/os_cpu/bsd_zero/vm/assembler_bsd_zero.cpp --- openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/assembler_bsd_zero.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/assembler_bsd_zero.cpp 2012-07-25 15:09:16.216836827 +0100 ++++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/assembler_bsd_zero.cpp 2013-04-08 01:49:33.610321941 +0100 @@ -0,0 +1,32 @@ +/* + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -25256,7 +25256,7 @@ +// This file is intentionally empty diff -Nru openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp openjdk/hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp --- openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp 2012-07-25 15:09:16.220836895 +0100 ++++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp 2013-04-08 01:49:33.610321941 +0100 @@ -0,0 +1,323 @@ +/* + * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. @@ -25583,7 +25583,7 @@ +#endif // OS_CPU_BSD_ZERO_VM_ATOMIC_BSD_ZERO_INLINE_HPP diff -Nru openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp openjdk/hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp --- openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp 2012-07-25 15:09:16.220836895 +0100 ++++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp 2013-04-08 01:49:33.610321941 +0100 @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. @@ -25654,7 +25654,7 @@ +#endif // OS_CPU_BSD_ZERO_VM_BYTES_BSD_ZERO_INLINE_HPP diff -Nru openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/globals_bsd_zero.hpp openjdk/hotspot/src/os_cpu/bsd_zero/vm/globals_bsd_zero.hpp --- openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/globals_bsd_zero.hpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/globals_bsd_zero.hpp 2012-07-25 15:09:16.220836895 +0100 ++++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/globals_bsd_zero.hpp 2013-04-08 01:49:33.610321941 +0100 @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. @@ -25706,7 +25706,7 @@ +#endif // OS_CPU_BSD_ZERO_VM_GLOBALS_BSD_ZERO_HPP diff -Nru openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp openjdk/hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp --- openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp 2012-07-25 15:09:16.220836895 +0100 ++++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp 2013-04-08 01:49:33.610321941 +0100 @@ -0,0 +1,176 @@ +/* + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. @@ -25886,7 +25886,7 @@ +#endif // OS_CPU_BSD_ZERO_VM_ORDERACCESS_BSD_ZERO_INLINE_HPP diff -Nru openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp openjdk/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp --- openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2012-07-25 15:09:16.220836895 +0100 ++++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2013-04-08 01:49:33.610321941 +0100 @@ -0,0 +1,558 @@ +/* + * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. @@ -26448,7 +26448,7 @@ +#endif // !_LP64 diff -Nru openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.hpp openjdk/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.hpp --- openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.hpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.hpp 2012-07-25 15:09:16.220836895 +0100 ++++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.hpp 2013-04-08 01:49:33.610321941 +0100 @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. @@ -26508,7 +26508,7 @@ +#endif // OS_CPU_BSD_ZERO_VM_OS_BSD_ZERO_HPP diff -Nru openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/prefetch_bsd_zero.inline.hpp openjdk/hotspot/src/os_cpu/bsd_zero/vm/prefetch_bsd_zero.inline.hpp --- openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/prefetch_bsd_zero.inline.hpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/prefetch_bsd_zero.inline.hpp 2012-07-25 15:09:16.220836895 +0100 ++++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/prefetch_bsd_zero.inline.hpp 2013-04-08 01:49:33.610321941 +0100 @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. @@ -26549,7 +26549,7 @@ +#endif // OS_CPU_BSD_ZERO_VM_PREFETCH_BSD_ZERO_INLINE_HPP diff -Nru openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/thread_bsd_zero.cpp openjdk/hotspot/src/os_cpu/bsd_zero/vm/thread_bsd_zero.cpp --- openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/thread_bsd_zero.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/thread_bsd_zero.cpp 2012-07-25 15:09:16.220836895 +0100 ++++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/thread_bsd_zero.cpp 2013-04-08 01:49:33.614322005 +0100 @@ -0,0 +1,32 @@ +/* + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -26585,7 +26585,7 @@ +} diff -Nru openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/thread_bsd_zero.hpp openjdk/hotspot/src/os_cpu/bsd_zero/vm/thread_bsd_zero.hpp --- openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/thread_bsd_zero.hpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/thread_bsd_zero.hpp 2012-07-25 15:09:16.220836895 +0100 ++++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/thread_bsd_zero.hpp 2013-04-08 01:49:33.614322005 +0100 @@ -0,0 +1,121 @@ +/* + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. @@ -26710,7 +26710,7 @@ +#endif // OS_CPU_BSD_ZERO_VM_THREAD_BSD_ZERO_HPP diff -Nru openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/threadLS_bsd_zero.cpp openjdk/hotspot/src/os_cpu/bsd_zero/vm/threadLS_bsd_zero.cpp --- openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/threadLS_bsd_zero.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/threadLS_bsd_zero.cpp 2012-07-25 15:09:16.220836895 +0100 ++++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/threadLS_bsd_zero.cpp 2013-04-08 01:49:33.614322005 +0100 @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. @@ -26754,7 +26754,7 @@ +} diff -Nru openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/threadLS_bsd_zero.hpp openjdk/hotspot/src/os_cpu/bsd_zero/vm/threadLS_bsd_zero.hpp --- openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/threadLS_bsd_zero.hpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/threadLS_bsd_zero.hpp 2012-07-25 15:09:16.220836895 +0100 ++++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/threadLS_bsd_zero.hpp 2013-04-08 01:49:33.614322005 +0100 @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. @@ -26793,7 +26793,7 @@ +#endif // OS_CPU_BSD_ZERO_VM_THREADLS_BSD_ZERO_HPP diff -Nru openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/vmStructs_bsd_zero.hpp openjdk/hotspot/src/os_cpu/bsd_zero/vm/vmStructs_bsd_zero.hpp --- openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/vmStructs_bsd_zero.hpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/vmStructs_bsd_zero.hpp 2012-07-25 15:09:16.220836895 +0100 ++++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/vmStructs_bsd_zero.hpp 2013-04-08 01:49:33.614322005 +0100 @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. @@ -26847,7 +26847,7 @@ +#endif // OS_CPU_BSD_ZERO_VM_VMSTRUCTS_BSD_ZERO_HPP diff -Nru openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/vm_version_bsd_zero.cpp openjdk/hotspot/src/os_cpu/bsd_zero/vm/vm_version_bsd_zero.cpp --- openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/vm_version_bsd_zero.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/vm_version_bsd_zero.cpp 2012-07-25 15:09:16.220836895 +0100 ++++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/vm_version_bsd_zero.cpp 2013-04-08 01:49:33.614322005 +0100 @@ -0,0 +1,30 @@ +/* + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -26880,8 +26880,8 @@ + +// This file is intentionally empty diff -Nru openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp ---- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp 2012-07-25 15:09:16.220836895 +0100 +--- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp 2013-04-08 01:49:33.614322005 +0100 @@ -38,7 +38,6 @@ #else define_pd_global(intx, VMThreadStackSize, 512); @@ -26891,8 +26891,8 @@ define_pd_global(uintx, JVMInvokeMethodSlack, 8192); diff -Nru openjdk.orig/hotspot/src/share/vm/adlc/adlc.hpp openjdk/hotspot/src/share/vm/adlc/adlc.hpp ---- openjdk.orig/hotspot/src/share/vm/adlc/adlc.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/adlc/adlc.hpp 2012-07-25 15:09:16.220836895 +0100 +--- openjdk.orig/hotspot/src/share/vm/adlc/adlc.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/adlc/adlc.hpp 2013-04-08 01:49:33.614322005 +0100 @@ -67,9 +67,9 @@ #endif #endif // _WIN32 @@ -26906,8 +26906,8 @@ // Macros #define uint32 unsigned int diff -Nru openjdk.orig/hotspot/src/share/vm/c1/c1_globals.hpp openjdk/hotspot/src/share/vm/c1/c1_globals.hpp ---- openjdk.orig/hotspot/src/share/vm/c1/c1_globals.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_globals.hpp 2012-07-25 15:09:16.220836895 +0100 +--- openjdk.orig/hotspot/src/share/vm/c1/c1_globals.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/c1/c1_globals.hpp 2013-04-08 01:49:33.614322005 +0100 @@ -47,6 +47,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "c1_globals_windows.hpp" @@ -26919,8 +26919,8 @@ // // Defines all global flags used by the client compiler. diff -Nru openjdk.orig/hotspot/src/share/vm/classfile/classLoader.cpp openjdk/hotspot/src/share/vm/classfile/classLoader.cpp ---- openjdk.orig/hotspot/src/share/vm/classfile/classLoader.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/classfile/classLoader.cpp 2012-07-25 15:09:16.220836895 +0100 +--- openjdk.orig/hotspot/src/share/vm/classfile/classLoader.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/classfile/classLoader.cpp 2013-04-08 01:49:33.614322005 +0100 @@ -68,6 +68,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "os_windows.inline.hpp" @@ -26932,9 +26932,9 @@ // Entry points in zip.dll for loading zip/jar file entries diff -Nru openjdk.orig/hotspot/src/share/vm/classfile/javaClasses.cpp openjdk/hotspot/src/share/vm/classfile/javaClasses.cpp ---- openjdk.orig/hotspot/src/share/vm/classfile/javaClasses.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/classfile/javaClasses.cpp 2012-07-25 15:09:16.220836895 +0100 -@@ -58,6 +58,9 @@ +--- openjdk.orig/hotspot/src/share/vm/classfile/javaClasses.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/classfile/javaClasses.cpp 2013-04-08 01:49:33.614322005 +0100 +@@ -59,6 +59,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" #endif @@ -26944,7 +26944,7 @@ #define INJECTED_FIELD_COMPUTE_OFFSET(klass, name, signature, may_be_java) \ klass::_##name##_offset = JavaClasses::compute_injected_offset(JavaClasses::klass##_##name##_enum); -@@ -1145,7 +1148,7 @@ +@@ -1159,7 +1162,7 @@ } nmethod* nm = method->code(); if (WizardMode && nm != NULL) { @@ -26954,8 +26954,8 @@ } diff -Nru openjdk.orig/hotspot/src/share/vm/code/stubs.hpp openjdk/hotspot/src/share/vm/code/stubs.hpp ---- openjdk.orig/hotspot/src/share/vm/code/stubs.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/code/stubs.hpp 2012-07-25 15:09:16.220836895 +0100 +--- openjdk.orig/hotspot/src/share/vm/code/stubs.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/code/stubs.hpp 2013-04-08 01:49:33.614322005 +0100 @@ -35,6 +35,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "os_windows.inline.hpp" @@ -26967,8 +26967,8 @@ // The classes in this file provide a simple framework for the // management of little pieces of machine code - or stubs - diff -Nru openjdk.orig/hotspot/src/share/vm/compiler/disassembler.hpp openjdk/hotspot/src/share/vm/compiler/disassembler.hpp ---- openjdk.orig/hotspot/src/share/vm/compiler/disassembler.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/compiler/disassembler.hpp 2012-07-25 15:09:16.220836895 +0100 +--- openjdk.orig/hotspot/src/share/vm/compiler/disassembler.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/compiler/disassembler.hpp 2013-04-08 01:49:33.614322005 +0100 @@ -35,6 +35,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "os_windows.inline.hpp" @@ -26980,8 +26980,8 @@ class decode_env; diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp ---- openjdk.orig/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp 2012-07-25 15:09:16.220836895 +0100 +--- openjdk.orig/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp 2013-04-08 01:49:33.614322005 +0100 @@ -37,6 +37,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "os_windows.inline.hpp" @@ -26993,8 +26993,8 @@ elapsedTimer CMSAdaptiveSizePolicy::_STW_timer; diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp ---- openjdk.orig/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp 2012-07-25 15:09:16.220836895 +0100 +--- openjdk.orig/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp 2013-04-08 01:49:33.614322005 +0100 @@ -50,6 +50,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -27006,8 +27006,8 @@ // // ConcurrentMarkSweepPolicy methods diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp ---- openjdk.orig/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp 2012-07-25 15:09:16.220836895 +0100 +--- openjdk.orig/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp 2013-04-08 01:49:33.618322069 +0100 @@ -36,6 +36,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -27019,8 +27019,8 @@ class ConcurrentMarkSweepGeneration; class CMSCollector; diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.cpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.cpp ---- openjdk.orig/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.cpp 2012-07-25 15:09:16.220836895 +0100 +--- openjdk.orig/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.cpp 2013-04-08 01:49:33.618322069 +0100 @@ -33,6 +33,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -27032,8 +27032,8 @@ #ifndef PRODUCT Mutex* FreeBlockDictionary::par_lock() const { diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp openjdk/hotspot/src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp ---- openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp 2012-07-25 15:09:16.220836895 +0100 +--- openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp 2013-04-08 01:49:33.618322069 +0100 @@ -39,6 +39,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -27045,8 +27045,8 @@ bool DirtyCardQueue::apply_closure(CardTableEntryClosure* cl, bool consume, diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp openjdk/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp ---- openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp 2012-07-25 15:09:16.224836961 +0100 +--- openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp 2013-04-08 01:49:33.618322069 +0100 @@ -37,6 +37,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -27058,8 +27058,8 @@ G1SATBCardTableModRefBS::G1SATBCardTableModRefBS(MemRegion whole_heap, int max_covered_regions) : diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/ptrQueue.cpp openjdk/hotspot/src/share/vm/gc_implementation/g1/ptrQueue.cpp ---- openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/ptrQueue.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/ptrQueue.cpp 2012-07-25 15:09:16.224836961 +0100 +--- openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/ptrQueue.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/ptrQueue.cpp 2013-04-08 01:49:33.618322069 +0100 @@ -37,6 +37,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -27071,8 +27071,8 @@ PtrQueue::PtrQueue(PtrQueueSet* qset, bool perm, bool active) : _qset(qset), _buf(NULL), _index(0), _active(active), diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp ---- openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp 2012-07-25 15:09:16.224836961 +0100 +--- openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp 2013-04-08 01:49:33.618322069 +0100 @@ -38,6 +38,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "os_windows.inline.hpp" @@ -27084,8 +27084,8 @@ bool ParMarkBitMap::initialize(MemRegion covered_region) diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp ---- openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp 2012-07-25 15:09:16.224836961 +0100 +--- openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp 2013-04-08 01:49:33.618322069 +0100 @@ -35,6 +35,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "os_windows.inline.hpp" @@ -27097,8 +27097,8 @@ // PSVirtualSpace diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp openjdk/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp ---- openjdk.orig/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp 2012-07-25 15:09:16.224836961 +0100 +--- openjdk.orig/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp 2013-04-08 01:49:33.618322069 +0100 @@ -37,6 +37,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -27110,8 +27110,8 @@ MutableNUMASpace::MutableNUMASpace(size_t alignment) : MutableSpace(alignment) { diff -Nru openjdk.orig/hotspot/src/share/vm/gc_interface/collectedHeap.cpp openjdk/hotspot/src/share/vm/gc_interface/collectedHeap.cpp ---- openjdk.orig/hotspot/src/share/vm/gc_interface/collectedHeap.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_interface/collectedHeap.cpp 2012-07-25 15:09:16.224836961 +0100 +--- openjdk.orig/hotspot/src/share/vm/gc_interface/collectedHeap.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/gc_interface/collectedHeap.cpp 2013-04-08 01:49:33.618322069 +0100 @@ -39,6 +39,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -27123,8 +27123,8 @@ #ifdef ASSERT diff -Nru openjdk.orig/hotspot/src/share/vm/gc_interface/collectedHeap.inline.hpp openjdk/hotspot/src/share/vm/gc_interface/collectedHeap.inline.hpp ---- openjdk.orig/hotspot/src/share/vm/gc_interface/collectedHeap.inline.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_interface/collectedHeap.inline.hpp 2012-07-25 15:09:16.224836961 +0100 +--- openjdk.orig/hotspot/src/share/vm/gc_interface/collectedHeap.inline.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/gc_interface/collectedHeap.inline.hpp 2013-04-08 01:49:33.618322069 +0100 @@ -43,6 +43,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -27136,8 +27136,8 @@ // Inline allocation implementations. diff -Nru openjdk.orig/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp openjdk/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp ---- openjdk.orig/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp 2012-07-25 15:09:16.224836961 +0100 +--- openjdk.orig/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp 2013-04-08 01:49:33.618322069 +0100 @@ -56,6 +56,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -27149,8 +27149,8 @@ // This file contains the platform-independent parts // of the abstract interpreter and the abstract interpreter generator. diff -Nru openjdk.orig/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp ---- openjdk.orig/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp 2012-07-25 15:09:16.224836961 +0100 +--- openjdk.orig/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp 2013-04-08 01:49:33.618322069 +0100 @@ -65,6 +65,12 @@ #ifdef TARGET_OS_ARCH_linux_ppc # include "orderAccess_linux_ppc.inline.hpp" @@ -27165,8 +27165,8 @@ // no precompiled headers diff -Nru openjdk.orig/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp openjdk/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp ---- openjdk.orig/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2012-07-25 15:09:16.224836961 +0100 +--- openjdk.orig/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2013-04-08 01:49:33.622322133 +0100 @@ -92,7 +92,7 @@ // the incoming method. We could lose a line of trace output. // This is acceptable in a debug-only feature. @@ -27186,8 +27186,8 @@ st->print("%8d %4d " INTPTR_FORMAT " " INTPTR_FORMAT " %s", BytecodeCounter::counter_value(), bci, tos, tos2, Bytecodes::name(code)); diff -Nru openjdk.orig/hotspot/src/share/vm/interpreter/interpreterRuntime.hpp openjdk/hotspot/src/share/vm/interpreter/interpreterRuntime.hpp ---- openjdk.orig/hotspot/src/share/vm/interpreter/interpreterRuntime.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/interpreterRuntime.hpp 2012-07-25 15:09:16.224836961 +0100 +--- openjdk.orig/hotspot/src/share/vm/interpreter/interpreterRuntime.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/interpreter/interpreterRuntime.hpp 2013-04-08 01:49:33.622322133 +0100 @@ -41,6 +41,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -27199,8 +27199,8 @@ // The InterpreterRuntime is called by the interpreter for everything // that cannot/should not be dealt with in assembly and needs C support. diff -Nru openjdk.orig/hotspot/src/share/vm/interpreter/linkResolver.cpp openjdk/hotspot/src/share/vm/interpreter/linkResolver.cpp ---- openjdk.orig/hotspot/src/share/vm/interpreter/linkResolver.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/linkResolver.cpp 2012-07-25 15:09:16.224836961 +0100 +--- openjdk.orig/hotspot/src/share/vm/interpreter/linkResolver.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/interpreter/linkResolver.cpp 2013-04-08 01:49:33.622322133 +0100 @@ -52,6 +52,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -27212,8 +27212,8 @@ //------------------------------------------------------------------------------------------------------------------------ // Implementation of FieldAccessInfo diff -Nru openjdk.orig/hotspot/src/share/vm/memory/allocation.cpp openjdk/hotspot/src/share/vm/memory/allocation.cpp ---- openjdk.orig/hotspot/src/share/vm/memory/allocation.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/allocation.cpp 2012-07-25 15:09:16.224836961 +0100 +--- openjdk.orig/hotspot/src/share/vm/memory/allocation.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/memory/allocation.cpp 2013-04-08 01:49:33.622322133 +0100 @@ -39,6 +39,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "os_windows.inline.hpp" @@ -27225,8 +27225,8 @@ void* CHeapObj::operator new(size_t size){ return (void *) AllocateHeap(size, "CHeapObj-new"); diff -Nru openjdk.orig/hotspot/src/share/vm/memory/collectorPolicy.cpp openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp ---- openjdk.orig/hotspot/src/share/vm/memory/collectorPolicy.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp 2012-07-25 15:09:16.224836961 +0100 +--- openjdk.orig/hotspot/src/share/vm/memory/collectorPolicy.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp 2013-04-08 01:49:33.622322133 +0100 @@ -47,6 +47,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -27238,8 +27238,8 @@ #include "gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp" #include "gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.hpp" diff -Nru openjdk.orig/hotspot/src/share/vm/memory/defNewGeneration.cpp openjdk/hotspot/src/share/vm/memory/defNewGeneration.cpp ---- openjdk.orig/hotspot/src/share/vm/memory/defNewGeneration.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/defNewGeneration.cpp 2012-07-25 15:09:16.224836961 +0100 +--- openjdk.orig/hotspot/src/share/vm/memory/defNewGeneration.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/memory/defNewGeneration.cpp 2013-04-08 01:49:33.622322133 +0100 @@ -48,6 +48,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -27251,8 +27251,8 @@ // // DefNewGeneration functions. diff -Nru openjdk.orig/hotspot/src/share/vm/memory/gcLocker.hpp openjdk/hotspot/src/share/vm/memory/gcLocker.hpp ---- openjdk.orig/hotspot/src/share/vm/memory/gcLocker.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/gcLocker.hpp 2012-07-25 15:09:16.224836961 +0100 +--- openjdk.orig/hotspot/src/share/vm/memory/gcLocker.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/memory/gcLocker.hpp 2013-04-08 01:49:33.622322133 +0100 @@ -41,6 +41,10 @@ # include "os_windows.inline.hpp" # include "thread_windows.inline.hpp" @@ -27265,8 +27265,8 @@ // The direct lock/unlock calls do not force a collection if an unlock // decrements the count to zero. Avoid calling these if at all possible. diff -Nru openjdk.orig/hotspot/src/share/vm/memory/genMarkSweep.cpp openjdk/hotspot/src/share/vm/memory/genMarkSweep.cpp ---- openjdk.orig/hotspot/src/share/vm/memory/genMarkSweep.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/genMarkSweep.cpp 2012-07-25 15:09:16.224836961 +0100 +--- openjdk.orig/hotspot/src/share/vm/memory/genMarkSweep.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/memory/genMarkSweep.cpp 2013-04-08 01:49:33.622322133 +0100 @@ -55,6 +55,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -27278,8 +27278,8 @@ void GenMarkSweep::invoke_at_safepoint(int level, ReferenceProcessor* rp, bool clear_all_softrefs) { diff -Nru openjdk.orig/hotspot/src/share/vm/memory/resourceArea.cpp openjdk/hotspot/src/share/vm/memory/resourceArea.cpp ---- openjdk.orig/hotspot/src/share/vm/memory/resourceArea.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/resourceArea.cpp 2012-07-25 15:09:16.224836961 +0100 +--- openjdk.orig/hotspot/src/share/vm/memory/resourceArea.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/memory/resourceArea.cpp 2013-04-08 01:49:33.622322133 +0100 @@ -35,6 +35,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -27291,8 +27291,8 @@ //------------------------------ResourceMark----------------------------------- debug_only(int ResourceArea::_warned;) // to suppress multiple warnings diff -Nru openjdk.orig/hotspot/src/share/vm/memory/resourceArea.hpp openjdk/hotspot/src/share/vm/memory/resourceArea.hpp ---- openjdk.orig/hotspot/src/share/vm/memory/resourceArea.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/resourceArea.hpp 2012-07-25 15:09:16.228837026 +0100 +--- openjdk.orig/hotspot/src/share/vm/memory/resourceArea.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/memory/resourceArea.hpp 2013-04-08 01:49:33.622322133 +0100 @@ -35,6 +35,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -27304,8 +27304,8 @@ // The resource area holds temporary data structures in the VM. // The actual allocation areas are thread local. Typical usage: diff -Nru openjdk.orig/hotspot/src/share/vm/memory/space.hpp openjdk/hotspot/src/share/vm/memory/space.hpp ---- openjdk.orig/hotspot/src/share/vm/memory/space.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/space.hpp 2012-07-25 15:09:16.228837026 +0100 +--- openjdk.orig/hotspot/src/share/vm/memory/space.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/memory/space.hpp 2013-04-08 01:49:33.622322133 +0100 @@ -44,6 +44,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "os_windows.inline.hpp" @@ -27317,8 +27317,8 @@ // A space is an abstraction for the "storage units" backing // up the generation abstraction. It includes specific diff -Nru openjdk.orig/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp ---- openjdk.orig/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp 2012-07-25 15:09:16.228837026 +0100 +--- openjdk.orig/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp 2013-04-08 01:49:33.622322133 +0100 @@ -38,6 +38,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -27330,8 +27330,8 @@ // Thread-Local Edens support diff -Nru openjdk.orig/hotspot/src/share/vm/memory/universe.cpp openjdk/hotspot/src/share/vm/memory/universe.cpp ---- openjdk.orig/hotspot/src/share/vm/memory/universe.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/universe.cpp 2012-07-25 15:09:16.228837026 +0100 +--- openjdk.orig/hotspot/src/share/vm/memory/universe.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/memory/universe.cpp 2013-04-08 01:49:33.626322198 +0100 @@ -89,6 +89,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -27343,8 +27343,8 @@ #include "gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp" #include "gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.hpp" diff -Nru openjdk.orig/hotspot/src/share/vm/oops/constantPoolKlass.cpp openjdk/hotspot/src/share/vm/oops/constantPoolKlass.cpp ---- openjdk.orig/hotspot/src/share/vm/oops/constantPoolKlass.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/constantPoolKlass.cpp 2012-07-25 15:09:16.228837026 +0100 +--- openjdk.orig/hotspot/src/share/vm/oops/constantPoolKlass.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/oops/constantPoolKlass.cpp 2013-04-08 01:49:33.626322198 +0100 @@ -44,6 +44,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -27356,8 +27356,8 @@ #include "gc_implementation/parNew/parOopClosures.inline.hpp" #include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp" diff -Nru openjdk.orig/hotspot/src/share/vm/oops/constantPoolOop.cpp openjdk/hotspot/src/share/vm/oops/constantPoolOop.cpp ---- openjdk.orig/hotspot/src/share/vm/oops/constantPoolOop.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/constantPoolOop.cpp 2012-07-25 15:09:16.228837026 +0100 +--- openjdk.orig/hotspot/src/share/vm/oops/constantPoolOop.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/oops/constantPoolOop.cpp 2013-04-08 01:49:33.626322198 +0100 @@ -1355,7 +1355,7 @@ } case JVM_CONSTANT_Long: { @@ -27368,8 +27368,8 @@ idx++; // Long takes two cpool slots break; diff -Nru openjdk.orig/hotspot/src/share/vm/oops/instanceKlass.cpp openjdk/hotspot/src/share/vm/oops/instanceKlass.cpp ---- openjdk.orig/hotspot/src/share/vm/oops/instanceKlass.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/instanceKlass.cpp 2012-07-25 15:09:16.228837026 +0100 +--- openjdk.orig/hotspot/src/share/vm/oops/instanceKlass.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/oops/instanceKlass.cpp 2013-04-08 01:49:33.626322198 +0100 @@ -61,6 +61,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -27381,8 +27381,8 @@ #include "gc_implementation/g1/g1CollectedHeap.inline.hpp" #include "gc_implementation/g1/g1OopClosures.inline.hpp" diff -Nru openjdk.orig/hotspot/src/share/vm/oops/markOop.cpp openjdk/hotspot/src/share/vm/oops/markOop.cpp ---- openjdk.orig/hotspot/src/share/vm/oops/markOop.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/markOop.cpp 2012-07-25 15:09:16.228837026 +0100 +--- openjdk.orig/hotspot/src/share/vm/oops/markOop.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/oops/markOop.cpp 2013-04-08 01:49:33.626322198 +0100 @@ -33,6 +33,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -27394,8 +27394,8 @@ void markOopDesc::print_on(outputStream* st) const { diff -Nru openjdk.orig/hotspot/src/share/vm/oops/oop.cpp openjdk/hotspot/src/share/vm/oops/oop.cpp ---- openjdk.orig/hotspot/src/share/vm/oops/oop.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/oop.cpp 2012-07-25 15:09:16.228837026 +0100 +--- openjdk.orig/hotspot/src/share/vm/oops/oop.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/oops/oop.cpp 2013-04-08 01:49:33.626322198 +0100 @@ -36,6 +36,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -27407,8 +27407,8 @@ bool always_do_update_barrier = false; diff -Nru openjdk.orig/hotspot/src/share/vm/oops/oopsHierarchy.cpp openjdk/hotspot/src/share/vm/oops/oopsHierarchy.cpp ---- openjdk.orig/hotspot/src/share/vm/oops/oopsHierarchy.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/oopsHierarchy.cpp 2012-07-25 15:09:16.228837026 +0100 +--- openjdk.orig/hotspot/src/share/vm/oops/oopsHierarchy.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/oops/oopsHierarchy.cpp 2013-04-08 01:49:33.626322198 +0100 @@ -37,6 +37,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -27420,8 +27420,8 @@ #ifdef CHECK_UNHANDLED_OOPS diff -Nru openjdk.orig/hotspot/src/share/vm/oops/typeArrayOop.hpp openjdk/hotspot/src/share/vm/oops/typeArrayOop.hpp ---- openjdk.orig/hotspot/src/share/vm/oops/typeArrayOop.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/typeArrayOop.hpp 2012-07-25 15:09:16.228837026 +0100 +--- openjdk.orig/hotspot/src/share/vm/oops/typeArrayOop.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/oops/typeArrayOop.hpp 2013-04-08 01:49:33.626322198 +0100 @@ -51,6 +51,12 @@ #ifdef TARGET_OS_ARCH_linux_ppc # include "orderAccess_linux_ppc.inline.hpp" @@ -27436,8 +27436,8 @@ // A typeArrayOop is an array containing basic types (non oop elements). // It is used for arrays of {characters, singles, doubles, bytes, shorts, integers, longs} diff -Nru openjdk.orig/hotspot/src/share/vm/opto/c2_globals.hpp openjdk/hotspot/src/share/vm/opto/c2_globals.hpp ---- openjdk.orig/hotspot/src/share/vm/opto/c2_globals.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/c2_globals.hpp 2012-07-25 15:09:16.228837026 +0100 +--- openjdk.orig/hotspot/src/share/vm/opto/c2_globals.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/opto/c2_globals.hpp 2013-04-08 01:49:33.626322198 +0100 @@ -44,6 +44,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "c2_globals_windows.hpp" @@ -27449,8 +27449,8 @@ // // Defines all globals flags used by the server compiler. diff -Nru openjdk.orig/hotspot/src/share/vm/prims/forte.cpp openjdk/hotspot/src/share/vm/prims/forte.cpp ---- openjdk.orig/hotspot/src/share/vm/prims/forte.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/forte.cpp 2012-07-25 15:09:16.228837026 +0100 +--- openjdk.orig/hotspot/src/share/vm/prims/forte.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/prims/forte.cpp 2013-04-08 01:49:33.630322263 +0100 @@ -621,6 +621,11 @@ // Method to let libcollector know about a dynamically loaded function. // Because it is weakly bound, the calls become NOP's when the library @@ -27472,9 +27472,9 @@ } // end extern "C" diff -Nru openjdk.orig/hotspot/src/share/vm/prims/jni.cpp openjdk/hotspot/src/share/vm/prims/jni.cpp ---- openjdk.orig/hotspot/src/share/vm/prims/jni.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jni.cpp 2012-07-25 15:09:16.228837026 +0100 -@@ -82,6 +82,10 @@ +--- openjdk.orig/hotspot/src/share/vm/prims/jni.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/prims/jni.cpp 2013-04-08 01:49:33.630322263 +0100 +@@ -83,6 +83,10 @@ # include "os_windows.inline.hpp" # include "thread_windows.inline.hpp" #endif @@ -27486,8 +27486,8 @@ static jint CurrentVersion = JNI_VERSION_1_6; diff -Nru openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp openjdk/hotspot/src/share/vm/prims/jvm.cpp ---- openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvm.cpp 2012-07-25 15:09:16.232837090 +0100 +--- openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/prims/jvm.cpp 2013-04-08 01:49:33.630322263 +0100 @@ -73,6 +73,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "jvm_windows.h" @@ -27499,8 +27499,8 @@ #include <errno.h> diff -Nru openjdk.orig/hotspot/src/share/vm/prims/jvm.h openjdk/hotspot/src/share/vm/prims/jvm.h ---- openjdk.orig/hotspot/src/share/vm/prims/jvm.h 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvm.h 2012-07-25 15:09:16.232837090 +0100 +--- openjdk.orig/hotspot/src/share/vm/prims/jvm.h 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/prims/jvm.h 2013-04-08 01:49:33.630322263 +0100 @@ -35,6 +35,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "jvm_windows.h" @@ -27512,8 +27512,8 @@ #ifndef _JAVASOFT_JVM_H_ #define _JAVASOFT_JVM_H_ diff -Nru openjdk.orig/hotspot/src/share/vm/prims/jvmtiEnv.cpp openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp ---- openjdk.orig/hotspot/src/share/vm/prims/jvmtiEnv.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp 2012-07-25 15:09:16.232837090 +0100 +--- openjdk.orig/hotspot/src/share/vm/prims/jvmtiEnv.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp 2013-04-08 01:49:33.630322263 +0100 @@ -68,6 +68,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -27525,8 +27525,8 @@ diff -Nru openjdk.orig/hotspot/src/share/vm/prims/jvmtiImpl.cpp openjdk/hotspot/src/share/vm/prims/jvmtiImpl.cpp ---- openjdk.orig/hotspot/src/share/vm/prims/jvmtiImpl.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiImpl.cpp 2012-07-25 15:09:16.232837090 +0100 +--- openjdk.orig/hotspot/src/share/vm/prims/jvmtiImpl.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/prims/jvmtiImpl.cpp 2013-04-08 01:49:33.630322263 +0100 @@ -54,6 +54,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -27538,8 +27538,8 @@ // // class JvmtiAgentThread diff -Nru openjdk.orig/hotspot/src/share/vm/prims/nativeLookup.cpp openjdk/hotspot/src/share/vm/prims/nativeLookup.cpp ---- openjdk.orig/hotspot/src/share/vm/prims/nativeLookup.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/nativeLookup.cpp 2012-07-25 15:09:16.232837090 +0100 +--- openjdk.orig/hotspot/src/share/vm/prims/nativeLookup.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/prims/nativeLookup.cpp 2013-04-08 01:49:33.630322263 +0100 @@ -49,6 +49,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "os_windows.inline.hpp" @@ -27551,8 +27551,8 @@ static void mangle_name_on(outputStream* st, Symbol* name, int begin, int end) { diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp openjdk/hotspot/src/share/vm/runtime/arguments.cpp ---- openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp 2012-07-25 15:09:16.232837090 +0100 +--- openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp 2013-04-08 01:49:33.634322327 +0100 @@ -46,6 +46,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "os_windows.inline.hpp" @@ -27564,8 +27564,8 @@ #include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp" #endif diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/atomic.cpp openjdk/hotspot/src/share/vm/runtime/atomic.cpp ---- openjdk.orig/hotspot/src/share/vm/runtime/atomic.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/atomic.cpp 2012-07-25 15:09:16.232837090 +0100 +--- openjdk.orig/hotspot/src/share/vm/runtime/atomic.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/runtime/atomic.cpp 2013-04-08 01:49:33.634322327 +0100 @@ -33,6 +33,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "os_windows.inline.hpp" @@ -27590,8 +27590,8 @@ jbyte Atomic::cmpxchg(jbyte exchange_value, volatile jbyte* dest, jbyte compare_value) { assert(sizeof(jbyte) == 1, "assumption."); diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/fprofiler.hpp openjdk/hotspot/src/share/vm/runtime/fprofiler.hpp ---- openjdk.orig/hotspot/src/share/vm/runtime/fprofiler.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/fprofiler.hpp 2012-07-25 15:09:16.232837090 +0100 +--- openjdk.orig/hotspot/src/share/vm/runtime/fprofiler.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/runtime/fprofiler.hpp 2013-04-08 01:49:33.634322327 +0100 @@ -35,6 +35,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -27603,8 +27603,8 @@ // a simple flat profiler for Java diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/globals.hpp openjdk/hotspot/src/share/vm/runtime/globals.hpp ---- openjdk.orig/hotspot/src/share/vm/runtime/globals.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/globals.hpp 2012-07-25 15:09:16.232837090 +0100 +--- openjdk.orig/hotspot/src/share/vm/runtime/globals.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/runtime/globals.hpp 2013-04-08 01:49:33.634322327 +0100 @@ -50,6 +50,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "globals_windows.hpp" @@ -27649,8 +27649,8 @@ #ifdef SHARK #ifdef TARGET_ARCH_zero diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/handles.cpp openjdk/hotspot/src/share/vm/runtime/handles.cpp ---- openjdk.orig/hotspot/src/share/vm/runtime/handles.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/handles.cpp 2012-07-25 15:09:16.232837090 +0100 +--- openjdk.orig/hotspot/src/share/vm/runtime/handles.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/runtime/handles.cpp 2013-04-08 01:49:33.634322327 +0100 @@ -38,6 +38,10 @@ # include "os_windows.inline.hpp" # include "thread_windows.inline.hpp" @@ -27663,8 +27663,8 @@ #ifdef ASSERT oop* HandleArea::allocate_handle(oop obj) { diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/handles.inline.hpp openjdk/hotspot/src/share/vm/runtime/handles.inline.hpp ---- openjdk.orig/hotspot/src/share/vm/runtime/handles.inline.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/handles.inline.hpp 2012-07-25 15:09:16.232837090 +0100 +--- openjdk.orig/hotspot/src/share/vm/runtime/handles.inline.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/runtime/handles.inline.hpp 2013-04-08 01:49:33.634322327 +0100 @@ -35,6 +35,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -27676,8 +27676,8 @@ // these inline functions are in a separate file to break an include cycle // between Thread and Handle diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/interfaceSupport.hpp openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp ---- openjdk.orig/hotspot/src/share/vm/runtime/interfaceSupport.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp 2012-07-25 15:09:16.236837152 +0100 +--- openjdk.orig/hotspot/src/share/vm/runtime/interfaceSupport.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp 2013-04-08 01:49:33.634322327 +0100 @@ -44,6 +44,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -27699,8 +27699,8 @@ }; diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/javaCalls.cpp openjdk/hotspot/src/share/vm/runtime/javaCalls.cpp ---- openjdk.orig/hotspot/src/share/vm/runtime/javaCalls.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/javaCalls.cpp 2012-07-25 15:09:16.236837152 +0100 +--- openjdk.orig/hotspot/src/share/vm/runtime/javaCalls.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/runtime/javaCalls.cpp 2013-04-08 01:49:33.638322390 +0100 @@ -48,6 +48,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -27717,8 +27717,8 @@ } - diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/javaCalls.hpp openjdk/hotspot/src/share/vm/runtime/javaCalls.hpp ---- openjdk.orig/hotspot/src/share/vm/runtime/javaCalls.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/javaCalls.hpp 2012-07-25 15:09:16.236837152 +0100 +--- openjdk.orig/hotspot/src/share/vm/runtime/javaCalls.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/runtime/javaCalls.hpp 2013-04-08 01:49:33.638322390 +0100 @@ -54,6 +54,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -27730,8 +27730,8 @@ // A JavaCallWrapper is constructed before each JavaCall and destructed after the call. // Its purpose is to allocate/deallocate a new handle block and to save/restore the last diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/java.cpp openjdk/hotspot/src/share/vm/runtime/java.cpp ---- openjdk.orig/hotspot/src/share/vm/runtime/java.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/java.cpp 2012-07-25 15:09:16.236837152 +0100 +--- openjdk.orig/hotspot/src/share/vm/runtime/java.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/runtime/java.cpp 2013-04-08 01:49:33.638322390 +0100 @@ -85,6 +85,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -27743,8 +27743,8 @@ #include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp" #include "gc_implementation/parallelScavenge/psScavenge.hpp" diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/javaFrameAnchor.hpp openjdk/hotspot/src/share/vm/runtime/javaFrameAnchor.hpp ---- openjdk.orig/hotspot/src/share/vm/runtime/javaFrameAnchor.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/javaFrameAnchor.hpp 2012-07-25 15:09:16.236837152 +0100 +--- openjdk.orig/hotspot/src/share/vm/runtime/javaFrameAnchor.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/runtime/javaFrameAnchor.hpp 2013-04-08 01:49:33.638322390 +0100 @@ -50,6 +50,13 @@ #ifdef TARGET_OS_ARCH_linux_ppc # include "orderAccess_linux_ppc.inline.hpp" @@ -27760,8 +27760,8 @@ // An object for encapsulating the machine/os dependent part of a JavaThread frame state // diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/jniHandles.cpp openjdk/hotspot/src/share/vm/runtime/jniHandles.cpp ---- openjdk.orig/hotspot/src/share/vm/runtime/jniHandles.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/jniHandles.cpp 2012-07-25 15:09:16.236837152 +0100 +--- openjdk.orig/hotspot/src/share/vm/runtime/jniHandles.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/runtime/jniHandles.cpp 2013-04-08 01:49:33.638322390 +0100 @@ -37,6 +37,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -27773,8 +27773,8 @@ JNIHandleBlock* JNIHandles::_global_handles = NULL; diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/memprofiler.cpp openjdk/hotspot/src/share/vm/runtime/memprofiler.cpp ---- openjdk.orig/hotspot/src/share/vm/runtime/memprofiler.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/memprofiler.cpp 2012-07-25 15:09:16.236837152 +0100 +--- openjdk.orig/hotspot/src/share/vm/runtime/memprofiler.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/runtime/memprofiler.cpp 2013-04-08 01:49:33.638322390 +0100 @@ -46,6 +46,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -27786,8 +27786,8 @@ #ifndef PRODUCT diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/mutex.cpp openjdk/hotspot/src/share/vm/runtime/mutex.cpp ---- openjdk.orig/hotspot/src/share/vm/runtime/mutex.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/mutex.cpp 2012-07-25 15:09:16.236837152 +0100 +--- openjdk.orig/hotspot/src/share/vm/runtime/mutex.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/runtime/mutex.cpp 2013-04-08 01:49:33.638322390 +0100 @@ -39,6 +39,10 @@ # include "mutex_windows.inline.hpp" # include "thread_windows.inline.hpp" @@ -27800,8 +27800,8 @@ // o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o // diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/mutexLocker.cpp openjdk/hotspot/src/share/vm/runtime/mutexLocker.cpp ---- openjdk.orig/hotspot/src/share/vm/runtime/mutexLocker.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/mutexLocker.cpp 2012-07-25 15:09:16.236837152 +0100 +--- openjdk.orig/hotspot/src/share/vm/runtime/mutexLocker.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/runtime/mutexLocker.cpp 2013-04-08 01:49:33.638322390 +0100 @@ -36,6 +36,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -27813,8 +27813,8 @@ // Mutexes used in the VM (see comment in mutexLocker.hpp): // diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/mutexLocker.hpp openjdk/hotspot/src/share/vm/runtime/mutexLocker.hpp ---- openjdk.orig/hotspot/src/share/vm/runtime/mutexLocker.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/mutexLocker.hpp 2012-07-25 15:09:16.236837152 +0100 +--- openjdk.orig/hotspot/src/share/vm/runtime/mutexLocker.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/runtime/mutexLocker.hpp 2013-04-08 01:49:33.638322390 +0100 @@ -36,6 +36,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "os_windows.inline.hpp" @@ -27826,8 +27826,8 @@ // Mutexes used in the VM. diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/objectMonitor.cpp openjdk/hotspot/src/share/vm/runtime/objectMonitor.cpp ---- openjdk.orig/hotspot/src/share/vm/runtime/objectMonitor.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/objectMonitor.cpp 2012-07-25 15:09:16.236837152 +0100 +--- openjdk.orig/hotspot/src/share/vm/runtime/objectMonitor.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/runtime/objectMonitor.cpp 2013-04-08 01:49:33.638322390 +0100 @@ -50,6 +50,10 @@ # include "os_windows.inline.hpp" # include "thread_windows.inline.hpp" @@ -27840,8 +27840,8 @@ #if defined(__GNUC__) && !defined(IA64) // Need to inhibit inlining for older versions of GCC to avoid build-time failures diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/os.cpp openjdk/hotspot/src/share/vm/runtime/os.cpp ---- openjdk.orig/hotspot/src/share/vm/runtime/os.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/os.cpp 2012-07-25 15:09:16.236837152 +0100 +--- openjdk.orig/hotspot/src/share/vm/runtime/os.cpp 2013-04-08 01:48:11.805006641 +0100 ++++ openjdk/hotspot/src/share/vm/runtime/os.cpp 2013-04-08 01:49:33.642322455 +0100 @@ -60,6 +60,10 @@ # include "os_windows.inline.hpp" # include "thread_windows.inline.hpp" @@ -27880,8 +27880,8 @@ static jboolean onLoaded = JNI_FALSE; if (onLoaded) { diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/os.hpp openjdk/hotspot/src/share/vm/runtime/os.hpp ---- openjdk.orig/hotspot/src/share/vm/runtime/os.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/os.hpp 2012-07-25 15:09:16.236837152 +0100 +--- openjdk.orig/hotspot/src/share/vm/runtime/os.hpp 2013-04-08 01:48:11.805006641 +0100 ++++ openjdk/hotspot/src/share/vm/runtime/os.hpp 2013-04-08 01:49:33.642322455 +0100 @@ -39,6 +39,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "jvm_windows.h" @@ -27892,7 +27892,7 @@ // os defines the interface to operating system; this includes traditional // OS services (time, I/O) as well as other functionality with system- -@@ -675,6 +678,9 @@ +@@ -671,6 +674,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "os_windows.hpp" #endif @@ -27902,7 +27902,7 @@ #ifdef TARGET_OS_ARCH_linux_x86 # include "os_linux_x86.hpp" #endif -@@ -699,6 +705,12 @@ +@@ -695,6 +701,12 @@ #ifdef TARGET_OS_ARCH_linux_ppc # include "os_linux_ppc.hpp" #endif @@ -27916,8 +27916,8 @@ // debugging support (mostly used by debug.cpp but also fatal error handler) diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/osThread.hpp openjdk/hotspot/src/share/vm/runtime/osThread.hpp ---- openjdk.orig/hotspot/src/share/vm/runtime/osThread.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/osThread.hpp 2012-07-25 15:09:16.236837152 +0100 +--- openjdk.orig/hotspot/src/share/vm/runtime/osThread.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/runtime/osThread.hpp 2013-04-08 01:49:33.642322455 +0100 @@ -109,6 +109,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "osThread_windows.hpp" @@ -27929,9 +27929,9 @@ }; diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/safepoint.cpp openjdk/hotspot/src/share/vm/runtime/safepoint.cpp ---- openjdk.orig/hotspot/src/share/vm/runtime/safepoint.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/safepoint.cpp 2012-07-25 15:09:16.236837152 +0100 -@@ -78,6 +78,9 @@ +--- openjdk.orig/hotspot/src/share/vm/runtime/safepoint.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/runtime/safepoint.cpp 2013-04-08 01:49:33.642322455 +0100 +@@ -79,6 +79,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" #endif @@ -27942,8 +27942,8 @@ #include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp" #include "gc_implementation/shared/concurrentGCThread.hpp" diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/synchronizer.cpp openjdk/hotspot/src/share/vm/runtime/synchronizer.cpp ---- openjdk.orig/hotspot/src/share/vm/runtime/synchronizer.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/synchronizer.cpp 2012-07-25 15:09:16.236837152 +0100 +--- openjdk.orig/hotspot/src/share/vm/runtime/synchronizer.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/runtime/synchronizer.cpp 2013-04-08 01:49:33.642322455 +0100 @@ -51,6 +51,10 @@ # include "os_windows.inline.hpp" # include "thread_windows.inline.hpp" @@ -27956,8 +27956,8 @@ #if defined(__GNUC__) && !defined(IA64) // Need to inhibit inlining for older versions of GCC to avoid build-time failures diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/task.cpp openjdk/hotspot/src/share/vm/runtime/task.cpp ---- openjdk.orig/hotspot/src/share/vm/runtime/task.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/task.cpp 2012-07-25 15:09:16.236837152 +0100 +--- openjdk.orig/hotspot/src/share/vm/runtime/task.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/runtime/task.cpp 2013-04-08 01:49:33.642322455 +0100 @@ -39,6 +39,10 @@ # include "os_windows.inline.hpp" # include "thread_windows.inline.hpp" @@ -27970,8 +27970,8 @@ int PeriodicTask::_num_tasks = 0; PeriodicTask* PeriodicTask::_tasks[PeriodicTask::max_tasks]; diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/thread.cpp openjdk/hotspot/src/share/vm/runtime/thread.cpp ---- openjdk.orig/hotspot/src/share/vm/runtime/thread.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/thread.cpp 2012-07-25 15:09:16.240837216 +0100 +--- openjdk.orig/hotspot/src/share/vm/runtime/thread.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/runtime/thread.cpp 2013-04-08 01:49:33.642322455 +0100 @@ -89,6 +89,10 @@ # include "os_windows.inline.hpp" # include "thread_windows.inline.hpp" @@ -27984,8 +27984,8 @@ #include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp" #include "gc_implementation/g1/concurrentMarkThread.inline.hpp" diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/thread.hpp openjdk/hotspot/src/share/vm/runtime/thread.hpp ---- openjdk.orig/hotspot/src/share/vm/runtime/thread.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/thread.hpp 2012-07-25 15:09:16.240837216 +0100 +--- openjdk.orig/hotspot/src/share/vm/runtime/thread.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/runtime/thread.hpp 2013-04-08 01:49:33.646322519 +0100 @@ -1607,6 +1607,12 @@ #ifdef TARGET_OS_ARCH_linux_ppc # include "thread_linux_ppc.hpp" @@ -28000,8 +28000,8 @@ public: diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/threadLocalStorage.cpp openjdk/hotspot/src/share/vm/runtime/threadLocalStorage.cpp ---- openjdk.orig/hotspot/src/share/vm/runtime/threadLocalStorage.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/threadLocalStorage.cpp 2012-07-25 15:09:16.240837216 +0100 +--- openjdk.orig/hotspot/src/share/vm/runtime/threadLocalStorage.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/runtime/threadLocalStorage.cpp 2013-04-08 01:49:33.646322519 +0100 @@ -36,6 +36,10 @@ # include "os_windows.inline.hpp" # include "thread_windows.inline.hpp" @@ -28014,8 +28014,8 @@ // static member initialization int ThreadLocalStorage::_thread_index = -1; diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/threadLocalStorage.hpp openjdk/hotspot/src/share/vm/runtime/threadLocalStorage.hpp ---- openjdk.orig/hotspot/src/share/vm/runtime/threadLocalStorage.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/threadLocalStorage.hpp 2012-07-25 15:09:16.240837216 +0100 +--- openjdk.orig/hotspot/src/share/vm/runtime/threadLocalStorage.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/runtime/threadLocalStorage.hpp 2013-04-08 01:49:33.646322519 +0100 @@ -68,6 +68,12 @@ #ifdef TARGET_OS_ARCH_linux_ppc # include "threadLS_linux_ppc.hpp" @@ -28030,8 +28030,8 @@ public: diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/timer.cpp openjdk/hotspot/src/share/vm/runtime/timer.cpp ---- openjdk.orig/hotspot/src/share/vm/runtime/timer.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/timer.cpp 2012-07-25 15:09:16.240837216 +0100 +--- openjdk.orig/hotspot/src/share/vm/runtime/timer.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/runtime/timer.cpp 2013-04-08 01:49:33.646322519 +0100 @@ -35,6 +35,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "os_windows.inline.hpp" @@ -28043,8 +28043,8 @@ void elapsedTimer::add(elapsedTimer t) { diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/virtualspace.cpp openjdk/hotspot/src/share/vm/runtime/virtualspace.cpp ---- openjdk.orig/hotspot/src/share/vm/runtime/virtualspace.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/virtualspace.cpp 2012-07-25 15:09:16.240837216 +0100 +--- openjdk.orig/hotspot/src/share/vm/runtime/virtualspace.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/runtime/virtualspace.cpp 2013-04-08 01:49:33.646322519 +0100 @@ -35,6 +35,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "os_windows.inline.hpp" @@ -28056,8 +28056,8 @@ // ReservedSpace diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/vm_operations.cpp openjdk/hotspot/src/share/vm/runtime/vm_operations.cpp ---- openjdk.orig/hotspot/src/share/vm/runtime/vm_operations.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/vm_operations.cpp 2012-07-25 15:09:16.240837216 +0100 +--- openjdk.orig/hotspot/src/share/vm/runtime/vm_operations.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/runtime/vm_operations.cpp 2013-04-08 01:49:33.646322519 +0100 @@ -45,6 +45,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -28069,8 +28069,8 @@ #define VM_OP_NAME_INITIALIZE(name) #name, diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/vmStructs.cpp openjdk/hotspot/src/share/vm/runtime/vmStructs.cpp ---- openjdk.orig/hotspot/src/share/vm/runtime/vmStructs.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/vmStructs.cpp 2012-07-25 15:09:16.240837216 +0100 +--- openjdk.orig/hotspot/src/share/vm/runtime/vmStructs.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/runtime/vmStructs.cpp 2013-04-08 01:49:33.646322519 +0100 @@ -133,6 +133,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -28095,8 +28095,8 @@ #include "gc_implementation/concurrentMarkSweep/cmsPermGen.hpp" #include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp" diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/vmThread.cpp openjdk/hotspot/src/share/vm/runtime/vmThread.cpp ---- openjdk.orig/hotspot/src/share/vm/runtime/vmThread.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/vmThread.cpp 2012-07-25 15:09:16.240837216 +0100 +--- openjdk.orig/hotspot/src/share/vm/runtime/vmThread.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/runtime/vmThread.cpp 2013-04-08 01:49:33.646322519 +0100 @@ -46,6 +46,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -28108,8 +28108,8 @@ HS_DTRACE_PROBE_DECL3(hotspot, vmops__request, char *, uintptr_t, int); HS_DTRACE_PROBE_DECL3(hotspot, vmops__begin, char *, uintptr_t, int); diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/vmThread.hpp openjdk/hotspot/src/share/vm/runtime/vmThread.hpp ---- openjdk.orig/hotspot/src/share/vm/runtime/vmThread.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/vmThread.hpp 2012-07-25 15:09:16.240837216 +0100 +--- openjdk.orig/hotspot/src/share/vm/runtime/vmThread.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/runtime/vmThread.hpp 2013-04-08 01:49:33.650322584 +0100 @@ -36,6 +36,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -28121,8 +28121,8 @@ // // Prioritized queue of VM operations. diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp openjdk/hotspot/src/share/vm/runtime/vm_version.cpp ---- openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2012-07-25 15:09:16.240837216 +0100 +--- openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2013-04-08 01:49:33.650322584 +0100 @@ -167,7 +167,8 @@ #define OS LINUX_ONLY("linux") \ @@ -28134,8 +28134,8 @@ #ifdef ZERO #define CPU ZERO_LIBARCH diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/accessFlags.cpp openjdk/hotspot/src/share/vm/utilities/accessFlags.cpp ---- openjdk.orig/hotspot/src/share/vm/utilities/accessFlags.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/accessFlags.cpp 2012-07-25 15:09:16.240837216 +0100 +--- openjdk.orig/hotspot/src/share/vm/utilities/accessFlags.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/utilities/accessFlags.cpp 2013-04-08 01:49:33.650322584 +0100 @@ -34,6 +34,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "os_windows.inline.hpp" @@ -28147,8 +28147,8 @@ void AccessFlags::atomic_set_bits(jint bits) { diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/array.cpp openjdk/hotspot/src/share/vm/utilities/array.cpp ---- openjdk.orig/hotspot/src/share/vm/utilities/array.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/array.cpp 2012-07-25 15:09:16.240837216 +0100 +--- openjdk.orig/hotspot/src/share/vm/utilities/array.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/utilities/array.cpp 2013-04-08 01:49:33.650322584 +0100 @@ -34,6 +34,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -28160,8 +28160,8 @@ #ifdef ASSERT diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/bitMap.cpp openjdk/hotspot/src/share/vm/utilities/bitMap.cpp ---- openjdk.orig/hotspot/src/share/vm/utilities/bitMap.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/bitMap.cpp 2012-07-25 15:09:16.240837216 +0100 +--- openjdk.orig/hotspot/src/share/vm/utilities/bitMap.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/utilities/bitMap.cpp 2013-04-08 01:49:33.650322584 +0100 @@ -35,6 +35,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "os_windows.inline.hpp" @@ -28173,8 +28173,8 @@ BitMap::BitMap(bm_word_t* map, idx_t size_in_bits) : diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/debug.cpp openjdk/hotspot/src/share/vm/utilities/debug.cpp ---- openjdk.orig/hotspot/src/share/vm/utilities/debug.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/debug.cpp 2012-07-25 15:09:16.240837216 +0100 +--- openjdk.orig/hotspot/src/share/vm/utilities/debug.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/utilities/debug.cpp 2013-04-08 01:49:33.650322584 +0100 @@ -62,6 +62,10 @@ # include "os_windows.inline.hpp" # include "thread_windows.inline.hpp" @@ -28187,8 +28187,8 @@ #ifndef ASSERT # ifdef _DEBUG diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/decoder.cpp openjdk/hotspot/src/share/vm/utilities/decoder.cpp ---- openjdk.orig/hotspot/src/share/vm/utilities/decoder.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/decoder.cpp 2012-07-25 15:09:16.240837216 +0100 +--- openjdk.orig/hotspot/src/share/vm/utilities/decoder.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/utilities/decoder.cpp 2013-04-08 01:49:33.650322584 +0100 @@ -29,7 +29,7 @@ Decoder::decoder_status Decoder::_decoder_status = Decoder::no_error; bool Decoder::_initialized = false; @@ -28204,8 +28204,8 @@ #endif - diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/decoder.hpp openjdk/hotspot/src/share/vm/utilities/decoder.hpp ---- openjdk.orig/hotspot/src/share/vm/utilities/decoder.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/decoder.hpp 2012-07-25 15:09:16.240837216 +0100 +--- openjdk.orig/hotspot/src/share/vm/utilities/decoder.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/utilities/decoder.hpp 2013-04-08 01:49:33.650322584 +0100 @@ -38,6 +38,8 @@ typedef BOOL (WINAPI *pfn_SymGetSymFromAddr64)(HANDLE, DWORD64, PDWORD64, PIMAGEHLP_SYMBOL64); typedef DWORD (WINAPI *pfn_UndecorateSymbolName)(const char*, char*, DWORD, DWORD); @@ -28233,8 +28233,8 @@ static ElfFile* _opened_elf_files; #endif // _WINDOWS diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/elfFile.cpp openjdk/hotspot/src/share/vm/utilities/elfFile.cpp ---- openjdk.orig/hotspot/src/share/vm/utilities/elfFile.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/elfFile.cpp 2012-07-25 15:09:16.244837282 +0100 +--- openjdk.orig/hotspot/src/share/vm/utilities/elfFile.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/utilities/elfFile.cpp 2013-04-08 01:49:33.650322584 +0100 @@ -24,7 +24,7 @@ #include "precompiled.hpp" @@ -28245,8 +28245,8 @@ #include <string.h> #include <stdio.h> diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/elfFile.hpp openjdk/hotspot/src/share/vm/utilities/elfFile.hpp ---- openjdk.orig/hotspot/src/share/vm/utilities/elfFile.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/elfFile.hpp 2012-07-25 15:09:16.244837282 +0100 +--- openjdk.orig/hotspot/src/share/vm/utilities/elfFile.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/utilities/elfFile.hpp 2013-04-08 01:49:33.650322584 +0100 @@ -25,9 +25,13 @@ #ifndef __ELF_FILE_HPP #define __ELF_FILE_HPP @@ -28289,8 +28289,8 @@ #endif // __ELF_FILE_HPP - diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/elfStringTable.cpp openjdk/hotspot/src/share/vm/utilities/elfStringTable.cpp ---- openjdk.orig/hotspot/src/share/vm/utilities/elfStringTable.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/elfStringTable.cpp 2012-07-25 15:09:16.244837282 +0100 +--- openjdk.orig/hotspot/src/share/vm/utilities/elfStringTable.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/utilities/elfStringTable.cpp 2013-04-08 01:49:33.650322584 +0100 @@ -24,7 +24,7 @@ #include "precompiled.hpp" @@ -28306,8 +28306,8 @@ #endif // _WINDOWS - diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/elfStringTable.hpp openjdk/hotspot/src/share/vm/utilities/elfStringTable.hpp ---- openjdk.orig/hotspot/src/share/vm/utilities/elfStringTable.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/elfStringTable.hpp 2012-07-25 15:09:16.244837282 +0100 +--- openjdk.orig/hotspot/src/share/vm/utilities/elfStringTable.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/utilities/elfStringTable.hpp 2013-04-08 01:49:33.650322584 +0100 @@ -25,7 +25,7 @@ #ifndef __ELF_STRING_TABLE_HPP #define __ELF_STRING_TABLE_HPP @@ -28323,8 +28323,8 @@ #endif // __ELF_STRING_TABLE_HPP - diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/elfSymbolTable.cpp openjdk/hotspot/src/share/vm/utilities/elfSymbolTable.cpp ---- openjdk.orig/hotspot/src/share/vm/utilities/elfSymbolTable.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/elfSymbolTable.cpp 2012-07-25 15:09:16.244837282 +0100 +--- openjdk.orig/hotspot/src/share/vm/utilities/elfSymbolTable.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/utilities/elfSymbolTable.cpp 2013-04-08 01:49:33.650322584 +0100 @@ -24,7 +24,7 @@ #include "precompiled.hpp" @@ -28335,8 +28335,8 @@ #include "memory/allocation.inline.hpp" #include "utilities/elfSymbolTable.hpp" diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/elfSymbolTable.hpp openjdk/hotspot/src/share/vm/utilities/elfSymbolTable.hpp ---- openjdk.orig/hotspot/src/share/vm/utilities/elfSymbolTable.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/elfSymbolTable.hpp 2012-07-25 15:09:16.244837282 +0100 +--- openjdk.orig/hotspot/src/share/vm/utilities/elfSymbolTable.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/utilities/elfSymbolTable.hpp 2013-04-08 01:49:33.650322584 +0100 @@ -25,7 +25,7 @@ #ifndef __ELF_SYMBOL_TABLE_HPP #define __ELF_SYMBOL_TABLE_HPP @@ -28354,8 +28354,8 @@ - - diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/events.cpp openjdk/hotspot/src/share/vm/utilities/events.cpp ---- openjdk.orig/hotspot/src/share/vm/utilities/events.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/events.cpp 2012-07-25 15:09:16.244837282 +0100 +--- openjdk.orig/hotspot/src/share/vm/utilities/events.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/utilities/events.cpp 2013-04-08 01:49:33.650322584 +0100 @@ -38,6 +38,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -28367,8 +28367,8 @@ #ifndef PRODUCT diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/exceptions.cpp openjdk/hotspot/src/share/vm/utilities/exceptions.cpp ---- openjdk.orig/hotspot/src/share/vm/utilities/exceptions.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/exceptions.cpp 2012-07-25 15:09:16.244837282 +0100 +--- openjdk.orig/hotspot/src/share/vm/utilities/exceptions.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/utilities/exceptions.cpp 2013-04-08 01:49:33.650322584 +0100 @@ -42,6 +42,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -28380,8 +28380,8 @@ // Implementation of ThreadShadow diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp ---- openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2012-07-25 15:09:16.244837282 +0100 +--- openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2013-04-08 01:49:33.654322648 +0100 @@ -76,15 +76,28 @@ # include <sys/procfs.h> # endif @@ -28452,8 +28452,8 @@ inline int g_isnan(double f) { return isnan(f); } #else diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions.hpp openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp ---- openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp 2012-07-25 15:09:16.244837282 +0100 +--- openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp 2013-04-08 01:49:33.654322648 +0100 @@ -25,6 +25,8 @@ #ifndef SHARE_VM_UTILITIES_GLOBALDEFINITIONS_HPP #define SHARE_VM_UTILITIES_GLOBALDEFINITIONS_HPP @@ -28560,8 +28560,8 @@ // Enable zap-a-lot if in debug version. diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp openjdk/hotspot/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp ---- openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp 2012-07-25 15:09:16.244837282 +0100 +--- openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp 2013-04-08 01:49:33.654322648 +0100 @@ -74,8 +74,25 @@ # ifdef SOLARIS_MUTATOR_LIBTHREAD # include <sys/procfs.h> @@ -28590,8 +28590,8 @@ # include <ucontext.h> # include <sys/time.h> diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_visCPP.hpp openjdk/hotspot/src/share/vm/utilities/globalDefinitions_visCPP.hpp ---- openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_visCPP.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_visCPP.hpp 2012-07-25 15:09:16.244837282 +0100 +--- openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_visCPP.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_visCPP.hpp 2013-04-08 01:49:33.654322648 +0100 @@ -207,6 +207,20 @@ // Formatting. #define FORMAT64_MODIFIER "I64" @@ -28614,8 +28614,8 @@ #endif // SHARE_VM_UTILITIES_GLOBALDEFINITIONS_VISCPP_HPP diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/growableArray.cpp openjdk/hotspot/src/share/vm/utilities/growableArray.cpp ---- openjdk.orig/hotspot/src/share/vm/utilities/growableArray.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/growableArray.cpp 2012-07-25 15:09:16.244837282 +0100 +--- openjdk.orig/hotspot/src/share/vm/utilities/growableArray.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/utilities/growableArray.cpp 2013-04-08 01:49:33.654322648 +0100 @@ -34,6 +34,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -28627,8 +28627,8 @@ void GenericGrowableArray::set_nesting() { if (on_stack()) { diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/histogram.hpp openjdk/hotspot/src/share/vm/utilities/histogram.hpp ---- openjdk.orig/hotspot/src/share/vm/utilities/histogram.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/histogram.hpp 2012-07-25 15:09:16.244837282 +0100 +--- openjdk.orig/hotspot/src/share/vm/utilities/histogram.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/utilities/histogram.hpp 2013-04-08 01:49:33.654322648 +0100 @@ -37,6 +37,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "os_windows.inline.hpp" @@ -28640,8 +28640,8 @@ // This class provides a framework for collecting various statistics. // The current implementation is oriented towards counting invocations diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/macros.hpp openjdk/hotspot/src/share/vm/utilities/macros.hpp ---- openjdk.orig/hotspot/src/share/vm/utilities/macros.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/macros.hpp 2012-07-25 15:09:16.244837282 +0100 +--- openjdk.orig/hotspot/src/share/vm/utilities/macros.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/utilities/macros.hpp 2013-04-08 01:49:33.654322648 +0100 @@ -161,6 +161,14 @@ #define NOT_WINDOWS(code) code #endif @@ -28658,8 +28658,8 @@ #define WIN64_ONLY(code) code #define NOT_WIN64(code) diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/ostream.cpp openjdk/hotspot/src/share/vm/utilities/ostream.cpp ---- openjdk.orig/hotspot/src/share/vm/utilities/ostream.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/ostream.cpp 2012-07-25 15:09:16.244837282 +0100 +--- openjdk.orig/hotspot/src/share/vm/utilities/ostream.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/utilities/ostream.cpp 2013-04-08 01:49:33.654322648 +0100 @@ -39,6 +39,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "os_windows.inline.hpp" @@ -28680,8 +28680,8 @@ #include <sys/socket.h> #include <netinet/in.h> diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/preserveException.hpp openjdk/hotspot/src/share/vm/utilities/preserveException.hpp ---- openjdk.orig/hotspot/src/share/vm/utilities/preserveException.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/preserveException.hpp 2012-07-25 15:09:16.244837282 +0100 +--- openjdk.orig/hotspot/src/share/vm/utilities/preserveException.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/utilities/preserveException.hpp 2013-04-08 01:49:33.654322648 +0100 @@ -35,6 +35,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -28693,8 +28693,8 @@ // This file provides more support for exception handling; see also exceptions.hpp class PreserveExceptionMark { diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/taskqueue.cpp openjdk/hotspot/src/share/vm/utilities/taskqueue.cpp ---- openjdk.orig/hotspot/src/share/vm/utilities/taskqueue.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/taskqueue.cpp 2012-07-25 15:09:16.244837282 +0100 +--- openjdk.orig/hotspot/src/share/vm/utilities/taskqueue.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/utilities/taskqueue.cpp 2013-04-08 01:49:33.654322648 +0100 @@ -37,6 +37,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -28711,8 +28711,8 @@ } - diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/taskqueue.hpp openjdk/hotspot/src/share/vm/utilities/taskqueue.hpp ---- openjdk.orig/hotspot/src/share/vm/utilities/taskqueue.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/taskqueue.hpp 2012-07-25 15:09:16.244837282 +0100 +--- openjdk.orig/hotspot/src/share/vm/utilities/taskqueue.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/utilities/taskqueue.hpp 2013-04-08 01:49:33.654322648 +0100 @@ -53,6 +53,12 @@ #ifdef TARGET_OS_ARCH_linux_ppc # include "orderAccess_linux_ppc.inline.hpp" @@ -28727,8 +28727,8 @@ // Simple TaskQueue stats that are collected by default in debug builds. diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/vmError.cpp openjdk/hotspot/src/share/vm/utilities/vmError.cpp ---- openjdk.orig/hotspot/src/share/vm/utilities/vmError.cpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/vmError.cpp 2012-07-25 15:09:16.244837282 +0100 +--- openjdk.orig/hotspot/src/share/vm/utilities/vmError.cpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/utilities/vmError.cpp 2013-04-08 01:49:33.654322648 +0100 @@ -45,13 +45,18 @@ "JAVA_HOME", "JRE_HOME", "JAVA_TOOL_OPTIONS", "_JAVA_OPTIONS", "CLASSPATH", "JAVA_COMPILER", "PATH", "USERNAME", @@ -28759,8 +28759,8 @@ #elif defined(SOLARIS) out.print_raw ("/usr/bin/sh -c "); diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/workgroup.hpp openjdk/hotspot/src/share/vm/utilities/workgroup.hpp ---- openjdk.orig/hotspot/src/share/vm/utilities/workgroup.hpp 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/workgroup.hpp 2012-07-25 15:09:16.244837282 +0100 +--- openjdk.orig/hotspot/src/share/vm/utilities/workgroup.hpp 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/utilities/workgroup.hpp 2013-04-08 01:49:33.654322648 +0100 @@ -35,6 +35,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -28772,8 +28772,8 @@ // Task class hierarchy: // AbstractGangTask diff -Nru openjdk.orig/hotspot/test/jprt.config openjdk/hotspot/test/jprt.config ---- openjdk.orig/hotspot/test/jprt.config 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/test/jprt.config 2012-07-25 15:09:16.244837282 +0100 +--- openjdk.orig/hotspot/test/jprt.config 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/test/jprt.config 2013-04-08 01:49:33.658322712 +0100 @@ -75,8 +75,8 @@ # Uses 'uname -s', but only expect SunOS or Linux, assume Windows otherwise. @@ -28842,8 +28842,8 @@ # Export PATH setting PATH="${path4sdk}" diff -Nru openjdk.orig/hotspot/test/Makefile openjdk/hotspot/test/Makefile ---- openjdk.orig/hotspot/test/Makefile 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/test/Makefile 2012-07-25 15:09:16.244837282 +0100 +--- openjdk.orig/hotspot/test/Makefile 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/test/Makefile 2013-04-08 01:49:33.658322712 +0100 @@ -44,6 +44,22 @@ ARCH = i586 endif @@ -28868,8 +28868,8 @@ PLATFORM = windows SLASH_JAVA = J: diff -Nru openjdk.orig/hotspot/test/runtime/6929067/Test6929067.sh openjdk/hotspot/test/runtime/6929067/Test6929067.sh ---- openjdk.orig/hotspot/test/runtime/6929067/Test6929067.sh 2012-06-07 19:21:17.000000000 +0100 -+++ openjdk/hotspot/test/runtime/6929067/Test6929067.sh 2012-07-25 15:09:16.244837282 +0100 +--- openjdk.orig/hotspot/test/runtime/6929067/Test6929067.sh 2013-03-21 15:17:13.000000000 +0000 ++++ openjdk/hotspot/test/runtime/6929067/Test6929067.sh 2013-04-08 01:49:33.658322712 +0100 @@ -29,7 +29,7 @@ PS=":" FS="/"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/hotspot/zero/revert-7017193.patch Wed Apr 17 14:31:42 2013 +0100 @@ -0,0 +1,136 @@ +diff -Nru openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp +--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp 2013-02-15 00:04:42.000000000 +0000 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2013-03-11 20:15:01.080257099 +0000 +@@ -2788,39 +2788,47 @@ + // writing thread stacks don't use growable mappings (i.e. those + // creeated with MAP_GROWSDOWN), and aren't marked "[stack]", so this + // only applies to the main thread. +- +-static +-bool get_stack_bounds(uintptr_t *bottom, uintptr_t *top) { +- +- char buf[128]; +- int fd, sz; +- +- if ((fd = ::open("/proc/self/maps", O_RDONLY)) < 0) { ++static bool ++get_stack_bounds(uintptr_t *bottom, uintptr_t *top) ++{ ++ FILE *f = fopen("/proc/self/maps", "r"); ++ if (f == NULL) + return false; +- } + +- const char kw[] = "[stack]"; +- const int kwlen = sizeof(kw)-1; +- +- // Address part of /proc/self/maps couldn't be more than 128 bytes +- while ((sz = os::get_line_chars(fd, buf, sizeof(buf))) > 0) { +- if (sz > kwlen && ::memcmp(buf+sz-kwlen, kw, kwlen) == 0) { +- // Extract addresses +- if (sscanf(buf, "%" SCNxPTR "-%" SCNxPTR, bottom, top) == 2) { +- uintptr_t sp = (uintptr_t) __builtin_frame_address(0); +- if (sp >= *bottom && sp <= *top) { +- ::close(fd); +- return true; +- } ++ while (!feof(f)) { ++ size_t dummy; ++ char *str = NULL; ++ ssize_t len = getline(&str, &dummy, f); ++ if (len == -1) { ++ fclose(f); ++ if (str != NULL) ++ free(str); ++ return false; ++ } ++ ++ if (len > 0 && str[len-1] == '\n') { ++ str[len-1] = 0; ++ len--; ++ } ++ ++ static const char *stack_str = "[stack]"; ++ if (len > (ssize_t)strlen(stack_str) ++ && (strcmp(str + len - strlen(stack_str), stack_str) == 0)) { ++ if (sscanf(str, "%" SCNxPTR "-%" SCNxPTR, bottom, top) == 2) { ++ uintptr_t sp = (uintptr_t)__builtin_frame_address(0); ++ if (sp >= *bottom && sp <= *top) { ++ free(str); ++ fclose(f); ++ return true; + } +- } ++ } ++ } ++ free(str); + } +- +- ::close(fd); ++ fclose(f); + return false; + } + +- + // If the (growable) stack mapping already extends beyond the point + // where we're going to put our guard pages, truncate the mapping at + // that point by munmap()ping it. This ensures that when we later +diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/os.cpp openjdk/hotspot/src/share/vm/runtime/os.cpp +--- openjdk.orig/hotspot/src/share/vm/runtime/os.cpp 2013-02-15 00:04:42.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/runtime/os.cpp 2013-03-11 20:15:01.080257099 +0000 +@@ -1306,41 +1306,3 @@ + } + return result; + } +- +-// Read file line by line, if line is longer than bsize, +-// skip rest of line. +-int os::get_line_chars(int fd, char* buf, const size_t bsize){ +- size_t sz, i = 0; +- +- // read until EOF, EOL or buf is full +- while ((sz = (int) read(fd, &buf[i], 1)) == 1 && i < (bsize-2) && buf[i] != '\n') { +- ++i; +- } +- +- if (buf[i] == '\n') { +- // EOL reached so ignore EOL character and return +- +- buf[i] = 0; +- return (int) i; +- } +- +- buf[i+1] = 0; +- +- if (sz != 1) { +- // EOF reached. if we read chars before EOF return them and +- // return EOF on next call otherwise return EOF +- +- return (i == 0) ? -1 : (int) i; +- } +- +- // line is longer than size of buf, skip to EOL +- char ch; +- while (read(fd, &ch, 1) == 1 && ch != '\n') { +- // Do nothing +- } +- +- // return initial part of line that fits in buf. +- // If we reached EOF, it will be returned on next call. +- +- return (int) i; +-} +diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/os.hpp openjdk/hotspot/src/share/vm/runtime/os.hpp +--- openjdk.orig/hotspot/src/share/vm/runtime/os.hpp 2013-02-15 00:04:42.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/runtime/os.hpp 2013-03-11 20:15:16.008497745 +0000 +@@ -661,10 +661,6 @@ + // Hook for os specific jvm options that we don't want to abort on seeing + static bool obsolete_option(const JavaVMOption *option); + +- // Read file line by line. If line is longer than bsize, +- // rest of line is skipped. Returns number of bytes read or -1 on EOF +- static int get_line_chars(int fd, char *buf, const size_t bsize); +- + // Platform dependent stuff + #ifdef TARGET_OS_FAMILY_linux + # include "os_linux.hpp"
--- a/patches/revert-7017193.patch Tue Mar 12 21:34:03 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,138 +0,0 @@ -diff --git a/src/os/linux/vm/os_linux.cpp b/src/os/linux/vm/os_linux.cpp ---- openjdk/hotspot/src/os/linux/vm/os_linux.cpp -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp -@@ -2763,39 +2763,47 @@ - // writing thread stacks don't use growable mappings (i.e. those - // creeated with MAP_GROWSDOWN), and aren't marked "[stack]", so this - // only applies to the main thread. -- --static --bool get_stack_bounds(uintptr_t *bottom, uintptr_t *top) { -- -- char buf[128]; -- int fd, sz; -- -- if ((fd = ::open("/proc/self/maps", O_RDONLY)) < 0) { -+static bool -+get_stack_bounds(uintptr_t *bottom, uintptr_t *top) -+{ -+ FILE *f = fopen("/proc/self/maps", "r"); -+ if (f == NULL) - return false; -- } -- -- const char kw[] = "[stack]"; -- const int kwlen = sizeof(kw)-1; -- -- // Address part of /proc/self/maps couldn't be more than 128 bytes -- while ((sz = os::get_line_chars(fd, buf, sizeof(buf))) > 0) { -- if (sz > kwlen && ::memcmp(buf+sz-kwlen, kw, kwlen) == 0) { -- // Extract addresses -- if (sscanf(buf, "%" SCNxPTR "-%" SCNxPTR, bottom, top) == 2) { -- uintptr_t sp = (uintptr_t) __builtin_frame_address(0); -- if (sp >= *bottom && sp <= *top) { -- ::close(fd); -- return true; -- } -+ -+ while (!feof(f)) { -+ size_t dummy; -+ char *str = NULL; -+ ssize_t len = getline(&str, &dummy, f); -+ if (len == -1) { -+ fclose(f); -+ if (str != NULL) -+ free(str); -+ return false; -+ } -+ -+ if (len > 0 && str[len-1] == '\n') { -+ str[len-1] = 0; -+ len--; -+ } -+ -+ static const char *stack_str = "[stack]"; -+ if (len > (ssize_t)strlen(stack_str) -+ && (strcmp(str + len - strlen(stack_str), stack_str) == 0)) { -+ if (sscanf(str, "%" SCNxPTR "-%" SCNxPTR, bottom, top) == 2) { -+ uintptr_t sp = (uintptr_t)__builtin_frame_address(0); -+ if (sp >= *bottom && sp <= *top) { -+ free(str); -+ fclose(f); -+ return true; - } -- } -- } -- -- ::close(fd); -+ } -+ } -+ free(str); -+ } -+ fclose(f); - return false; - } - -- - // If the (growable) stack mapping already extends beyond the point - // where we're going to put our guard pages, truncate the mapping at - // that point by munmap()ping it. This ensures that when we later -diff --git a/src/share/vm/runtime/os.cpp b/src/share/vm/runtime/os.cpp ---- openjdk/hotspot/src/share/vm/runtime/os.cpp -+++ openjdk/hotspot/src/share/vm/runtime/os.cpp -@@ -1331,41 +1331,3 @@ - } - return result; - } -- --// Read file line by line, if line is longer than bsize, --// skip rest of line. --int os::get_line_chars(int fd, char* buf, const size_t bsize){ -- size_t sz, i = 0; -- -- // read until EOF, EOL or buf is full -- while ((sz = (int) read(fd, &buf[i], 1)) == 1 && i < (bsize-2) && buf[i] != '\n') { -- ++i; -- } -- -- if (buf[i] == '\n') { -- // EOL reached so ignore EOL character and return -- -- buf[i] = 0; -- return (int) i; -- } -- -- buf[i+1] = 0; -- -- if (sz != 1) { -- // EOF reached. if we read chars before EOF return them and -- // return EOF on next call otherwise return EOF -- -- return (i == 0) ? -1 : (int) i; -- } -- -- // line is longer than size of buf, skip to EOL -- char ch; -- while (read(fd, &ch, 1) == 1 && ch != '\n') { -- // Do nothing -- } -- -- // return initial part of line that fits in buf. -- // If we reached EOF, it will be returned on next call. -- -- return (int) i; --} -diff --git a/src/share/vm/runtime/os.hpp b/src/share/vm/runtime/os.hpp ---- openjdk/hotspot/src/share/vm/runtime/os.hpp -+++ openjdk/hotspot/src/share/vm/runtime/os.hpp -@@ -672,10 +672,6 @@ - // Hook for os specific jvm options that we don't want to abort on seeing - static bool obsolete_option(const JavaVMOption *option); - -- // Read file line by line. If line is longer than bsize, -- // rest of line is skipped. Returns number of bytes read or -1 on EOF -- static int get_line_chars(int fd, char *buf, const size_t bsize); -- - // Extensions - #include "runtime/os_ext.hpp" -