Skip to content

Commit 292d2f7

Browse files
committed
Merge remote-tracking branch 'jdk8u-dev/master' into 8313083-8u
2 parents 0be5b9f + 9954f8f commit 292d2f7

File tree

467 files changed

+56540
-47442
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

467 files changed

+56540
-47442
lines changed

.jcheck/conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[general]
22
project=jdk8u
33
jbs=JDK
4-
version=openjdk8u482
4+
version=openjdk8u492
55

66
[checks]
77
error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace

THIRD_PARTY_README

Lines changed: 158 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1028,12 +1028,12 @@ That's all there is to it!
10281028

10291029
-------------------------------------------------------------------------------
10301030

1031-
%% This notice is provided with respect to Freetype v2.9 which may be
1031+
%% This notice is provided with respect to Freetype v2.13.3 which may be
10321032
included with JRE 8, JDK 8, and OpenJDK 8.
10331033

10341034
--- begin of LICENSE ---
10351035

1036-
## The FreeType Project: Freetype v2.9
1036+
## The FreeType Project: Freetype v2.13.3
10371037

10381038

10391039
### FreeType Notice
@@ -1055,7 +1055,27 @@ which fits your needs best.
10551055

10561056
### FreeType License
10571057
```
1058-
The FreeType Project LICENSE
1058+
1059+
Copyright (C) 1996-2024 by David Turner, Robert Wilhelm, and Werner Lemberg.
1060+
Copyright (C) 2007-2024 by Dereg Clegg and Michael Toftdal.
1061+
Copyright (C) 1996-2024 by Just van Rossum, David Turner, Robert Wilhelm, and Werner Lemberg.
1062+
Copyright (C) 2022-2024 by David Turner, Robert Wilhelm, Werner Lemberg, George Williams, and
1063+
Copyright (C) 2004-2024 by Masatake YAMATO and Redhat K.K.
1064+
Copyright (C) 2007-2024 by Derek Clegg and Michael Toftdal.
1065+
Copyright (C) 2003-2024 by Masatake YAMATO, Red Hat K.K.,
1066+
Copyright (C) 1996-2024 by David Turner, Robert Wilhelm, Werner Lemberg, and Dominik Röttsches.
1067+
Copyright (C) 2007-2024 by David Turner.
1068+
Copyright (C) 2022-2024 by David Turner, Robert Wilhelm, Werner Lemberg, and Moazin Khatti.
1069+
Copyright (C) 2007-2024 by Rahul Bhalerao <rahul.bhalerao@redhat.com>, <b.rahul.pm@gmail.com>.
1070+
Copyright (C) 2008-2024 by David Turner, Robert Wilhelm, Werner Lemberg, and suzuki toshiya.
1071+
Copyright (C) 2013-2024 by Google, Inc.
1072+
Copyright (C) 2019-2024 by Nikhil Ramakrishnan, David Turner, Robert Wilhelm, and Werner Lemberg.
1073+
Copyright (C) 2009-2024 by Oran Agra and Mickey Gabel.
1074+
Copyright (C) 2018-2024 by David Turner, Robert Wilhelm, Dominik Röttsches, and Werner Lemberg.
1075+
Copyright (C) 2004-2024 by David Turner, Robert Wilhelm, Werner Lemberg, and George Williams.
1076+
1077+
1078+
The FreeType Project LICENSE
10591079
----------------------------
10601080

10611081
2006-Jan-27
@@ -1220,7 +1240,7 @@ Legal Terms
12201240

12211241
Our home page can be found at
12221242

1223-
http://www.freetype.org
1243+
https://www.freetype.org
12241244

12251245
```
12261246

@@ -1568,6 +1588,99 @@ consider it more useful to permit linking proprietary applications with the
15681588
library. If this is what you want to do, use the GNU Library General
15691589
Public License instead of this License.
15701590

