Mercurial > jdk8-mips64-public > corba / changeset

     1.1 --- a/make/common/shared/Platform.gmk	Wed May 09 13:07:38 2012 -0700
     1.2 +++ b/make/common/shared/Platform.gmk	Wed May 09 13:11:47 2012 -0700
     1.3 @@ -1,5 +1,5 @@
     1.4  #
     1.5 -# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
     1.6 +# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
     1.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8  #
     1.9  # This code is free software; you can redistribute it and/or modify it
    1.10 @@ -275,7 +275,7 @@
    1.11                      echo sparc \
    1.12                      ;; \
    1.13                  x86_64) \
    1.14 -                    echo amd64 \
    1.15 +                    echo x86_64 \
    1.16                      ;; \
    1.17                  "Power Macintosh") \
    1.18                      echo ppc \
    1.19 @@ -287,12 +287,13 @@
    1.20    ARCH        := $(shell $(archExpr) )
    1.21    ARCH_FAMILY := $(ARCH)
    1.22  
    1.23 -  # Darwin x86 builds are i386/amd64 universal.
    1.24 -  ifeq ($(SYSTEM_UNAME), Darwin)
    1.25 -    ifneq ($(ARCH), ppc)
    1.26 -      ARCH=universal
    1.27 -    endif
    1.28 -  endif
    1.29 +  # Darwin builds are currently universal but only include 64-bit
    1.30 +  # 
    1.31 +  # ifeq ($(SYSTEM_UNAME), Darwin)
    1.32 +  #  ifneq ($(ARCH), ppc)
    1.33 +  #    ARCH=universal
    1.34 +  #  endif
    1.35 +  # endif
    1.36  
    1.37    # i586, sparc, and ppc are 32 bit, amd64 and sparc64 are 64
    1.38    ifneq (,$(findstring $(ARCH), i586 sparc ppc universal))

     2.1 --- a/src/share/classes/com/sun/corba/se/impl/orbutil/DefineWrapper.sjava	Wed May 09 13:07:38 2012 -0700
     2.2 +++ b/src/share/classes/com/sun/corba/se/impl/orbutil/DefineWrapper.sjava	Wed May 09 13:11:47 2012 -0700
     2.3 @@ -1,3 +1,28 @@
     2.4 +/*
     2.5 + * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
     2.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.7 + *
     2.8 + * This code is free software; you can redistribute it and/or modify it
     2.9 + * under the terms of the GNU General Public License version 2 only, as
    2.10 + * published by the Free Software Foundation.  Oracle designates this
    2.11 + * particular file as subject to the "Classpath" exception as provided
    2.12 + * by Oracle in the LICENSE file that accompanied this code.
    2.13 + *
    2.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
    2.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    2.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    2.17 + * version 2 for more details (a copy is included in the LICENSE file that
    2.18 + * accompanied this code).
    2.19 + *
    2.20 + * You should have received a copy of the GNU General Public License version
    2.21 + * 2 along with this work; if not, write to the Free Software Foundation,
    2.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2.23 + *
    2.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    2.25 + * or visit www.oracle.com if you need additional information or have any
    2.26 + * questions.
    2.27 + */
    2.28 +
    2.29  package com.sun.corba.se.impl.orbutil ;
    2.30  
    2.31  import java.lang.reflect.Method;

     3.1 --- a/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLTypesUtil_save.sjava	Wed May 09 13:07:38 2012 -0700
     3.2 +++ b/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLTypesUtil_save.sjava	Wed May 09 13:11:47 2012 -0700
     3.3 @@ -1,3 +1,27 @@
     3.4 +/*
     3.5 + * Copyright (c) 2004, 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.presentation.rmi ;
    3.30