diff options
Diffstat (limited to 'debian/patches/broken-zero-call-used-regs.patch')
| -rw-r--r-- | debian/patches/broken-zero-call-used-regs.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/debian/patches/broken-zero-call-used-regs.patch b/debian/patches/broken-zero-call-used-regs.patch new file mode 100644 index 0000000..96449e1 --- /dev/null +++ b/debian/patches/broken-zero-call-used-regs.patch @@ -0,0 +1,46 @@ +From 66eb7a60b33a813422df2f9109aa328bd5027018 Mon Sep 17 00:00:00 2001 +From: Colin Watson <cjwatson@debian.org> +Date: Thu, 21 Dec 2023 15:18:52 +0000 +Subject: Improve detection of broken -fzero-call-used-regs=used + +Origin: other, https://bugzilla.mindrot.org/attachment.cgi?id=3776&action=diff +Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=3645 +Last-Update: 2023-12-21 + +Patch-Name: broken-zero-call-used-regs.patch +--- + m4/openssh.m4 | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/m4/openssh.m4 b/m4/openssh.m4 +index 5d4c56280..033df501c 100644 +--- a/m4/openssh.m4 ++++ b/m4/openssh.m4 +@@ -20,18 +20,24 @@ char *f2(char *s, ...) { + va_end(args); + return strdup(ret); + } ++const char *f3(int s) { ++ return s ? "good" : "gooder"; ++} + int main(int argc, char **argv) { +- (void)argv; + char b[256], *cp; ++ const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; ++ (void)argv; + f(1); +- snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld\n", i,j,k,l,m,n,o); ++ s = f3(f(2)); ++ snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); +- cp = f2("%d %d %d %f %f %lld %lld\n", i,j,k,l,m,n,o); ++ cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); ++ if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does |