1591+
```
1592+
1593+
### Additional Freetype Attributions
1594+
```
1595+
1596+
---------------------------------
1597+
The below applies to the following file(s):
1598+
libfreetype/src/psaux/psarrst.c
1599+
libfreetype/src/psaux/psarrst.h
1600+
libfreetype/src/psaux/psblues.c
1601+
libfreetype/src/psaux/psblues.h
1602+
libfreetype/src/psaux/pserror.c
1603+
libfreetype/src/psaux/pserror.h
1604+
libfreetype/src/psaux/psfixed.h
1605+
libfreetype/src/psaux/psfont.c
1606+
libfreetype/src/psaux/psfont.h
1607+
libfreetype/src/psaux/psft.c
1608+
libfreetype/src/psaux/psft.h
1609+
libfreetype/src/psaux/psglue.h
1610+
libfreetype/src/psaux/pshints.c
1611+
libfreetype/src/psaux/pshints.h
1612+
libfreetype/src/psaux/psintrp.c
1613+
libfreetype/src/psaux/psintrp.h
1614+
libfreetype/src/psaux/psread.c
1615+
libfreetype/src/psaux/psread.h
1616+
libfreetype/src/psaux/psstack.c
1617+
libfreetype/src/psaux/psstack.h
1618+
libfreetype/src/psaux/pstypes.h
1619+
1620+
Copyright (C) 2006-2014 Adobe Systems Incorporated.
1621+
1622+
This software, and all works of authorship, whether in source or
1623+
object code form as indicated by the copyright notice(s) included
1624+
herein (collectively, the "Work") is made available, and may only be
1625+
used, modified, and distributed under the FreeType Project License,
1626+
LICENSE.TXT. Additionally, subject to the terms and conditions of the
1627+
FreeType Project License, each contributor to the Work hereby grants
1628+
to any individual or legal entity exercising permissions granted by
1629+
the FreeType Project License and this section (hereafter, "You" or
1630+
"Your") a perpetual, worldwide, non-exclusive, no-charge,
1631+
royalty-free, irrevocable (except as stated in this section) patent
1632+
license to make, have made, use, offer to sell, sell, import, and
1633+
otherwise transfer the Work, where such license applies only to those
1634+
patent claims licensable by such contributor that are necessarily
1635+
infringed by their contribution(s) alone or by combination of their
1636+
contribution(s) with the Work to which such contribution(s) was
1637+
submitted. If You institute patent litigation against any entity
1638+
(including a cross-claim or counterclaim in a lawsuit) alleging that
1639+
the Work or a contribution incorporated within the Work constitutes
1640+
direct or contributory patent infringement, then any patent licenses
1641+
granted to You under this License for that Work shall terminate as of
1642+
the date such litigation is filed.
1643+
1644+
By using, modifying, or distributing the Work you indicate that you
1645+
have read and understood the terms and conditions of the
1646+
FreeType Project License as well as those provided in this section,
1647+
and you accept them fully.
1648+
1649+
1650+
```
1651+
1652+
### MIT License
1653+
```
1654+
1655+
---------------------------------
1656+
The below applies to the following file(s):
1657+
libfreetype/include/freetype/internal/fthash.h
1658+
libfreetype/src/base/fthash.c
1659+
1660+
Copyright (C) 2000 Computing Research Labs, New Mexico State University
1661+
Copyright (C) 2001-2015
1662+
1663+
Francesco Zappa Nardelli
1664+
1665+
Permission is hereby granted, free of charge, to any person obtaining a
1666+
copy of this software and associated documentation files (the "Software"),
1667+
to deal in the Software without restriction, including without limitation
1668+
the rights to use, copy, modify, merge, publish, distribute, sublicense,
1669+
and/or sell copies of the Software, and to permit persons to whom the
1670+
Software is furnished to do so, subject to the following conditions:
1671+
1672+
The above copyright notice and this permission notice shall be included in
1673+
all copies or substantial portions of the Software.
1674+
1675+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
1676+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
1677+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
1678+
THE COMPUTING RESEARCH LAB OR NEW MEXICO STATE UNIVERSITY BE LIABLE FOR ANY
1679+
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
1680+
OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
1681+
THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1682+
1683+
15711684
```
15721685

15731686
--- end of LICENSE ---
@@ -2018,7 +2131,7 @@ included with JDK 8 and OpenJDK 8 source distributions.
20182131

20192132
-------------------------------------------------------------------------------
20202133

2021-
%% This notice is provided with respect to libpng 1.6.39, which may be
2134+
%% This notice is provided with respect to libpng 1.6.51, which may be
20222135
included with JRE 8, JDK 8, and OpenJDK 8.
20232136

20242137
--- begin of LICENSE ---
@@ -2029,11 +2142,11 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE
20292142
PNG Reference Library License version 2
20302143
---------------------------------------
20312144

2032-
Copyright (c) 1995-2022 The PNG Reference Library Authors.
2033-
Copyright (c) 2018-2022 Cosmin Truta
2034-
Copyright (c) 1998-2018 Glenn Randers-Pehrson
2035-
Copyright (c) 1996-1997 Andreas Dilger
2036-
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
2145+
Copyright (C) 1995-2025 The PNG Reference Library Authors.
2146+
Copyright (C) 2018-2025 Cosmin Truta
2147+
Copyright (C) 1998-2018 Glenn Randers-Pehrson
2148+
Copyright (C) 1996-1997 Andreas Dilger
2149+
Copyright (C) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
20372150

20382151
The software is supplied "as is", without warranty of any kind,
20392152
express or implied, including, without limitation, the warranties
@@ -2193,7 +2306,9 @@ PNG REFERENCE LIBRARY AUTHORS
21932306
This is the list of PNG Reference Library ("libpng") Contributing
21942307
Authors, for copyright and licensing purposes.
21952308

2309+
* Adam Richter
21962310
* Andreas Dilger
2311+
* Chris Blume
21972312
* Cosmin Truta
21982313
* Dave Martindale
21992314
* Eric S. Raymond
@@ -2204,39 +2319,54 @@ Authors, for copyright and licensing purposes.
22042319
* James Yu
22052320
* John Bowler
22062321
* Kevin Bracey
2322+
* Lucas Chollet
22072323
* Magnus Holmgren
22082324
* Mandar Sahastrabuddhe
2325+
* Manfred Schlaegl
22092326
* Mans Rullgard
22102327
* Matt Sarett
22112328
* Mike Klein
22122329
* Pascal Massimino
22132330
* Paul Schmidt
2331+
* Philippe Antoine
22142332
* Qiang Zhou
22152333
* Sam Bushell
22162334
* Samuel Williams
22172335
* Simon-Pierre Cadieux
22182336
* Tim Wegner
2337+
* Tobias Stoeckmann
22192338
* Tom Lane
22202339
* Tom Tanner
22212340
* Vadim Barkov
22222341
* Willem van Schaik
22232342
* Zhijie Liang
2343+
* Apple Inc.
2344+
- Zixu Wang (王子旭)
22242345
* Arm Holdings
2225-
- Richard Townsend
2226-
* Google Inc.
2227-
- Dan Field
2228-
- Leon Scroggins III
2229-
- Matt Sarett
2230-
- Mike Klein
2231-
- Sami Boukortt
2346+
- Richard Townsend
2347+
* Google LLC
2348+
- Dan Field
2349+
- Dragoș Tiselice
2350+
- Leon Scroggins III
2351+
- Matt Sarett
2352+
- Mike Klein
2353+
- Sami Boukortt
2354+
- Wan-Teh Chang
2355+
* Loongson Technology Corporation Ltd.
2356+
- GuXiWei (顾希伟)
2357+
- JinBo (金波)
2358+
- ZhangLixia (张利霞)
2359+
* Samsung Group
2360+
- Filip Wasil
22322361

22332362
The build projects, the build scripts, the test scripts, and other
2234-
files in the "ci", "projects", "scripts" and "tests" directories, have
2363+
files in the "projects", "scripts" and "tests" directories, have
22352364
other copyright owners, but are released under the libpng license.
22362365

2237-
Some files in the "contrib" directory, and some tools-generated files
2238-
that are distributed with libpng, have other copyright owners, and are
2239-
released under other open source licenses.
2366+
Some files in the "ci" and "contrib" directories, as well as some
2367+
of the tools-generated files that are distributed with libpng, have
2368+
other copyright owners, and are released under other open source
2369+
licenses.
22402370

22412371
--- end of LICENSE ---
22422372

@@ -2271,7 +2401,7 @@ THE SOFTWARE.
22712401

22722402
-------------------------------------------------------------------------------
22732403

2274-
%% This notice is provided with respect to Little CMS 2.14, which may be
2404+
%% This notice is provided with respect to Little CMS 2.15, which may be
22752405
included with JRE 8, JDK 8, and OpenJDK 8.
22762406

22772407
--- begin of LICENSE ---
@@ -2283,7 +2413,7 @@ LittleCMS core is released under MIT License
22832413
---------------------------------
22842414

22852415
Little CMS
2286-
Copyright (c) 1998-2022 Marti Maria Saguer
2416+
Copyright (c) 1998-2023 Marti Maria Saguer
22872417

22882418
Permission is hereby granted, free of charge, to any person obtaining
22892419
a copy of this software and associated documentation files (the
@@ -2305,7 +2435,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
23052435
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
23062436

23072437
---------------------------------
2308-
23092438
The below license applies to the following files:
23102439
liblcms/cmssm.c
23112440

@@ -2317,9 +2446,9 @@ SoftSurfer makes no warranty for this code, and cannot be held
23172446
liable for any real or imagined damage resulting from its use.
23182447
Users of this code must verify correctness for their application.
23192448

2320-
23212449
AUTHORS File Information:
23222450

2451+
23232452
Main Author
23242453
------------
23252454
Marti Maria
@@ -2360,11 +2489,15 @@ Mark Allen
23602489
Noel Carboni
23612490
Sergei Trofimovic
23622491
Philipp Knechtges
2492+
Amyspark
2493+
Lovell Fuller
2494+
Eli Schwartz
23632495

23642496
Special Thanks
23652497
--------------
23662498
Artifex software
23672499
AlienSkin software
2500+
libVIPS
23682501
Jan Morovic
23692502
Jos Vernon (WebSupergoo)
23702503
Harald Schneider (Maxon)
@@ -2373,7 +2506,6 @@ Dimitrios Anastassakis
23732506
Lemke Software
23742507
Tim Zaman
23752508

2376-
23772509
--- end of LICENSE ---
23782510

23792511
-------------------------------------------------------------------------------

common/autoconf/flags.m4

Lines changed: 12 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -687,39 +687,18 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK],
687687
688688
# Additional macosx handling
689689
if test "x$OPENJDK_TARGET_OS" = xmacosx; then
690-
if test "x$TOOLCHAIN_TYPE" = xgcc; then
691-
# FIXME: This needs to be exported in spec.gmk due to closed legacy code.
692-
# FIXME: clean this up, and/or move it elsewhere.
693-
694-
# Setting these parameters makes it an error to link to macosx APIs that are
695-
# newer than the given OS version and makes the linked binaries compatible
696-
# even if built on a newer version of the OS.
697-
# The expected format is X.Y.Z
698-
MACOSX_VERSION_MIN=10.7.0
699-
AC_SUBST(MACOSX_VERSION_MIN)
700-
701-
# The macro takes the version with no dots, ex: 1070
702-
# Let the flags variables get resolved in make for easier override on make
703-
# command line.
704-
CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MIN)) -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
705-
LDFLAGS_JDK="$LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
706-
elif test "x$TOOLCHAIN_TYPE" = xclang; then
707-
# FIXME: This needs to be exported in spec.gmk due to closed legacy code.
708-
# FIXME: clean this up, and/or move it elsewhere.
709-
710-
# Setting these parameters makes it an error to link to macosx APIs that are
711-
# newer than the given OS version and makes the linked binaries compatible
712-
# even if built on a newer version of the OS.
713-
# The expected format is X.Y.Z
714-
MACOSX_VERSION_MIN=10.9.0
715-
AC_SUBST(MACOSX_VERSION_MIN)
690+
# Setting these parameters makes it an error to link to macOS APIs that are
691+
# newer than the given OS version and makes the linked binaries compatible
692+
# even if built on a newer version of the OS.
693+
# The expected format is X.Y.Z
694+
MACOSX_VERSION_MIN=11.00.00
695+
AC_SUBST(MACOSX_VERSION_MIN)
716696
717-
# The macro takes the version with no dots, ex: 1070
718-
# Let the flags variables get resolved in make for easier override on make
719-
# command line.
720-
CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MIN)) -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
721-
LDFLAGS_JDK="$LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
722-
fi
697+
# The macro takes the version with no dots, ex: 1070
698+
# Let the flags variables get resolved in make for easier override on make
699+
# command line.
700+
CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MIN)) -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
701+
LDFLAGS_JDK="$LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
723702
fi
724703
725704
# Setup some hard coded includes

0 commit comments

Comments
 (0)