aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJ. Duke <duke@openjdk.org>2021-02-22 08:33:13 -0800
committerJ. Duke <duke@openjdk.org>2021-02-22 08:33:13 -0800
commit21694451a49e491faeb982a477a23600b590d17f (patch)
tree5f4670264068837b841aa3436c73467692d50aff
parenta2b4b83f30dc4358f5044138866d5e96b0fc106b (diff)
parent6fab408902e845ce5c5eb121eebf828d96a64be1 (diff)
downloadlibcore-21694451a49e491faeb982a477a23600b590d17f.tar.gz
Merge jdk7u51-b33 hotspot
-rw-r--r--.hgtags-top-repo60
-rw-r--r--Makefile2
2 files changed, 60 insertions, 2 deletions
diff --git a/.hgtags-top-repo b/.hgtags-top-repo
index 49c5ca2fad8..f1531a01cbd 100644
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -300,6 +300,22 @@ b01002577912b89306e88a9973b6f3bc049a2a69 jdk7u25-b08
84285f4e0aa2f81b80bc6fbe713d768c0d9a7156 jdk7u25-b09
aae1e27d347b71f65f548c12b918ede98d869b7c jdk7u25-b10
039f12124903cd0b7633a17a26f6ca281f7aaeae jdk7u25-b11
+210f464368dba0fc4f8d239654fa7432ad2ed31f jdk7u14-b16
+f07712232642fc30dcf7c433ff890e7247b5fd0b jdk7u14-b17
+9e2a9a2c5b240daa4e27ff75d030a77827174753 jdk7u14-b18
+d9d4dc020cb37142230f6a20d2a75a677c5cd26f jdk7u14-b19
+d9d4dc020cb37142230f6a20d2a75a677c5cd26f jdk7u14-b19
+b4b7795ef8047e3d2b2ba48a70c08d9184073100 jdk7u14-b19
+f413e7a22c198559af5aca28309356e6d4edd78f jdk7u14-b20
+41686e19d8189a546434a52dd9679e9b6a0a68be jdk7u14-b21
+3e3177719b43f732239d6d51e96d26ee18440960 jdk7u14-b22
+8c6e2197930c79f6beafd83181714cc817b83229 jdk7u40-b23
+5169c92728b54a4b5e9a41071f8bf8701d0fe1fa jdk7u40-b24
+f89fd7e2800c1c35b6c339f54780d5579bb30991 jdk7u40-b25
+4ef57f592525d36487ea6eeb2be84d0e9170b26b jdk7u40-b26
+75167199239375d05b68668023c885c2776fd548 jdk7u40-b27
+ac751f3867ecffca814b25daf5e19d82d83fc755 jdk7u40-b28
+dbe42a627813892d1bb59a4240c24f60ef22930a jdk7u40-b29
2d02518960053d2b1dcb9aabacd709788e92c549 jdk7u25-b12
37c4268341d79b16165bdaf7e1fad489d692bc83 jdk7u25-b13
9de1fc3635def64c19c51f272f09b51d8cf0ca98 jdk7u25-b14
@@ -327,7 +343,7 @@ f89fd7e2800c1c35b6c339f54780d5579bb30991 jdk7u40-b25
ac751f3867ecffca814b25daf5e19d82d83fc755 jdk7u40-b28
dbe42a627813892d1bb59a4240c24f60ef22930a jdk7u40-b29
1c141e6fde911c4974c87e340eb698754607f422 jdk7u40-b30
-58a2a470aa3bccd3eb3624e68bca9397c8cc26a2 jdk7u40-b31
+e51f24701c608e57ba7ae69ba28bbc2daab02c4c jdk7u45-b01
da376fd5e4d68f8a45003a6e175267dc840711cc jdk7u40-b32
3fdfe7f1b06354e11e8af51b7c653c8a0adb3987 jdk7u40-b33
a1ae13479e8767329fa20774b5cea5976aaeb37b jdk7u40-b34
@@ -339,3 +355,45 @@ a2ba8e069718677c267b3894df2a719148c15ac8 jdk7u40-b39
c9157eb582a5deec5bbac671bf628bc45af447d0 jdk7u40-b40
8773b39be6ac71c06793035b8c72f5c771eb534f jdk7u40-b41
3af81bfe320c12758234233da6fa27c3c0ffcdc4 jdk7u40-b42
+1d53bd8fd2a62bcf336727ebec377ef7498dd4a6 jdk7u40-b43
+dc1e099cd62d250b4a997ce694b47fe2f50d2905 jdk7u40-b60
+6359fa34199c9619dfec0f41d2eb22a4083ce610 jdk7u40-b61
+a2605cf03226ce2fef7a899ce41521c654300975 jdk7u40-b62
+07e41ff8674c9438cb1124cf78eed8636ed5d4fa jdk7u45-b02
+23c983c352a170d7a5fb7d703081daf1816d257a jdk7u45-b03
+1018a8ab686da6c1be22bec3ab9d01b2dc206333 jdk7u45-b04
+22e0ca1fa645d0518b514159afafe34335699c11 jdk7u45-b05
+61343f60f25a1d0deddc1468b2eb948df5275641 jdk7u45-b06
+24088aaf3f6834e46b486b706fbc6ce1f18814e5 jdk7u45-b07
+036425509e31070700a3956aaca7c33d583b7a5e jdk7u45-b08
+b6af2c522a633de1c7b66204fac7104b410ce23c jdk7u45-b09
+3fedb8c609a0f43bc8084edbecb0435e19dcb9a2 jdk7u45-b10
+142403d9f1167b8559b49627c7199c84623307da jdk7u45-b11
+a14018a5fa18092dcca5084656abb797bdb7b5ff jdk7u45-b12
+4d38e9adeb81df9c24550070df1f358aa9c17477 jdk7u45-b13
+bab0456ba0520f73ee20814ddf7ea0d596e49abd jdk7u45-b14
+b4b2584649027b622c188db7a6c3f9cff0e20130 jdk7u45-b15
+f2479abad143d2d9f33b6c872890ca0c5dd52530 jdk7u45-b16
+6fd67e0287a9893ea1f0090fe127f18a7e235148 jdk7u45-b17
+f0cdb08a4624a623bdd178b04c4bf5a2fa4dc39a jdk7u45-b18
+82f1f76c44124c31cb1151833fc15c13547ab280 jdk7u45-b30
+f4373de4b75ba8d7f7a5d9c1f77e7884d9064b7e jdk7u45-b31
+b73c006b5d81528dfb4104a79b994b56675bf75d jdk7u45-b33
+05742477836cb30235328181c8e6cae5d4bb06fd jdk7u45-b34
+d0d5badd77abce0469830466ff7b910d3621d847 jdk7u45-b35
+f2479abad143d2d9f33b6c872890ca0c5dd52530 jdk7u51-b00
+c5822e1d1baa9625ee4e54b8e83a9bf529c883fc jdk7u51-b01
+f750621fb31b8f6462b803b47bbf84f05cd5174a jdk7u51-b02
+dafd6c301c979ece6493dfb52e09e46bc81b7285 jdk7u51-b03
+8bc2f477bba4ccecaf46a52877e429342ab9c5bc jdk7u51-b04
+1604b330bf9629da5cac02af8582717dd431032e jdk7u51-b05
+15c531ebb19c21a5b565ce887c790d3855b461ef jdk7u51-b06
+75f0610e93bf6f51b3674fbbbe16f648ceb34d29 jdk7u51-b07
+467fc49c32dd8e3dd940ad0e5934a65fc7fb60ec jdk7u51-b08
+73ebe4e4f20e1d5db72c5cd673c65ffa09259982 jdk7u51-b09
+9868efbea4290f4359a6a54d722f2cb79ef634a9 jdk7u51-b10
+573c4cfca7dda548463bb84330bddfd07fe1183f jdk7u51-b11
+df53ec7eb789e7dec375a685dce1fa5cf63618b4 jdk7u51-b12
+6c778574d87336a2e55156544af92ce2de799696 jdk7u51-b13
+d2eeac0235eda77d0a6c72c7235a6e96bc9ad4fb jdk7u51-b30
+626e76f127a44ba0118a545d37410f80000db8fb jdk7u51-b31
diff --git a/Makefile b/Makefile
index ffc25d42f01..73b1f778d25 100644
--- a/Makefile
+++ b/Makefile
@@ -264,7 +264,7 @@ generic_debug_build:
DEBUG_NAME=$(DEBUG_NAME) \
GENERATE_DOCS=false \
$(if $(findstring true,$(BUILD_INSTALL)),BUILD_INSTALL_BUNDLES=true,) \
- CREATE_DEBUGINFO_BUNDLES=false \
+ CREATE_DEBUGINFO_BUNDLES=true \
$(BOOT_CYCLE_DEBUG_SETTINGS) \
generic_build_repo_series