forked from openwrt/packages
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
openssh: fix build failure on powerpc_8548 openssh/openssh-portable@1…
…036d77 Signed-off-by: Sibren Vasse <github@sibrenvasse.nl>
- Loading branch information
1 parent
5e9ef5d
commit 6c12a91
Showing
2 changed files
with
54 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
From 1036d77b34a5fa15e56f516b81b9928006848cbd Mon Sep 17 00:00:00 2001 | ||
From: Damien Miller <djm@mindrot.org> | ||
Date: Fri, 22 Dec 2023 17:56:26 +1100 | ||
Subject: [PATCH] better detection of broken -fzero-call-used-regs | ||
MIME-Version: 1.0 | ||
Content-Type: text/plain; charset=UTF-8 | ||
Content-Transfer-Encoding: 8bit | ||
|
||
gcc 13.2.0 on ppc64le refuses to compile some function, including | ||
cipher.c:compression_alg_list() with an error: | ||
|
||
> sorry, unimplemented: argument ‘used’ is not supportedcw | ||
> for ‘-fzero-call-used-regs’ on this target | ||
|
||
This extends the autoconf will-it-work test with a similarly- | ||
structured function that seems to catch this. | ||
|
||
Spotted/tested by Colin Watson; bz3645 | ||
--- | ||
m4/openssh.m4 | 12 +++++++++--- | ||
1 file changed, 9 insertions(+), 3 deletions(-) | ||
|
||
--- 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 |