Ignore:
Timestamp:
Mar 26, 2011, 8:39:20 PM (14 years ago)
Author:
dmik
Message:

trunk: Merged in openjdk6 b22 from branches/vendor/oracle.

Location:
trunk/openjdk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/openjdk

  • trunk/openjdk/hotspot/ASSEMBLY_EXCEPTION

    r2 r278  
    22OPENJDK ASSEMBLY EXCEPTION
    33
    4 The OpenJDK source code made available by Sun at openjdk.java.net and
     4The OpenJDK source code made available by Oracle at openjdk.java.net and
    55openjdk.dev.java.net ("OpenJDK Code") is distributed under the terms of the
    66GNU General Public License <http://www.gnu.org/copyleft/gpl.html> version 2
    … …  
    1111    and conditions of GPL2 cover the whole combination.
    1212
    13     As a special exception, Sun gives you permission to link this
    14     OpenJDK Code with certain code licensed by Sun as indicated at
     13    As a special exception, Oracle gives you permission to link this
     14    OpenJDK Code with certain code licensed by Oracle as indicated at
    1515    http://openjdk.java.net/legal/exception-modules-2007-05-08.html
    1616    ("Designated Exception Modules") to produce an executable,
    … …  
    1818    and to copy and distribute the resulting executable under GPL2,
    1919    provided that the Designated Exception Modules continue to be
    20     governed by the licenses under which they were offered by Sun.
     20    governed by the licenses under which they were offered by Oracle.
    2121
    22 As such, it allows licensees and sublicensees of Sun's GPL2 OpenJDK Code to
    23 build an executable that includes those portions of necessary code that Sun
    24 could not provide under GPL2 (or that Sun has provided under GPL2 with the
     22As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code to
     23build an executable that includes those portions of necessary code that Oracle
     24could not provide under GPL2 (or that Oracle has provided under GPL2 with the
    2525Classpath exception).  If you modify or add to the OpenJDK code, that new
    2626GPL2 code may still be combined with Designated Exception Modules if the
Note: See TracChangeset for help on using the changeset viewer.