Mercurial > hg > release > icedtea7-forest-2.4 > corba

changeset 853:721b1070efda

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge jdk7u51-b31
author andrew
date Fri, 17 Jan 2014 20:22:44 +0000
parents e540fd592221 (diff) 0ad990211737 (current diff)
children adc241d706d6
files .hgtags make/Makefile
diffstat 5 files changed, 24 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Dec 19 09:31:40 2013 -0800
+++ b/.hgtags	Fri Jan 17 20:22:44 2014 +0000
@@ -50,6 +50,7 @@
 b751c528c55560cf2adeaeef24b39ca1f4d1cbf7 jdk7-b73
 5d0cf59a3203b9f57aceebc33ae656b884987955 jdk7-b74
 0fb137085952c8e47878e240d1cb40f14de463c4 jdk7-b75
+d728db3889da23d9f74e45154b9261a43b4acd8d icedtea7-1.12
 937144222e2219939101b0129d26a872a7956b13 jdk7-b76
 6881f0383f623394b5ec73f27a5f329ff55d0467 jdk7-b77
 a7f7276b48cd74d8eb1baa83fbf3d1ef4a2603c8 jdk7-b78
@@ -63,6 +64,7 @@
 6253e28826d16cf1aecc39ce04c8de1f6bf2df5f jdk7-b86
 09a41111a401d327f65e453384d976a10154d9ea jdk7-b87
 39e14d2da687c7e592142137517aaf689544820f jdk7-b88
+e805b4155d76f76d40ffae36a74546f79218c539 icedtea7-1.13
 bb4424c5e778b842c064a8b1aa902b35f4397654 jdk7-b89
 56ce07b0eb47b93a98a72adef0f21e602c460623 jdk7-b90
 bcd2fc089227559ac5be927923609fac29f067fa jdk7-b91
@@ -111,6 +113,7 @@
 918003855fa0dba5acf4bf1fe36526d2fc4c1ba8 jdk7-b134
 e0b72ae5dc5e824b342801c8d1d336a55eb54e2c jdk7-b135
 48ef0c712e7cbf272f47f9224db92a3c6a9e2612 jdk7-b136
+b62418551e20fa19fbf57c49d4378b7096809e60 icedtea-1.14
 a66c01d8bf895261715955df0b95545c000ed6a8 jdk7-b137
 78d8cf04697e9df54f7f11e195b7da29b8e345a2 jdk7-b138
 60b074ec6fcf5cdf9efce22fdfb02326ed8fa2d3 jdk7-b139
@@ -123,6 +126,7 @@
 770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146
 36f0efbc66ef8ace3cca8aa8d0c88f3334080f8a jdk7u1-b01
 73323cb3396260d93e0ab731fd2d431096ceed0f jdk7-b147
+d034cc90ecc266d78b87d1429c426669431fcc1f icedtea-2.0-branchpoint
 9515a2d034b4727c11aeea36354a549fbc469c4f jdk7u1-b02
 dd71cb354c573c1addcda269a7dd9144bfce9587 jdk7u1-b03
 eaee830124aa453627591d8f9eccb39d7e040876 jdk7u1-b04
@@ -141,6 +145,7 @@
 56b02f8ef70391a67c9fa71157a8faafbdff4b74 jdk7u2-b12
 456ff1f14b14ef8cfe47cef95c8094f8443fa092 jdk7u2-b13
 62b846b0c3259cae732e75df50a1b180a2541178 jdk7u2-b21
+ecb9fc90dea4720f5c1ba1354364ed610f463e41 icedtea-2.1-branchpoint
 1b648adeeefa9b1fb022459e8e4f590b736c0fdd jdk7u3-b02
 730fa05af5a9d10a3a7a1626d248b96d09f8069f jdk7u3-b03
 7f7a9b1addb4925f4f6e17f6eb5cce986c3b626d jdk7u3-b04
@@ -157,6 +162,7 @@
 23777178e7eb61859be3f7240561aa1034ff9221 jdk7u4-b10
 bdc37f3c09b6008667aff77432bb6d31cbae945e jdk7u4-b11
 fddc26b35a31884d64315cf7c296570245e9c481 jdk7u4-b12
+9ffa2340e018131c900e9cc12c9f3a10698aa191 icedtea-2.2-branchpoint
 f7119745898016a98cddab3e69efb41c5a5aaf78 jdk7u4-b13
 6a262c36caebb43972cbae5032cff632ce31d2cc jdk7u4-b14
 d9bf21b76f093abfe451880d5db29e4932b1e72e jdk7u4-b15
@@ -191,6 +197,7 @@
 8da4015f405b0fa267cca4780d20cd012d0a9cb4 jdk7u6-b15
 7674c7ed99a53a8dcf654ab8a6963199ef562a08 jdk7u6-b16
 e4a676826cb3fe2f84e19105a027c15c097f98f1 jdk7u6-b17
+68c35d6e9548bc7be9c3ce73774c6d53b0d72d3b icedtea-2.3-branchpoint
 b3d767dbd67f518168c561e078be5e860bc60cfc jdk7u6-b18
 5c046510b9308bf514f078d48fcf0112a376ad41 jdk7u6-b19
 f0c51b691d34b4a06c1e22c7960be71e0d0ee84e jdk7u6-b20
@@ -258,6 +265,7 @@
 7969d5f219248de033c296ef75fff7aae7545bbd jdk7u12-b07
 6f4d4c7a254d4aca3a7f2caabb75e6559a290393 jdk7u12-b08
 c8c261b2220c5b966c07784682057a915defb0da jdk7u12-b09
