glibc/0012-resolv-Fix-tst-resolv-short-response-for-older-GCC-b.patch
liqingqing_1229 8ead2a5406 sync from glibc upstream 2.38 branch.
here are the patches:
9184c13681 resolv: Fix tst-resolv-short-response for older GCC (bug 32042)
3ac7ba61d2 Update syscall lists for Linux 6.5
6bb75212e6 Add mremap tests
f0e2114535 mremap: Update manual entry
0301637b99 linux: Update the mremap C implementation [BZ #31968]
1bed6acf50 resolv: Track single-request fallback via _res._flags (bug 31476)
6cad0f543c resolv: Do not wait for non-existing second DNS response after error (bug 30081)
dc512364e8 resolv: Allow short error responses to match any query (bug 31890)
bb30bd2162 Linux: Make __rseq_size useful for feature detection (bug 31965)
d9d019d674 elf: Make dl-rseq-symbols Linux only
7bfc35959d nptl: fix potential merge of __rseq_* relro symbols
712453634c s390x: Fix segfault in wcsncmp [BZ #31934]

(cherry picked from commit bfffcbf6ae59fd90403d1a40103b2a61ba4aaf6b)
2024-08-06 19:37:39 +08:00

36 lines
1.2 KiB
Diff

From 9184c13681b5de1f9e078538f0e1ee9b8599e1c3 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Thu, 1 Aug 2024 10:46:10 +0200
Subject: [PATCH 12/12] resolv: Fix tst-resolv-short-response for older GCC
(bug 32042)
Previous GCC versions do not support the C23 change that
allows labels on declarations.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
(cherry picked from commit ec119972cb2598c04ec7d4219e20506006836f64)
---
resolv/tst-resolv-short-response.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/resolv/tst-resolv-short-response.c b/resolv/tst-resolv-short-response.c
index be354ae1c7..9b06b0c176 100644
--- a/resolv/tst-resolv-short-response.c
+++ b/resolv/tst-resolv-short-response.c
@@ -33,8 +33,10 @@ response (const struct resolv_response_context *ctx,
{
case 0:
/* First server times out. */
- struct resolv_response_flags flags = {.rcode = rcode};
- resolv_response_init (b, flags);
+ {
+ struct resolv_response_flags flags = {.rcode = rcode};
+ resolv_response_init (b, flags);
+ }
break;
case 1:
/* Second server sends reply. */
--
2.33.0