-
Notifications
You must be signed in to change notification settings - Fork 50
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add patches to fix dwarf + duo[x]-static builds on new systems
Signed-off-by: falkTX <[email protected]>
- Loading branch information
Showing
21 changed files
with
1,391 additions
and
2 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
75 changes: 75 additions & 0 deletions
75
...tool-ng-1.22.0/glibc-2.21/0000-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
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,75 @@ | ||
From df1cf48777fe4cd81ad7fb09ecbe5b31432b7c1c Mon Sep 17 00:00:00 2001 | ||
From: Yvan Roux <[email protected]> | ||
Date: Fri, 15 Apr 2016 13:29:26 +0200 | ||
Subject: [PATCH] Suppress GCC 6 warning about ambiguous 'else' with | ||
-Wparentheses | ||
|
||
--- | ||
nis/nis_call.c | 20 +++++++++++--------- | ||
stdlib/setenv.c | 24 +++++++++++++----------- | ||
2 files changed, 24 insertions(+), 20 deletions(-) | ||
|
||
--- a/nis/nis_call.c | ||
+++ b/nis/nis_call.c | ||
@@ -680,16 +680,18 @@ | ||
/* Choose which entry should be evicted from the cache. */ | ||
loc = &nis_server_cache[0]; | ||
if (*loc != NULL) | ||
- for (i = 1; i < 16; ++i) | ||
- if (nis_server_cache[i] == NULL) | ||
- { | ||
+ { | ||
+ for (i = 1; i < 16; ++i) | ||
+ if (nis_server_cache[i] == NULL) | ||
+ { | ||
+ loc = &nis_server_cache[i]; | ||
+ break; | ||
+ } | ||
+ else if ((*loc)->uses > nis_server_cache[i]->uses | ||
+ || ((*loc)->uses == nis_server_cache[i]->uses | ||
+ && (*loc)->expires > nis_server_cache[i]->expires)) | ||
loc = &nis_server_cache[i]; | ||
- break; | ||
- } | ||
- else if ((*loc)->uses > nis_server_cache[i]->uses | ||
- || ((*loc)->uses == nis_server_cache[i]->uses | ||
- && (*loc)->expires > nis_server_cache[i]->expires)) | ||
- loc = &nis_server_cache[i]; | ||
+ } | ||
old = *loc; | ||
*loc = new; | ||
|
||
--- a/stdlib/setenv.c | ||
+++ b/stdlib/setenv.c | ||
@@ -269,18 +269,20 @@ | ||
ep = __environ; | ||
if (ep != NULL) | ||
while (*ep != NULL) | ||
- if (!strncmp (*ep, name, len) && (*ep)[len] == '=') | ||
- { | ||
- /* Found it. Remove this pointer by moving later ones back. */ | ||
- char **dp = ep; | ||
+ { | ||
+ if (!strncmp (*ep, name, len) && (*ep)[len] == '=') | ||
+ { | ||
+ /* Found it. Remove this pointer by moving later ones back. */ | ||
+ char **dp = ep; | ||
|
||
- do | ||
- dp[0] = dp[1]; | ||
- while (*dp++); | ||
- /* Continue the loop in case NAME appears again. */ | ||
- } | ||
- else | ||
- ++ep; | ||
+ do | ||
+ dp[0] = dp[1]; | ||
+ while (*dp++); | ||
+ /* Continue the loop in case NAME appears again. */ | ||
+ } | ||
+ else | ||
+ ++ep; | ||
+ } | ||
|
||
UNLOCK; | ||
|
97 changes: 97 additions & 0 deletions
97
patches/crosstool-ng-1.22.0/glibc-2.21/0001-fix-signed-shift-overlow.patch
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,97 @@ | ||
commit 5542236837c5c41435f8282ec92799f480c36f18 | ||
Author: Paul Eggert <[email protected]> | ||
Date: Tue Jul 21 22:50:29 2015 -0700 | ||
|
||
Port the 0x7efe...feff pattern to GCC 6. | ||
|
||
See Steve Ellcey's bug report in: | ||
https://sourceware.org/ml/libc-alpha/2015-07/msg00673.html | ||
* string/memrchr.c (MEMRCHR): | ||
* string/rawmemchr.c (RAWMEMCHR): | ||
* string/strchr.c (strchr): | ||
* string/strchrnul.c (STRCHRNUL): | ||
Rewrite code to avoid issues with signed shift overflow. | ||
|
||
--- | ||
string/memrchr.c | 11 ++--------- | ||
string/rawmemchr.c | 11 ++--------- | ||
string/strchr.c | 9 ++------- | ||
string/strchrnul.c | 9 ++------- | ||
4 files changed, 8 insertions(+), 32 deletions(-) | ||
|
||
--- a/string/memrchr.c | ||
+++ b/string/memrchr.c | ||
@@ -96,15 +96,8 @@ | ||
|
||
The 1-bits make sure that carries propagate to the next 0-bit. | ||
The 0-bits provide holes for carries to fall into. */ | ||
- | ||
- if (sizeof (longword) != 4 && sizeof (longword) != 8) | ||
- abort (); | ||
- | ||
-#if LONG_MAX <= LONG_MAX_32_BITS | ||
- magic_bits = 0x7efefeff; | ||
-#else | ||
- magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff; | ||
-#endif | ||
+ magic_bits = -1; | ||
+ magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1; | ||
|
||
/* Set up a longword, each of whose bytes is C. */ | ||
charmask = c | (c << 8); | ||
--- a/string/rawmemchr.c | ||
+++ b/string/rawmemchr.c | ||
@@ -86,15 +86,8 @@ | ||
|
||
The 1-bits make sure that carries propagate to the next 0-bit. | ||
The 0-bits provide holes for carries to fall into. */ | ||
- | ||
- if (sizeof (longword) != 4 && sizeof (longword) != 8) | ||
- abort (); | ||
- | ||
-#if LONG_MAX <= LONG_MAX_32_BITS | ||
- magic_bits = 0x7efefeff; | ||
-#else | ||
- magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff; | ||
-#endif | ||
+ magic_bits = -1; | ||
+ magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1; | ||
|
||
/* Set up a longword, each of whose bytes is C. */ | ||
charmask = c | (c << 8); | ||
--- a/string/strchr.c | ||
+++ b/string/strchr.c | ||
@@ -60,13 +60,8 @@ | ||
|
||
The 1-bits make sure that carries propagate to the next 0-bit. | ||
The 0-bits provide holes for carries to fall into. */ | ||
- switch (sizeof (longword)) | ||
- { | ||
- case 4: magic_bits = 0x7efefeffL; break; | ||
- case 8: magic_bits = ((0x7efefefeL << 16) << 16) | 0xfefefeffL; break; | ||
- default: | ||
- abort (); | ||
- } | ||
+ magic_bits = -1; | ||
+ magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1; | ||
|
||
/* Set up a longword, each of whose bytes is C. */ | ||
charmask = c | (c << 8); | ||
--- a/string/strchrnul.c | ||
+++ b/string/strchrnul.c | ||
@@ -66,13 +66,8 @@ | ||
|
||
The 1-bits make sure that carries propagate to the next 0-bit. | ||
The 0-bits provide holes for carries to fall into. */ | ||
- switch (sizeof (longword)) | ||
- { | ||
- case 4: magic_bits = 0x7efefeffL; break; | ||
- case 8: magic_bits = ((0x7efefefeL << 16) << 16) | 0xfefefeffL; break; | ||
- default: | ||
- abort (); | ||
- } | ||
+ magic_bits = -1; | ||
+ magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1; | ||
|
||
/* Set up a longword, each of whose bytes is C. */ | ||
charmask = c | (c << 8); |
Oops, something went wrong.