diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2014-04-21 20:56:10 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2014-04-21 20:56:10 +0000 |
| commit | ed5e9e275a170829910561779a936c4cddf209b1 (patch) | |
| tree | 5666313a58c006e33b0ec035a53ac5a9b01445d6 /java/openjdk7 | |
| parent | 69553e4f7c1f93fda6e17c7b931b3608ef73ecc6 (diff) | |
| download | ports-ed5e9e275a170829910561779a936c4cddf209b1.tar.gz ports-ed5e9e275a170829910561779a936c4cddf209b1.zip | |
Notes
Diffstat (limited to 'java/openjdk7')
| -rw-r--r-- | java/openjdk7/files/patch-hotspot-make-bsd-makefiles-gcc.make | 15 | ||||
| -rw-r--r-- | java/openjdk7/files/patch-hotspot-src-share-vm-code-relocInfo.hpp | 20 |
2 files changed, 35 insertions, 0 deletions
diff --git a/java/openjdk7/files/patch-hotspot-make-bsd-makefiles-gcc.make b/java/openjdk7/files/patch-hotspot-make-bsd-makefiles-gcc.make new file mode 100644 index 000000000000..6e2143ce7601 --- /dev/null +++ b/java/openjdk7/files/patch-hotspot-make-bsd-makefiles-gcc.make @@ -0,0 +1,15 @@ +--- hotspot/make/bsd/makefiles/gcc.make ++++ hotspot/make/bsd/makefiles/gcc.make +@@ -216,8 +216,11 @@ + endif + + # Flags for generating make dependency flags. ++ifeq (,$(findstring clang,$(shell $(CC) -v 2>&1))) ++DEPFLAGS = -fpch-deps ++endif + ifneq ("${CC_VER_MAJOR}", "2") +-DEPFLAGS = -fpch-deps -MMD -MP -MF $(DEP_DIR)/$(@:%=%.d) ++DEPFLAGS += -MMD -MP -MF $(DEP_DIR)/$(@:%=%.d) + endif + + # -DDONT_USE_PRECOMPILED_HEADER will exclude all includes in precompiled.hpp. diff --git a/java/openjdk7/files/patch-hotspot-src-share-vm-code-relocInfo.hpp b/java/openjdk7/files/patch-hotspot-src-share-vm-code-relocInfo.hpp new file mode 100644 index 000000000000..0eeec26f1635 --- /dev/null +++ b/java/openjdk7/files/patch-hotspot-src-share-vm-code-relocInfo.hpp @@ -0,0 +1,20 @@ +--- hotspot/src/share/vm/code/relocInfo.hpp.orig 2013-09-06 14:22:10.000000000 -0400 ++++ hotspot/src/share/vm/code/relocInfo.hpp 2014-04-21 16:06:19.000000000 -0400 +@@ -371,7 +371,7 @@ + // "immediate" in the prefix header word itself. This optimization + // is invisible outside this module.) + +- inline friend relocInfo prefix_relocInfo(int datalen = 0); ++ inline friend relocInfo prefix_relocInfo(int datalen); + + protected: + // an immediate relocInfo optimizes a prefix with one 10-bit unsigned value +@@ -466,7 +466,7 @@ + return relocInfo(relocInfo::none, relocInfo::offset_limit() - relocInfo::offset_unit); + } + +-inline relocInfo prefix_relocInfo(int datalen) { ++inline relocInfo prefix_relocInfo(int datalen = 0) { + assert(relocInfo::fits_into_immediate(datalen), "datalen in limits"); + return relocInfo(relocInfo::data_prefix_tag, relocInfo::RAW_BITS, relocInfo::datalen_tag | datalen); + } |