Date: Mon, 21 Apr 2014 20:56:10 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351714 - head/java/openjdk7/files Message-ID: <201404212056.s3LKuA0h027845@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Mon Apr 21 20:56:10 2014 New Revision: 351714 URL: http://svnweb.freebsd.org/changeset/ports/351714 QAT: https://qat.redports.org/buildarchive/r351714/ Log: Fix build with clang. Added: head/java/openjdk7/files/patch-hotspot-make-bsd-makefiles-gcc.make (contents, props changed) head/java/openjdk7/files/patch-hotspot-src-share-vm-code-relocInfo.hpp (contents, props changed) Added: head/java/openjdk7/files/patch-hotspot-make-bsd-makefiles-gcc.make ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/openjdk7/files/patch-hotspot-make-bsd-makefiles-gcc.make Mon Apr 21 20:56:10 2014 (r351714) @@ -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. Added: head/java/openjdk7/files/patch-hotspot-src-share-vm-code-relocInfo.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/openjdk7/files/patch-hotspot-src-share-vm-code-relocInfo.hpp Mon Apr 21 20:56:10 2014 (r351714) @@ -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); + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404212056.s3LKuA0h027845>