Skip to content
Snippets Groups Projects
Commit 862a2250 authored by Rodrigo Mesquita's avatar Rodrigo Mesquita :seedling: Committed by Zubin
Browse files

darwin: Fix single_module is obsolete warning

In XCode 15's linker, -single_module is the default and otherwise
passing it as a flag results in a warning being raised:

    ld: warning: -single_module is obsolete

This patch fixes this warning by, at configure time, determining whether
the linker supports -single_module (which is likely false for all
non-darwin linkers, and true for darwin linkers in previous versions of
macOS), and using that information at runtime to decide to pass or not
the flag in the invocation.

Fixes #24168

(cherry picked from commit e6c803f7)
parent cff8f688
No related branches found
No related tags found
No related merge requests found
Pipeline #87869 failed
......@@ -11,6 +11,7 @@ where
import GHC.Prelude
import GHC.Platform
import GHC.Platform.Ways
import GHC.Settings (ToolSettings(toolSettings_ldSupportsSingleModule))
import GHC.Driver.Config.Linker
import GHC.Driver.Session
......@@ -150,6 +151,9 @@ linkDynLib logger tmpfs dflags0 unit_env o_files dep_packages
-- dynamic binding nonsense when referring to symbols from
-- within the library. The NCG assumes that this option is
-- specified (on i386, at least).
-- In XCode 15, -single_module is the default and passing the
-- flag is now obsolete and raises a warning (#24168). We encode
-- this information into the toolchain field ...SupportsSingleModule.
-- -install_name
-- Mac OS/X stores the path where a dynamic library is (to
-- be) installed in the library itself. It's called the
......@@ -175,8 +179,11 @@ linkDynLib logger tmpfs dflags0 unit_env o_files dep_packages
]
++ map Option o_files
++ [ Option "-undefined",
Option "dynamic_lookup",
Option "-single_module" ]
Option "dynamic_lookup"
]
++ (if toolSettings_ldSupportsSingleModule (toolSettings dflags)
then [ Option "-single_module" ]
else [ ])
++ (if platformArch platform `elem` [ ArchX86_64, ArchAArch64 ]
then [ ]
else [ Option "-Wl,-read_only_relocs,suppress" ])
......
......@@ -87,6 +87,7 @@ data Settings = Settings
data ToolSettings = ToolSettings
{ toolSettings_ldSupportsCompactUnwind :: Bool
, toolSettings_ldSupportsFilelist :: Bool
, toolSettings_ldSupportsSingleModule :: Bool
, toolSettings_ldIsGnuLd :: Bool
, toolSettings_ccSupportsNoPie :: Bool
, toolSettings_useInplaceMinGW :: Bool
......
......@@ -95,6 +95,7 @@ initSettings top_dir = do
cxx_args = words cxx_args_str
ldSupportsCompactUnwind <- getBooleanSetting "ld supports compact unwind"
ldSupportsFilelist <- getBooleanSetting "ld supports filelist"
ldSupportsSingleModule <- getBooleanSetting "ld supports single module"
ldIsGnuLd <- getBooleanSetting "ld is GNU ld"
arSupportsDashL <- getBooleanSetting "ar supports -L"
......@@ -163,6 +164,7 @@ initSettings top_dir = do
, sToolSettings = ToolSettings
{ toolSettings_ldSupportsCompactUnwind = ldSupportsCompactUnwind
, toolSettings_ldSupportsFilelist = ldSupportsFilelist
, toolSettings_ldSupportsSingleModule = ldSupportsSingleModule
, toolSettings_ldIsGnuLd = ldIsGnuLd
, toolSettings_ccSupportsNoPie = gccSupportsNoPie
, toolSettings_useInplaceMinGW = useInplaceMinGW
......
......@@ -502,6 +502,7 @@ FP_PROG_LD_IS_GNU
FP_PROG_LD_BUILD_ID
FP_PROG_LD_NO_COMPACT_UNWIND
FP_PROG_LD_FILELIST
FP_PROG_LD_SINGLE_MODULE
dnl ** Which nm to use?
dnl --------------------------------------------------------------
......
......@@ -134,6 +134,7 @@ FP_PROG_LD_IS_GNU
FP_PROG_LD_BUILD_ID
FP_PROG_LD_NO_COMPACT_UNWIND
FP_PROG_LD_FILELIST
FP_PROG_LD_SINGLE_MODULE
dnl ** which strip to use?
dnl --------------------------------------------------------------
......
......@@ -92,6 +92,7 @@ lib/settings : config.mk
@echo ',("ld flags", "$(SettingsLdFlags)")' >> $@
@echo ',("ld supports compact unwind", "$(LdHasNoCompactUnwind)")' >> $@
@echo ',("ld supports filelist", "$(LdHasFilelist)")' >> $@
@echo ',("ld supports single module", "$(LdHasSingleModule)")' >> $@
@echo ',("ld is GNU ld", "$(LdIsGNULd)")' >> $@
@echo ',("Merge objects command", "$(SettingsMergeObjectsCommand)")' >> $@
@echo ',("Merge objects flags", "$(SettingsMergeObjectsFlags)")' >> $@
......
......@@ -240,6 +240,7 @@ LdHasBuildId = @LdHasBuildId@
LdHasFilelist = @LdHasFilelist@
LdIsGNULd = @LdIsGNULd@
LdHasNoCompactUnwind = @LdHasNoCompactUnwind@
LdHasSingleModule = @LdHasSingleModule@
ArArgs = @ArArgs@
ArSupportsAtFile = @ArSupportsAtFile@
ArSupportsDashL = @ArSupportsDashL@
......
......@@ -141,6 +141,7 @@ gcc-extra-via-c-opts = @GccExtraViaCOpts@
ld-has-no-compact-unwind = @LdHasNoCompactUnwind@
ld-has-filelist = @LdHasFilelist@
ld-is-gnu-ld = @LdIsGNULd@
ld-supports-single-module = @LdHasSingleModule@
ar-args = @ArArgs@
settings-c-compiler-command = @SettingsCCompilerCommand@
......
......@@ -430,6 +430,7 @@ generateSettings = do
, ("ld supports compact unwind", expr $ lookupSystemConfig "ld-has-no-compact-unwind")
, ("ld supports filelist", expr $ lookupSystemConfig "ld-has-filelist")
, ("ld is GNU ld", expr $ lookupSystemConfig "ld-is-gnu-ld")
, ("ld supports single module", expr $ lookupSystemConfig "ld-supports-single-module")
, ("Merge objects command", expr $ settingsFileSetting SettingsFileSetting_MergeObjectsCommand)
, ("Merge objects flags", expr $ settingsFileSetting SettingsFileSetting_MergeObjectsFlags)
, ("ar command", expr $ settingsFileSetting SettingsFileSetting_ArCommand)
......
# FP_PROG_LD_SINGLE_MODULE
# ----------------------------
# Sets the output variable LdHasSingleModule to YES if the darwin ld supports
# -single_module, or NO otherwise.
#
# In XCode 15, -single_module is a default and passing it as a flag raises a
# warning.
AC_DEFUN([FP_PROG_LD_SINGLE_MODULE],
[
AC_CACHE_CHECK([whether ld supports -single_module], [fp_cv_ld_single_module],
[
case $target in
*-darwin)
echo 'int foo(int x) { return x*x; }' > conftest.c
echo 'extern int foo(int); int main() { return foo(5); }' > conftestmain.c
"$CC" -c -o conftestmain.o conftestmain.c
"$CC" -shared -o conftest.dylib conftest.c
if "$CC" -Wl,-single_module -o conftest conftestmain.o conftest.dylib 2>&1 | grep obsolete > /dev/null; then
fp_cv_ld_single_module=no
else
fp_cv_ld_single_module=yes
fi
rm -rf conftest* ;;
*)
fp_cv_ld_single_module=no ;;
esac
])
FP_CAPITALIZE_YES_NO(["$fp_cv_ld_single_module"], [LdHasSingleModule])
AC_SUBST([LdHasSingleModule])
])# FP_PROG_LD_SINGLE_MODULE
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment