Mercurial > hg > openjdk > lambda
changeset 779:892a0196d10c jdk8-b89
Merge
| author | lana |
|---|---|
| date | Mon, 06 May 2013 11:41:35 -0700 |
| parents | 8fb91165e596 (current diff) 1603c9216e83 (diff) |
| children | 49ea9293fa49 69b773a221b9 |
| files | common/makefiles/NativeCompilation.gmk |
| diffstat | 3 files changed, 16 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/common/makefiles/NativeCompilation.gmk Thu May 02 13:34:39 2013 -0700 +++ b/common/makefiles/NativeCompilation.gmk Mon May 06 11:41:35 2013 -0700 @@ -411,6 +411,8 @@ $1_EXTRA_LDFLAGS+="-implib:$$($1_OBJECT_DIR)/$$($1_LIBRARY).lib" endif + $1_EXTRA_LDFLAGS_SUFFIX += $(GLOBAL_LDFLAGS_SUFFIX) + ifneq (,$$($1_DEBUG_SYMBOLS)) ifeq ($(ENABLE_DEBUG_SYMBOLS), true) ifeq ($(OPENJDK_TARGET_OS), windows) @@ -549,6 +551,8 @@ endif endif + $1_EXTRA_LDFLAGS_SUFFIX += $(GLOBAL_LDFLAGS_SUFFIX) + $$($1_TARGET) : $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_GEN_MANIFEST) $$(call LINKING_EXE_MSG,$$($1_BASENAME)) $$($1_LDEXE) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $(EXE_OUT_OPTION)$$($1_TARGET) \
--- a/common/makefiles/javadoc/CORE_PKGS.gmk Thu May 02 13:34:39 2013 -0700 +++ b/common/makefiles/javadoc/CORE_PKGS.gmk Mon May 06 11:41:35 2013 -0700 @@ -142,6 +142,7 @@ java.util.prefs \ java.util.regex \ java.util.spi \ + java.util.stream \ java.util.zip \ javax.accessibility \ javax.activation \
--- a/common/makefiles/javadoc/Javadoc.gmk Thu May 02 13:34:39 2013 -0700 +++ b/common/makefiles/javadoc/Javadoc.gmk Mon May 06 11:41:35 2013 -0700 @@ -390,6 +390,17 @@ $(call OptionPair,-tag,specdefault:X) ; \ $(call OptionPair,-tag,Note:X) ; \ $(call OptionPair,-tag,ToDo:X) ; \ + $(call OptionPair,-tag,apiNote:a:API Note:) ; \ + $(call OptionPair,-tag,implSpec:a:Implementation Requirements:) ; \ + $(call OptionPair,-tag,implNote:a:Implementation Note:) ; \ + $(call OptionPair,-tag,param) ; \ + $(call OptionPair,-tag,return) ; \ + $(call OptionPair,-tag,throws) ; \ + $(call OptionPair,-tag,since) ; \ + $(call OptionPair,-tag,version) ; \ + $(call OptionPair,-tag,serialData) ; \ + $(call OptionPair,-tag,factory) ; \ + $(call OptionPair,-tag,see) ; \ $(call OptionPair,-tag,$(TAG_JLS)) ; \ $(call OptionOnly,-splitIndex) ; \ $(call OptionPair,-overview,$(COREAPI_OVERVIEW)) ; \