+efbe4cef7fe2d46a197c39eb7a94e127e0bb4c5d icedtea-2.4-branchpoint
 3877f9ae971eefbfbbcb16f2ff79c72ac10ac4bd jdk7u14-b10
 3bd891cd98773cf841ad65f52f25e3e6fa185cef jdk7u14-b11
 fbb83600db33de6211fc58ba2a2bbb6b356aa9c2 jdk7u14-b12
@@ -335,6 +343,7 @@
 bfbaab73969d4d978d0280d6ad51bac8c47dbaf8 jdk7u14-b19
 a921b45a1f9086a7d598a76f920639050386f996 jdk7u14-b19
 54320e5d9da60df24f0e2c57c011809911dc06e1 jdk7u14-b20
+47084105fe834aa1c6f2ee2bbea01deaa05059dd icedtea-2.4.0
 fb590ca4de9aaf1f6bca945be040dffc55b5e8d2 jdk7u14-b21
 e5d89aa2c1a11dba841a646858dda9ea18dc8f57 jdk7u14-b22
 d85df1552f877a1cc51f43bc07a42a0c48f18e0b jdk7u40-b23
@@ -345,6 +354,7 @@
 c8b9201f88f4ce417df7a40efcb7fef656d94512 jdk7u40-b28
 1ad0a5a3f7b1e9d95670d733d7e70714050ba6bf jdk7u40-b29
 651dcadbd9774165e017f8b7d1bde7d7d280ae1d jdk7u40-b30
+23ae4e0e0cce13779c531a704bf95fda1764882b icedtea-2.4.1
 3d2b811b8a798ff3b619f8330b08f551f7fdfd80 jdk7u40-b31
 c5f85903c49aa716ee3cb93361dd60a3e88d866d jdk7u40-b32
 1b7fbfdc31b859097d6a365ad0ba0e8ef92b4063 jdk7u40-b33
@@ -359,6 +369,7 @@
 b4a480a039bc19b27bfb5fcbbbf75e651d2718b7 jdk7u40-b42
 e29ea0b297e519010e661603a07bb8d48fa904a2 jdk7u40-b43
 08737d863a7aa5eb39374b26c9585e1770affe92 jdk7u40-b60
+5ea58899ae9f26e8ad21d1be15f73d426e2b5fb1 icedtea-2.4.2
 504acad3372298a79c231696d805f00f3beb2362 jdk7u40-b61
 c9c225fb19c3aa6e1242c051833ecc69d00b7aa1 jdk7u40-b62
 4f54264ca4df2fc50fbb9bb2654dad97776d10ac jdk7u45-b01
@@ -380,6 +391,8 @@
 8b8793f06c56e343962b473bc0fb79f23b8be734 jdk7u45-b17
 80f65a8f58500ef5d93ddf4426d9c1909b79fadf jdk7u45-b18
 a15e4a54504471f1e34a494ed66235870722a0f5 jdk7u45-b30
+8ed5df839fbccdb20f2718626402d28e5ea33542 icedtea-2.4.3
+468a4fe3400a2f6fd85f4e9023feb3b11e5edf1c icedtea-2.4.4
 b7fb35bbe70d88eced3725b6e9070ad0b5b621ad jdk7u45-b31
 d641ac83157ec86219519c0cbaf3122bdc997136 jdk7u45-b33
 aa24e046a2da95637257c9effeaabe254db0aa0b jdk7u45-b34
--- a/.jcheck/conf	Thu Dec 19 09:31:40 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
--- a/make/Makefile	Thu Dec 19 09:31:40 2013 -0800
+++ b/make/Makefile	Fri Jan 17 20:22:44 2014 +0000
@@ -150,7 +150,7 @@
 
 #----- bin.zip
 
-BIN_ZIP_FILES = $(BUILD_DIR/lib/orb.idl $(BUILD_DIR)/lib/ir.idl
+BIN_ZIP_FILES = $(BUILD_DIR)/lib/orb.idl $(BUILD_DIR)/lib/ir.idl
 
 BIN_ZIP = $(LIB_DIR)/bin.zip
 $(BIN_ZIP): $(BIN_ZIP_FILES)
--- a/make/common/shared/Defs-java.gmk	Thu Dec 19 09:31:40 2013 -0800
+++ b/make/common/shared/Defs-java.gmk	Fri Jan 17 20:22:44 2014 +0000
@@ -81,7 +81,7 @@
 ifeq ($(ARCH_DATA_MODEL), 32)
   JAVAC_JVM_FLAGS    += -J-XX:ThreadStackSize=768
 else
-  JAVAC_JVM_FLAGS    += -J-XX:ThreadStackSize=1536
+  JAVAC_JVM_FLAGS    += -J-XX:ThreadStackSize=1664
 endif
 JAVAC_JVM_FLAGS    += $(JAVA_TOOLS_FLAGS:%=-J%)
 
--- a/make/common/shared/Platform.gmk	Thu Dec 19 09:31:40 2013 -0800
+++ b/make/common/shared/Platform.gmk	Fri Jan 17 20:22:44 2014 +0000
@@ -153,6 +153,9 @@
   OS_VERSION := $(shell uname -r)
   # Arch and OS name/version
   mach := $(shell uname -m)
+  ifneq (,$(wildcard /usr/bin/dpkg-architecture))
+    mach := $(shell (dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/arm64/aarch64/;s/powerpc$$/ppc/;s/hppa/parisc/')
+  endif
   archExpr = case "$(mach)" in \
                 i[3-9]86) \
                     echo i586 \
@@ -169,6 +172,9 @@
                 arm*) \
                     echo arm \
                     ;; \
+                sh*) \
+                    echo sh \
+		    ;; \
                 *) \
                     echo $(mach) \
                     ;; \
@@ -196,6 +202,9 @@
       else
         ARCH_DATA_MODEL=64
       endif
+      ifeq ($(ARCH), sh)
+        ARCH_DATA_MODEL=32
+      endif
     endif
   endif