Mercurial > hg > openjdk > lambda
changeset 985:431d16ddfcd9
Merge
| author | jlaskey |
|---|---|
| date | Mon, 29 Apr 2013 21:37:25 -0300 |
| parents | f171aa801ea5 (diff) dd81e9b5fb38 (current diff) |
| children | 1fca390200c1 |
| files | |
| diffstat | 6 files changed, 19 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Apr 22 13:59:37 2013 -0300 +++ b/.hgtags Mon Apr 29 21:37:25 2013 -0300 @@ -207,3 +207,4 @@ 466685ba01bfb7bc1e1ac61490fd8c0f3cc18763 jdk8-b83 01f631f89fa392b4e484d0812c40ea8f9d2353aa jdk8-b84 7fc358f5943676b82f1dccd3152b1ac07d92e38b jdk8-b85 +df9b5240f0a76c91cfe1a5b39da4d08df56e05be jdk8-b86
--- a/common/autoconf/compare.sh.in Mon Apr 22 13:59:37 2013 -0300 +++ b/common/autoconf/compare.sh.in Mon Apr 29 21:37:25 2013 -0300 @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2012, 2013 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it
--- a/common/bin/compare.sh Mon Apr 22 13:59:37 2013 -0300 +++ b/common/bin/compare.sh Mon Apr 29 21:37:25 2013 -0300 @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2012, 2013 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it
--- a/common/makefiles/NativeCompilation.gmk Mon Apr 22 13:59:37 2013 -0300 +++ b/common/makefiles/NativeCompilation.gmk Mon Apr 29 21:37:25 2013 -0300 @@ -393,6 +393,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) @@ -531,6 +533,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 Mon Apr 22 13:59:37 2013 -0300 +++ b/common/makefiles/javadoc/CORE_PKGS.gmk Mon Apr 29 21:37:25 2013 -0300 @@ -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 Mon Apr 22 13:59:37 2013 -0300 +++ b/common/makefiles/javadoc/Javadoc.gmk Mon Apr 29 21:37:25 2013 -0300 @@ -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)) ; \