8166799: ASSEMBLY_EXCEPTION contains historical company name

Reviewed-by: mchung, tbell
This commit is contained in:
Iris Clark 2016-10-06 18:06:04 -07:00
parent 121ffd6f67
commit 36bc804e6b

View File

@ -1,27 +1,27 @@
OPENJDK ASSEMBLY EXCEPTION OPENJDK ASSEMBLY EXCEPTION
The OpenJDK source code made available by Sun at openjdk.java.net and The OpenJDK source code made available by Oracle America, Inc. (Oracle) at
openjdk.dev.java.net ("OpenJDK Code") is distributed under the terms of the openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU
GNU General Public License <http://www.gnu.org/copyleft/gpl.html> version 2 General Public License <http://www.gnu.org/copyleft/gpl.html> version 2
only ("GPL2"), with the following clarification and special exception. only ("GPL2"), with the following clarification and special exception.
Linking this OpenJDK Code statically or dynamically with other code Linking this OpenJDK Code statically or dynamically with other code
is making a combined work based on this library. Thus, the terms is making a combined work based on this library. Thus, the terms
and conditions of GPL2 cover the whole combination. and conditions of GPL2 cover the whole combination.
As a special exception, Sun gives you permission to link this As a special exception, Oracle gives you permission to link this
OpenJDK Code with certain code licensed by Sun as indicated at OpenJDK Code with certain code licensed by Oracle as indicated at
http://openjdk.java.net/legal/exception-modules-2007-05-08.html http://openjdk.java.net/legal/exception-modules-2007-05-08.html
("Designated Exception Modules") to produce an executable, ("Designated Exception Modules") to produce an executable,
regardless of the license terms of the Designated Exception Modules, regardless of the license terms of the Designated Exception Modules,
and to copy and distribute the resulting executable under GPL2, and to copy and distribute the resulting executable under GPL2,
provided that the Designated Exception Modules continue to be provided that the Designated Exception Modules continue to be
governed by the licenses under which they were offered by Sun. governed by the licenses under which they were offered by Oracle.
As such, it allows licensees and sublicensees of Sun's GPL2 OpenJDK Code to As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code
build an executable that includes those portions of necessary code that Sun to build an executable that includes those portions of necessary code that
could not provide under GPL2 (or that Sun has provided under GPL2 with the Oracle could not provide under GPL2 (or that Oracle has provided under GPL2
Classpath exception). If you modify or add to the OpenJDK code, that new with the Classpath exception). If you modify or add to the OpenJDK code,
GPL2 code may still be combined with Designated Exception Modules if the that new GPL2 code may still be combined with Designated Exception Modules
new code is made subject to this exception by its copyright holder. if the new code is made subject to this exception by its copyright holder.