Mercurial > hg > openjdk > jigsaw > corba
changeset 387:1207721d6806
Merge
author | mchung |
---|---|
date | Thu, 03 May 2012 15:55:25 -0700 |
parents | 7d6afcc9f1e8 (current diff) 4a653e435441 (diff) |
children | 579f13b80121 |
files | .hgtags |
diffstat | 4 files changed, 60 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Apr 13 12:29:38 2012 +0100 +++ b/.hgtags Thu May 03 15:55:25 2012 -0700 @@ -162,3 +162,5 @@ 5d820cb6b1afd75b619e7fd69e4f2b0eb1d5d6a1 jdk8-b32 1e2ac1ea3f6c32a62bf88f3fa330120c30db59cb jdk8-b33 e24c5cc8b0f7cc48374eef0f995838fb4823e0eb jdk8-b34 +e3d735914edd0a621b16bb85417423f8e6af5d51 jdk8-b35 +a5a61f259961a7f46b002e5cc50b4a9bf86927b6 jdk8-b36
--- a/make/common/shared/Platform.gmk Fri Apr 13 12:29:38 2012 +0100 +++ b/make/common/shared/Platform.gmk Thu May 03 15:55:25 2012 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2012, 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 @@ -275,7 +275,7 @@ echo sparc \ ;; \ x86_64) \ - echo amd64 \ + echo x86_64 \ ;; \ "Power Macintosh") \ echo ppc \ @@ -287,12 +287,13 @@ ARCH := $(shell $(archExpr) ) ARCH_FAMILY := $(ARCH) - # Darwin x86 builds are i386/amd64 universal. - ifeq ($(SYSTEM_UNAME), Darwin) - ifneq ($(ARCH), ppc) - ARCH=universal - endif - endif + # Darwin builds are currently universal but only include 64-bit + # + # ifeq ($(SYSTEM_UNAME), Darwin) + # ifneq ($(ARCH), ppc) + # ARCH=universal + # endif + # endif # i586, sparc, and ppc are 32 bit, amd64 and sparc64 are 64 ifneq (,$(findstring $(ARCH), i586 sparc ppc universal))
--- a/src/share/classes/com/sun/corba/se/impl/orbutil/DefineWrapper.sjava Fri Apr 13 12:29:38 2012 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/orbutil/DefineWrapper.sjava Thu May 03 15:55:25 2012 -0700 @@ -1,3 +1,28 @@ +/* + * Copyright (c) 2001, 2012, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + package com.sun.corba.se.impl.orbutil ; import java.lang.reflect.Method;
--- a/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLTypesUtil_save.sjava Fri Apr 13 12:29:38 2012 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLTypesUtil_save.sjava Thu May 03 15:55:25 2012 -0700 @@ -1,3 +1,27 @@ +/* + * Copyright (c) 2004, 2012, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ package com.sun.corba.se.impl.presentation.rmi ;