Mercurial > jdk8-mips64-public > corba / changeset

     1.1 --- a/.hgtags	Tue May 08 07:27:46 2012 -0700
     1.2 +++ b/.hgtags	Mon May 21 14:50:53 2012 -0700
     1.3 @@ -158,3 +158,6 @@
     1.4  e24c5cc8b0f7cc48374eef0f995838fb4823e0eb jdk8-b34
     1.5  e3d735914edd0a621b16bb85417423f8e6af5d51 jdk8-b35
     1.6  a5a61f259961a7f46b002e5cc50b4a9bf86927b6 jdk8-b36
     1.7 +83fac66442cf680bb59ec9e3a71cc4729322b595 jdk8-b37
     1.8 +b8cbfb31139f820e5e094ba71449e58159fbe22e jdk8-b38
     1.9 +785af00e2827990f149b32ec37f523dbca3efdd1 jdk8-b39

     2.1 --- a/make/common/shared/Platform.gmk	Tue May 08 07:27:46 2012 -0700
     2.2 +++ b/make/common/shared/Platform.gmk	Mon May 21 14:50:53 2012 -0700
     2.3 @@ -1,5 +1,5 @@
     2.4  #
     2.5 -# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
     2.6 +# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
     2.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.8  #
     2.9  # This code is free software; you can redistribute it and/or modify it
    2.10 @@ -275,7 +275,7 @@
    2.11                      echo sparc \
    2.12                      ;; \
    2.13                  x86_64) \
    2.14 -                    echo amd64 \
    2.15 +                    echo x86_64 \
    2.16                      ;; \
    2.17                  "Power Macintosh") \
    2.18                      echo ppc \
    2.19 @@ -287,12 +287,13 @@
    2.20    ARCH        := $(shell $(archExpr) )
    2.21    ARCH_FAMILY := $(ARCH)
    2.22  
    2.23 -  # Darwin x86 builds are i386/amd64 universal.
    2.24 -  ifeq ($(SYSTEM_UNAME), Darwin)
    2.25 -    ifneq ($(ARCH), ppc)
    2.26 -      ARCH=universal
    2.27 -    endif
    2.28 -  endif
    2.29 +  # Darwin builds are currently universal but only include 64-bit
    2.30 +  # 
    2.31 +  # ifeq ($(SYSTEM_UNAME), Darwin)
    2.32 +  #  ifneq ($(ARCH), ppc)
    2.33 +  #    ARCH=universal
    2.34 +  #  endif
    2.35 +  # endif
    2.36  
    2.37    # i586, sparc, and ppc are 32 bit, amd64 and sparc64 are 64
    2.38    ifneq (,$(findstring $(ARCH), i586 sparc ppc universal))

     3.1 --- a/src/share/classes/com/sun/corba/se/impl/orbutil/DefineWrapper.sjava	Tue May 08 07:27:46 2012 -0700
     3.2 +++ b/src/share/classes/com/sun/corba/se/impl/orbutil/DefineWrapper.sjava	Mon May 21 14:50:53 2012 -0700
     3.3 @@ -1,3 +1,28 @@
     3.4 +/*
     3.5 + * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
     3.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3.7 + *
     3.8 + * This code is free software; you can redistribute it and/or modify it
     3.9 + * under the terms of the GNU General Public License version 2 only, as
    3.10 + * published by the Free Software Foundation.  Oracle designates this
    3.11 + * particular file as subject to the "Classpath" exception as provided
    3.12 + * by Oracle in the LICENSE file that accompanied this code.
    3.13 + *
    3.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
    3.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    3.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    3.17 + * version 2 for more details (a copy is included in the LICENSE file that
    3.18 + * accompanied this code).
    3.19 + *
    3.20 + * You should have received a copy of the GNU General Public License version
    3.21 + * 2 along with this work; if not, write to the Free Software Foundation,
    3.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    3.23 + *
    3.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    3.25 + * or visit www.oracle.com if you need additional information or have any
    3.26 + * questions.
    3.27 + */
    3.28 +
    3.29  package com.sun.corba.se.impl.orbutil ;
    3.30  
    3.31  import java.lang.reflect.Method;

     4.1 --- a/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLTypesUtil_save.sjava	Tue May 08 07:27:46 2012 -0700
     4.2 +++ b/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLTypesUtil_save.sjava	Mon May 21 14:50:53 2012 -0700
     4.3 @@ -1,3 +1,27 @@
     4.4 +/*
     4.5 + * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
     4.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4.7 + *
     4.8 + * This code is free software; you can redistribute it and/or modify it
     4.9 + * under the terms of the GNU General Public License version 2 only, as
    4.10 + * published by the Free Software Foundation.  Oracle designates this
    4.11 + * particular file as subject to the "Classpath" exception as provided
    4.12 + * by Oracle in the LICENSE file that accompanied this code.
    4.13 + *
    4.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
    4.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    4.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    4.17 + * version 2 for more details (a copy is included in the LICENSE file that
    4.18 + * accompanied this code).
    4.19 + *
    4.20 + * You should have received a copy of the GNU General Public License version
    4.21 + * 2 along with this work; if not, write to the Free Software Foundation,
    4.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    4.23 + *
    4.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    4.25 + * or visit www.oracle.com if you need additional information or have any
    4.26 + * questions.
    4.27 + */
    4.28  
    4.29  package com.sun.corba.se.impl.presentation.rmi ;
    4.30