diff --git a/fix-AA-deadlock-when-export-LD_PRELOAD-usr-lib64-lib.patch b/fix-AA-deadlock-when-export-LD_PRELOAD-usr-lib64-lib.patch new file mode 100644 index 0000000000000000000000000000000000000000..bcdf8991ff5118b09a9ddda28afd469e812acb5e --- /dev/null +++ b/fix-AA-deadlock-when-export-LD_PRELOAD-usr-lib64-lib.patch @@ -0,0 +1,25 @@ +From 451226713f1432b32cfc76223bfc77d38ba46b01 Mon Sep 17 00:00:00 2001 +From: xujing +Date: Sun, 12 Jun 2022 04:49:53 +0800 +Subject: [PATCH] fix AA deadlock when export + LD_PRELOAD=/usr/lib64/libasan.so.6 + +--- + .../sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp b/libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp +index c123ecb11..40ef01d65 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp ++++ b/libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp +@@ -72,7 +72,6 @@ static swift_demangle_ft swift_demangle_f; + // symbolication. + static void InitializeSwiftDemangler() { + swift_demangle_f = (swift_demangle_ft)dlsym(RTLD_DEFAULT, "swift_demangle"); +- (void)dlerror(); // Cleanup error message in case of failure + } + + // Attempts to demangle a Swift name. The demangler will return nullptr if a +-- +2.23.0 + diff --git a/gcc.spec b/gcc.spec index 3a0055f779768bb64a92245cca0e5f72a7de5d42..6025d5d35aada5e0ed70899b5a80d54bbd54d97d 100644 --- a/gcc.spec +++ b/gcc.spec @@ -2,7 +2,7 @@ %global gcc_major 12 # Note, gcc_release must be integer, if you want to add suffixes to # %%{release}, append them after %%{gcc_release} on Release: line. -%global gcc_release 64 +%global gcc_release 65 %global _unpackaged_files_terminate_build 0 %global _performance_build 1 @@ -438,6 +438,7 @@ Patch329: 0329-Fixed-work-with-loops-in-process_complex_cond.patch Patch330: 0330-bugfix-fix-typo-error.patch Patch331: 0331-fix-function-missing-return-value.patch Patch334: 0334-Dont-use-local_detect_cpu-when-cross-build.patch +Patch335: fix-AA-deadlock-when-export-LD_PRELOAD-usr-lib64-lib.patch # Part 1001-1999 %ifarch sw_64 @@ -1155,7 +1156,7 @@ constructs. The C preprocessor provides four separate functionalities: the inclusion of header files (files of declarations that can be substituted into your program); macro expansion (you can define macros, -and the C preprocessor will replace the macros with their definitions +and the C reprocessor will replace the macros with their definitions throughout the program); conditional compilation (using special preprocessing directives, you can include or exclude parts of the program according to various conditions); and line control (if you use @@ -1556,6 +1557,7 @@ not stable, so plugins must be rebuilt any time GCC is updated. %patch -P330 -p1 %patch -P331 -p1 %patch -P334 -p1 +%patch -P335 -p1 %ifarch sw_64 %patch -P1001 -p1 @@ -4179,6 +4181,9 @@ end %doc rpm.doc/changelogs/libcc1/ChangeLog* %changelog +* Mon Sep 15 2025 huyubiao - 12.3.1-65 +- fix AA deadlock when export LD_PRELOAD libasan + * Thu Jul 24 2025 Ouuleilei - 12.3.1-64 - Sync 0334 patch from 24.03SP2-Next