-
Notifications
You must be signed in to change notification settings - Fork 13k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[CI] Update GCC in the dist-linux builders #58416
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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
48 changes: 48 additions & 0 deletions
48
src/ci/docker/dist-arm-linux/patches/glibc/ports-2.16.0/001-arm-libgcc_s_resume-used.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,48 @@ | ||
| commit bdb24c2851fd5f0ad9b82d7ea1db911d334b02d2 | ||
| Author: Joseph Myers <joseph@codesourcery.com> | ||
| Date: Tue May 20 21:27:13 2014 +0000 | ||
|
|
||
| Fix ARM build with GCC trunk. | ||
|
|
||
| sysdeps/unix/sysv/linux/arm/unwind-resume.c and | ||
| sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c have static | ||
| variables that are written in C code but only read from toplevel asms. | ||
| Current GCC trunk now optimizes away such apparently write-only static | ||
| variables, so causing a build failure. This patch marks those | ||
| variables with __attribute_used__ to avoid that optimization. | ||
|
|
||
| Tested that this fixes the build for ARM. | ||
|
|
||
| * sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c | ||
| (libgcc_s_resume): Use __attribute_used__. | ||
| * sysdeps/unix/sysv/linux/arm/unwind-resume.c (libgcc_s_resume): | ||
| Likewise. | ||
|
|
||
| diff --git a/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c b/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c | ||
| index 29e2c2b00b04..e848bfeffdcb 100644 | ||
| --- a/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c | ||
| +++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c | ||
| @@ -22,7 +22,8 @@ | ||
| #include <pthreadP.h> | ||
|
|
||
| static void *libgcc_s_handle; | ||
| -static void (*libgcc_s_resume) (struct _Unwind_Exception *exc); | ||
| +static void (*libgcc_s_resume) (struct _Unwind_Exception *exc) | ||
| + __attribute_used__; | ||
| static _Unwind_Reason_Code (*libgcc_s_personality) | ||
| (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *); | ||
| static _Unwind_Reason_Code (*libgcc_s_forcedunwind) | ||
| diff --git a/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c b/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c | ||
| index 285b99b5ed0d..48d00fc83641 100644 | ||
| --- a/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c | ||
| +++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c | ||
| @@ -20,7 +20,8 @@ | ||
| #include <stdio.h> | ||
| #include <unwind.h> | ||
|
|
||
| -static void (*libgcc_s_resume) (struct _Unwind_Exception *exc); | ||
| +static void (*libgcc_s_resume) (struct _Unwind_Exception *exc) | ||
| + __attribute_used__; | ||
| static _Unwind_Reason_Code (*libgcc_s_personality) | ||
| (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *); | ||
|
|
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
48 changes: 48 additions & 0 deletions
48
src/ci/docker/dist-armhf-linux/patches/glibc/ports-2.16.0/001-arm-libgcc_s_resume-used.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,48 @@ | ||
| commit bdb24c2851fd5f0ad9b82d7ea1db911d334b02d2 | ||
| Author: Joseph Myers <joseph@codesourcery.com> | ||
| Date: Tue May 20 21:27:13 2014 +0000 | ||
|
|
||
| Fix ARM build with GCC trunk. | ||
|
|
||
| sysdeps/unix/sysv/linux/arm/unwind-resume.c and | ||
| sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c have static | ||
| variables that are written in C code but only read from toplevel asms. | ||
| Current GCC trunk now optimizes away such apparently write-only static | ||
| variables, so causing a build failure. This patch marks those | ||
| variables with __attribute_used__ to avoid that optimization. | ||
|
|
||
| Tested that this fixes the build for ARM. | ||
|
|
||
| * sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c | ||
| (libgcc_s_resume): Use __attribute_used__. | ||
| * sysdeps/unix/sysv/linux/arm/unwind-resume.c (libgcc_s_resume): | ||
| Likewise. | ||
|
|
||
| diff --git a/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c b/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c | ||
| index 29e2c2b00b04..e848bfeffdcb 100644 | ||
| --- a/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c | ||
| +++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c | ||
| @@ -22,7 +22,8 @@ | ||
| #include <pthreadP.h> | ||
|
|
||
| static void *libgcc_s_handle; | ||
| -static void (*libgcc_s_resume) (struct _Unwind_Exception *exc); | ||
| +static void (*libgcc_s_resume) (struct _Unwind_Exception *exc) | ||
| + __attribute_used__; | ||
| static _Unwind_Reason_Code (*libgcc_s_personality) | ||
| (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *); | ||
| static _Unwind_Reason_Code (*libgcc_s_forcedunwind) | ||
| diff --git a/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c b/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c | ||
| index 285b99b5ed0d..48d00fc83641 100644 | ||
| --- a/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c | ||
| +++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c | ||
| @@ -20,7 +20,8 @@ | ||
| #include <stdio.h> | ||
| #include <unwind.h> | ||
|
|
||
| -static void (*libgcc_s_resume) (struct _Unwind_Exception *exc); | ||
| +static void (*libgcc_s_resume) (struct _Unwind_Exception *exc) | ||
| + __attribute_used__; | ||
| static _Unwind_Reason_Code (*libgcc_s_personality) | ||
| (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *); | ||
|
|
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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note, the arm builders were already configured for glibc 2.16.0, but the README wasn't in sync.