llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-compiler-rt-sanitizer Author: None (llvmbot) <details> <summary>Changes</summary> Backport bbdccf4c94ff18a0761b03a0e2c8b05805385132 Requested by: @<!-- -->mgorny --- Full diff: https://github.com/llvm/llvm-project/pull/101728.diff 2 Files Affected: - (modified) compiler-rt/test/asan/TestCases/Linux/printf-fortify-5.c (+2-1) - (modified) compiler-rt/test/lit.common.cfg.py (+10-1) ``````````diff diff --git a/compiler-rt/test/asan/TestCases/Linux/printf-fortify-5.c b/compiler-rt/test/asan/TestCases/Linux/printf-fortify-5.c index c7522e4029ea1..86cf4ab0c9a22 100644 --- a/compiler-rt/test/asan/TestCases/Linux/printf-fortify-5.c +++ b/compiler-rt/test/asan/TestCases/Linux/printf-fortify-5.c @@ -1,7 +1,8 @@ // RUN: %clang -fPIC -shared -O2 -D_FORTIFY_SOURCE=2 -D_DSO %s -o %t.so // RUN: %clang_asan -o %t %t.so %s // RUN: not %run %t 2>&1 | FileCheck %s -// REQUIRES: glibc-2.27 +/// Incompatible with pass_object_info style fortified source since glibc 2.40. +// REQUIRES: glibc-2.27 && !glibc-2.40 #ifdef _DSO #include <stdio.h> #include <stdlib.h> diff --git a/compiler-rt/test/lit.common.cfg.py b/compiler-rt/test/lit.common.cfg.py index 70bf43e2fac59..0690c3a18efdb 100644 --- a/compiler-rt/test/lit.common.cfg.py +++ b/compiler-rt/test/lit.common.cfg.py @@ -674,7 +674,16 @@ def add_glibc_versions(ver_string): ver = LooseVersion(ver_string) any_glibc = False - for required in ["2.19", "2.27", "2.30", "2.33", "2.34", "2.37", "2.38"]: + for required in [ + "2.19", + "2.27", + "2.30", + "2.33", + "2.34", + "2.37", + "2.38", + "2.40", + ]: if ver >= LooseVersion(required): config.available_features.add("glibc-" + required) any_glibc = True `````````` </details> https://github.com/llvm/llvm-project/pull/101728 _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
