From b59e2a4903fa1ac8c3b34338a62b1e3fb15c3792 Mon Sep 17 00:00:00 2001 From: Max Ostapenko Date: Mon, 23 Nov 2015 11:15:13 +0200 Subject: libsanitizer merge from upstream r253555, compiler part. gcc/ * opts.c (finish_options): Allow -fsanitize-recover=address for userspace sanitization. * asan.c (asan_expand_check_ifn): Redefine recover_p. * doc/invoke.texi (fsanitize-recover): Update documentation. gcc/testsuite/ * c-c++-common/asan/halt_on_error-1.c: New test. * c-c++-common/asan/halt_on_error-2.c: Likewise. From-SVN: r230741 --- gcc/opts.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'gcc/opts.c') diff --git a/gcc/opts.c b/gcc/opts.c index 4345cc8..874c84f 100644 --- a/gcc/opts.c +++ b/gcc/opts.c @@ -941,10 +941,7 @@ finish_options (struct gcc_options *opts, struct gcc_options *opts_set, "-fsanitize=address and -fsanitize=kernel-address " "are incompatible with -fsanitize=thread"); - /* Error recovery is not allowed for ASan and TSan. */ - - if (opts->x_flag_sanitize_recover & SANITIZE_USER_ADDRESS) - error_at (loc, "-fsanitize-recover=address is not supported"); + /* Error recovery is not allowed for LSan and TSan. */ if (opts->x_flag_sanitize_recover & SANITIZE_THREAD) error_at (loc, "-fsanitize-recover=thread is not supported"); -- cgit v1.1