aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2023-12-21 15:59:16 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2023-12-29 10:57:03 -0300
commitbf320000b47ce46aa6dbe1b7068e6539bf2df9bb (patch)
tree52457313c79daae00633e6492c052a6dc2759ee2
parent9556acd249687ac562deb6309503165d66eb06fa (diff)
downloadglibc-bf320000b47ce46aa6dbe1b7068e6539bf2df9bb.zip
glibc-bf320000b47ce46aa6dbe1b7068e6539bf2df9bb.tar.gz
glibc-bf320000b47ce46aa6dbe1b7068e6539bf2df9bb.tar.bz2
debug: Increase tst-fortify checks for compiler without __va_arg_pack support
The fortify wrappers for varargs functions already add fallbacks to builtins calls if __va_arg_pack is not supported. Checked on aarch64, armhf, x86_64, and i686. Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
-rw-r--r--debug/tst-fortify.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/debug/tst-fortify.c b/debug/tst-fortify.c
index 20e9267..5cd9d22 100644
--- a/debug/tst-fortify.c
+++ b/debug/tst-fortify.c
@@ -130,7 +130,7 @@ static int num2 = 987654;
chk_fail_ok = 0; \
FAIL (); \
}
-#if __USE_FORTIFY_LEVEL >= 2 && (!defined __cplusplus || defined __va_arg_pack)
+#if __USE_FORTIFY_LEVEL >= 2
# define CHK_FAIL2_START CHK_FAIL_START
# define CHK_FAIL2_END CHK_FAIL_END
#else
@@ -419,7 +419,6 @@ do_test (void)
stpncpy (buf + 6, "cd", l0 + 5);
CHK_FAIL_END
-# if !defined __cplusplus || defined __va_arg_pack
CHK_FAIL_START
sprintf (buf + 8, "%d", num1);
CHK_FAIL_END
@@ -439,7 +438,6 @@ do_test (void)
CHK_FAIL_START
swprintf (wbuf + 8, l0 + 3, L"%d", num1);
CHK_FAIL_END
-# endif
memcpy (buf, str1 + 2, 9);
CHK_FAIL_START
@@ -550,7 +548,6 @@ do_test (void)
FAIL ();
}
-# if !defined __cplusplus || defined __va_arg_pack
CHK_FAIL_START
sprintf (a.buf1 + (O + 7), "%d", num1);
CHK_FAIL_END
@@ -562,7 +559,6 @@ do_test (void)
CHK_FAIL_START
snprintf (a.buf1 + (O + 7), l0 + 3, "%d", num2);
CHK_FAIL_END
-# endif
memcpy (a.buf1, str1 + (3 - O), 8 + O);
CHK_FAIL_START