Skip to content

Commit e85a082

Browse files
satyenmesatyenme
committed
Merge develop
2 parents 9eeeca5 + 00557a9 commit e85a082

File tree

3 files changed

+23
-74
lines changed

3 files changed

+23
-74
lines changed

‎common/autoconf/flags.m4‎

Lines changed: 7 additions & 32 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
@@ -729,37 +729,12 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK],
729729
730730
# Additional macosx handling
731731
if test "x$OPENJDK_TARGET_OS" = xmacosx; then
732-
if test "x$TOOLCHAIN_TYPE" = xgcc; then
733-
# FIXME: This needs to be exported in spec.gmk due to closed legacy code.
734-
# FIXME: clean this up, and/or move it elsewhere.
735-
736-
# Setting these parameters makes it an error to link to macosx APIs that are
737-
# newer than the given OS version and makes the linked binaries compatible
738-
# even if built on a newer version of the OS.
739-
# The expected format is X.Y.Z
740-
MACOSX_VERSION_MIN=10.9.0
741-
AC_SUBST(MACOSX_VERSION_MIN)
742-
743-
# The macro takes the version with no dots, ex: 1070
744-
# Let the flags variables get resolved in make for easier override on make
745-
# command line.
746-
CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MIN)) -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
747-
LDFLAGS_JDK="$LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
748-
elif test "x$TOOLCHAIN_TYPE" = xclang; then
749-
# FIXME: This needs to be exported in spec.gmk due to closed legacy code.
750-
# FIXME: clean this up, and/or move it elsewhere.
751-
752-
# Setting these parameters makes it an error to link to macosx APIs that are
753-
# newer than the given OS version and makes the linked binaries compatible
754-
# even if built on a newer version of the OS.
755-
# The expected format is X.Y.Z
756-
if test "x$OPENJDK_TARGET_CPU_ARCH" = "xx86" || test "x$OPENJDK_TARGET_CPU_ARCH" = "xx86_64"; then
757-
MACOSX_VERSION_MIN=10.9.0
758-
AC_SUBST(MACOSX_VERSION_MIN)
759-
else
760-
MACOSX_VERSION_MIN=11.00.00
761-
AC_SUBST(MACOSX_VERSION_MIN)
762-
fi
732+
# Setting these parameters makes it an error to link to macOS APIs that are
733+
# newer than the given OS version and makes the linked binaries compatible
734+
# even if built on a newer version of the OS.
735+
# The expected format is X.Y.Z
736+
MACOSX_VERSION_MIN=11.00.00
737+
AC_SUBST(MACOSX_VERSION_MIN)
763738
764739
# The macro takes the version with no dots, ex: 1070
765740
# Let the flags variables get resolved in make for easier override on make

‎common/autoconf/generated-configure.sh‎

Lines changed: 14 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -3743,7 +3743,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
37433743

37443744

37453745
#
3746-
# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
3746+
# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
37473747
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
37483748
#
37493749
# This code is free software; you can redistribute it and/or modify it
@@ -4455,7 +4455,7 @@ VS_TOOLSET_SUPPORTED_2022=true
44554455
#CUSTOM_AUTOCONF_INCLUDE
44564456

44574457
# Do not change or remove the following line, it is needed for consistency checks:
4458-
DATE_WHEN_GENERATED=1763677032
4458+
DATE_WHEN_GENERATED=1766720598
44594459

44604460
###############################################################################
44614461
#
@@ -43582,44 +43582,18 @@ $as_echo "$supports" >&6; }
4358243582

4358343583
# Additional macosx handling
4358443584
if test "x$OPENJDK_TARGET_OS" = xmacosx; then
43585-
if test "x$TOOLCHAIN_TYPE" = xgcc; then
43586-
# FIXME: This needs to be exported in spec.gmk due to closed legacy code.
43587-
# FIXME: clean this up, and/or move it elsewhere.
43588-
43589-
# Setting these parameters makes it an error to link to macosx APIs that are
43590-
# newer than the given OS version and makes the linked binaries compatible
43591-
# even if built on a newer version of the OS.
43592-
# The expected format is X.Y.Z
43593-
MACOSX_VERSION_MIN=10.9.0
43594-
43595-
43596-
# The macro takes the version with no dots, ex: 1070
43597-
# Let the flags variables get resolved in make for easier override on make
43598-
# command line.
43599-
CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MIN)) -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
43600-
LDFLAGS_JDK="$LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
43601-
elif test "x$TOOLCHAIN_TYPE" = xclang; then
43602-
# FIXME: This needs to be exported in spec.gmk due to closed legacy code.
43603-
# FIXME: clean this up, and/or move it elsewhere.
43604-
43605-
# Setting these parameters makes it an error to link to macosx APIs that are
43606-
# newer than the given OS version and makes the linked binaries compatible
43607-
# even if built on a newer version of the OS.
43608-
# The expected format is X.Y.Z
43609-
if test "x$OPENJDK_TARGET_CPU_ARCH" = "xx86" || test "x$OPENJDK_TARGET_CPU_ARCH" = "xx86_64"; then
43610-
MACOSX_VERSION_MIN=10.9.0
43611-
43612-
else
43613-
MACOSX_VERSION_MIN=11.00.00
43614-
43615-
fi
43616-
43617-
# The macro takes the version with no dots, ex: 1070
43618-
# Let the flags variables get resolved in make for easier override on make
43619-
# command line.
43620-
CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MIN_REQUIRED=\$(subst .,,\$(MACOSX_VERSION_MIN)) -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MIN)) -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
43621-
LDFLAGS_JDK="$LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
43622-
fi
43585+
# Setting these parameters makes it an error to link to macOS APIs that are
43586+
# newer than the given OS version and makes the linked binaries compatible
43587+
# even if built on a newer version of the OS.
43588+
# The expected format is X.Y.Z
43589+
MACOSX_VERSION_MIN=11.00.00
43590+
43591+
43592+
# The macro takes the version with no dots, ex: 1070
43593+
# Let the flags variables get resolved in make for easier override on make
43594+
# command line.
43595+
CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MIN_REQUIRED=\$(subst .,,\$(MACOSX_VERSION_MIN)) -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MIN)) -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
43596+
LDFLAGS_JDK="$LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
4362343597
fi
4362443598

4362543599
# Setup some hard coded includes

‎hotspot/make/bsd/makefiles/gcc.make‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 1999, 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
@@ -345,7 +345,7 @@ ifeq ($(OS_VENDOR), Darwin)
345345
# if built on a newer version of the OS.
346346
# The expected format is X.Y.Z
347347
ifeq ($(MACOSX_VERSION_MIN),)
348-
MACOSX_VERSION_MIN=10.7.0
348+
MACOSX_VERSION_MIN=11.00.00
349349
endif
350350
# The macro takes the version with no dots, ex: 1070
351351
CFLAGS += -DMAC_OS_X_VERSION_MIN_REQUIRED=$(subst .,,$(MACOSX_VERSION_MIN)) \

0 commit comments

Comments
 (0)