From 086c044dc34dfc0f74fbe41f4ecb402b2cd34884 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:13:33 +0200 Subject: Merging upstream version 125.0.1. Signed-off-by: Daniel Baumann --- build/moz.configure/flags.configure | 48 ++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 22 deletions(-) (limited to 'build/moz.configure/flags.configure') diff --git a/build/moz.configure/flags.configure b/build/moz.configure/flags.configure index 8354b9af34..d07d31f713 100644 --- a/build/moz.configure/flags.configure +++ b/build/moz.configure/flags.configure @@ -145,42 +145,43 @@ def file_prefix_map_flags(path_remapping, path_remappings, compiler): set_config("MOZ_FILE_PREFIX_MAP_FLAGS", file_prefix_map_flags) -@depends(c_compiler) -def is_gcc(c_compiler): - return c_compiler.type == "gcc" - - -@depends(c_compiler) -def is_gnu_cc(c_compiler): - return c_compiler.type != "clang-cl" - - -@depends(developer_options, when=is_gnu_cc) +@depends(developer_options, when=building_with_gnu_cc) def check_build_id_uuid(developer_options): return developer_options -@depends(developer_options, when=is_gnu_cc) +@depends(developer_options, when=building_with_gnu_cc) def check_build_id_sha1(developer_options): return not developer_options -check_and_add_flag("-pipe", when=is_gcc) +check_and_add_flag("-pipe", when=building_with_gcc) check_and_add_linker_flag("-Wl,--build-id=uuid", when=check_build_id_uuid) check_and_add_linker_flag("-Wl,--build-id=sha1", when=check_build_id_sha1) -check_and_add_asm_flag("-Wa,--noexecstack", when=is_gnu_cc) -check_and_add_linker_flag("-Wl,-z,noexecstack", when=is_gnu_cc) -check_and_add_linker_flag("-Wl,-z,text", when=is_gnu_cc) -check_and_add_linker_flag("-Wl,-z,relro", when=is_gnu_cc) -check_and_add_linker_flag("-Wl,-z,now", when=is_gnu_cc) -check_and_add_linker_flag("-Wl,-z,nocopyreloc", when=is_gnu_cc) +check_and_add_asm_flag("-Wa,--noexecstack", when=building_with_gnu_cc) +check_and_add_linker_flag("-Wl,-z,noexecstack", when=building_with_gnu_cc) +check_and_add_linker_flag("-Wl,-z,text", when=building_with_gnu_cc) +check_and_add_linker_flag("-Wl,-z,relro", when=building_with_gnu_cc) +check_and_add_linker_flag("-Wl,-z,now", when=building_with_gnu_cc) +check_and_add_linker_flag("-Wl,-z,nocopyreloc", when=building_with_gnu_cc) +check_and_add_linker_optimize_flag("-Wl,-dead_strip", when=target_is_darwin & ~dtrace) -@depends("--enable-address-sanitizer", is_gnu_cc) -def check_Bsymbolic(enable_asan, is_gnu_cc): - return enable_asan and is_gnu_cc +have_linker_support_ignore_unresolved = try_link( + flags=["-Wl,--ignore-unresolved-symbol,environ"], + check_msg="for --ignore-unresolved-symbol option to the linker", + when=building_with_gnu_cc & gcc_use_gnu_ld, +) +add_old_configure_assignment( + "HAVE_LINKER_SUPPORT_IGNORE_UNRESOLVED", have_linker_support_ignore_unresolved +) + + +@depends("--enable-address-sanitizer", building_with_gnu_cc) +def check_Bsymbolic(enable_asan, building_with_gnu_cc): + return enable_asan and building_with_gnu_cc # ASan assumes no symbols are being interposed, and when that happens, @@ -195,4 +196,7 @@ check_and_add_linker_flag("-Wl,-Bsymbolic", when=check_Bsymbolic) add_old_configure_assignment("_COMPILATION_ASFLAGS", asm_flags.asflags) add_old_configure_assignment("_COMPILATION_HOST_ASFLAGS", asm_flags.host_asflags) add_old_configure_assignment("_COMPILATION_LDFLAGS", linker_flags.ldflags) +add_old_configure_assignment( + "_COMPILATION_OPTIMIZE_LDFLAGS", linker_optimize_flags.ldflags +) add_old_configure_assignment("_COMPILATION_HOST_LDFLAGS", linker_flags.host_ldflags) -- cgit v1.2.3