ExternalVendorCode/heads
1
0
Fork 0
mirror of https://github.com/linuxboot/heads.git synced 2024-12-19 21:17:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

coreboot 4.11 patches: made compliant with git apply (removal of https->http temp fix)

Browse Source
This commit is contained in:
Thierry Laurion 2022-12-14 12:05:10 -05:00
parent 61f72f8d51
commit 3e893b7df7
No known key found for this signature in database
GPG Key ID: E7B4A71658E36A93
4 changed files with 19 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
patches/coreboot-4.11/0070-crossgcc-iasl-2021-instead-of-2018_fix-old_coreboot-build-on-newer-platforms.patch
View File

@ -50,19 +50,19 @@ diff -ruN ./util/crossgcc/patches.orig/acpica-unix-20210105_iasl.patch ./util/cr
+ printf ("Ignoring all errors, forcing AML file generation\n\n"); + printf ("Ignoring all errors, forcing AML file generation\n\n");
+@@ -866,6 +867,7 @@ AslDoOptions ( +@@ -866,6 +867,7 @@ AslDoOptions (
+ case '^': + case '^':
+ +
+ printf (ACPI_COMMON_SIGNON (ASL_COMPILER_NAME)); + printf (ACPI_COMMON_SIGNON (ASL_COMPILER_NAME));
++ printf ("%s\n", COREBOOT_TOOLCHAIN_VERSION); ++ printf ("%s\n", COREBOOT_TOOLCHAIN_VERSION);
+ exit (0); + exit (0);
+ +
+ case 'a': + case 'a':
+@@ -879,6 +881,7 @@ AslDoOptions ( +@@ -879,6 +881,7 @@ AslDoOptions (
+ +
+ printf (ACPI_COMMON_SIGNON (ASL_COMPILER_NAME)); + printf (ACPI_COMMON_SIGNON (ASL_COMPILER_NAME));
+ printf (ACPI_COMMON_BUILD_TIME); + printf (ACPI_COMMON_BUILD_TIME);
++ printf ("%s\n", COREBOOT_TOOLCHAIN_VERSION); ++ printf ("%s\n", COREBOOT_TOOLCHAIN_VERSION);
+ exit (0); + exit (0);
+ +
+ case 'e': + case 'e':
--- ./util/crossgcc/buildgcc.orig 2021-10-15 12:24:39.039000000 -0400 --- ./util/crossgcc/buildgcc.orig 2021-10-15 12:24:39.039000000 -0400

5
patches/coreboot-4.11/0071-crossgcc-binutils-gold-error-strings.patch
View File

@ -6,11 +6,10 @@ diff -ruN ./util/crossgcc/patches.orig/binutils-2.32_gold-errors-include-strings
++++ binutils-2.32/gold/errors.h 2021-10-12 13:42:38.712000000 -0400 ++++ binutils-2.32/gold/errors.h 2021-10-12 13:42:38.712000000 -0400
+@@ -25,6 +25,7 @@ +@@ -25,6 +25,7 @@
+ #include <cstdarg> + #include <cstdarg>
+ +
+ #include "gold-threads.h" + #include "gold-threads.h"
++#include <string> ++#include <string>
+ +
+ namespace gold + namespace gold
+ { + {
+ +

26
patches/coreboot-4.11/0072-crossgcc-gnat-eh.patch
View File

@ -9,11 +9,11 @@ index 0000000..151a3e6
+Date: Fri Aug 2 18:46:51 2019 +0000 +Date: Fri Aug 2 18:46:51 2019 +0000
+ +
+ rework Ada EH Machine_Occurrence deallocation + rework Ada EH Machine_Occurrence deallocation
+ +
+ Introduce exception handler ABI #1 to ensure single release, no access + Introduce exception handler ABI #1 to ensure single release, no access
+ after release of reraised Machine_Occurrences, and no failure to + after release of reraised Machine_Occurrences, and no failure to
+ re-reraise a Machine_Occurrence. + re-reraise a Machine_Occurrence.
+ +
+ Unlike Ada exceptions, foreign exceptions do not get a new + Unlike Ada exceptions, foreign exceptions do not get a new
+ Machine_Occurrence upon reraise, but each handler would delete the + Machine_Occurrence upon reraise, but each handler would delete the
+ exception upon completion, normal or exceptional, save for the case of + exception upon completion, normal or exceptional, save for the case of
@ -23,7 +23,7 @@ index 0000000..151a3e6
+ reraise within the same handler. Get_Current_Excep.all would also + reraise within the same handler. Get_Current_Excep.all would also
+ expose the Machine_Occurrence to reuse by Reraise_Occurrence, even for + expose the Machine_Occurrence to reuse by Reraise_Occurrence, even for
+ native exceptions. + native exceptions.
+ +
+ Under ABI #1, Begin_Handler_v1 claims responsibility for releasing an + Under ABI #1, Begin_Handler_v1 claims responsibility for releasing an
+ exception by saving its cleanup and setting it to Claimed_Cleanup. + exception by saving its cleanup and setting it to Claimed_Cleanup.
+ End_Handler_v1 restores the cleanup and runs it, as long as it isn't + End_Handler_v1 restores the cleanup and runs it, as long as it isn't
@ -33,7 +33,7 @@ index 0000000..151a3e6
+ propagating exception will then claim responsibility for releasing + propagating exception will then claim responsibility for releasing
+ it), so reraise no longer needs to clear the exception pointer, and it + it), so reraise no longer needs to clear the exception pointer, and it
+ can just propagate the exception, just like Reraise_Occurrence. + can just propagate the exception, just like Reraise_Occurrence.
+ +
+ ABI #1 is fully interoperable with ABI #0, i.e., exception handlers + ABI #1 is fully interoperable with ABI #0, i.e., exception handlers
+ that call the #0 primitives can be linked together with ones that call + that call the #0 primitives can be linked together with ones that call
+ the #1 primitives, and they will not misbehave. When a #1 handler + the #1 primitives, and they will not misbehave. When a #1 handler
@ -45,10 +45,10 @@ index 0000000..151a3e6
+ cause the exception to be released multiple times, and to be used + cause the exception to be released multiple times, and to be used
+ after it is first released, even if other handlers of the foreign + after it is first released, even if other handlers of the foreign
+ exception use #1. + exception use #1.
+ +
+ +
+ for gcc/ada/ChangeLog + for gcc/ada/ChangeLog
+ +
+ * libgnat/a-exexpr.adb (Begin_Handler_v1, End_Handler_v1): New. + * libgnat/a-exexpr.adb (Begin_Handler_v1, End_Handler_v1): New.
+ (Claimed_Cleanup): New. + (Claimed_Cleanup): New.
+ (Begin_Handler, End_Handler): Document. + (Begin_Handler, End_Handler): Document.
@ -59,7 +59,7 @@ index 0000000..151a3e6
+ EH_ELSE_EXPR to pass a propagating exception to end handler. + EH_ELSE_EXPR to pass a propagating exception to end handler.
+ (gnat_to_gnu): Leave the exception pointer alone for reraise. + (gnat_to_gnu): Leave the exception pointer alone for reraise.
+ (add_cleanup): Handle EH_ELSE_EXPR, require it by itself. + (add_cleanup): Handle EH_ELSE_EXPR, require it by itself.
+ +
+ From-SVN: r274029 + From-SVN: r274029
+ +
+diff --git a/gcc/ada/libgnat/a-exexpr.adb b/gcc/ada/libgnat/a-exexpr.adb +diff --git a/gcc/ada/libgnat/a-exexpr.adb b/gcc/ada/libgnat/a-exexpr.adb
@ -69,7 +69,7 @@ index 0000000..151a3e6
+@@ -197,15 +197,75 @@ package body Exception_Propagation is +@@ -197,15 +197,75 @@ package body Exception_Propagation is
+ -- whose machine occurrence is Mo. The message is empty, the backtrace + -- whose machine occurrence is Mo. The message is empty, the backtrace
+ -- is empty too and the exception identity is Foreign_Exception. + -- is empty too and the exception identity is Foreign_Exception.
+ +
+- -- Hooks called when entering/leaving an exception handler for a given +- -- Hooks called when entering/leaving an exception handler for a given
+- -- occurrence, aimed at handling the stack of active occurrences. The +- -- occurrence, aimed at handling the stack of active occurrences. The
+- -- calls are generated by gigi in tree_transform/N_Exception_Handler. +- -- calls are generated by gigi in tree_transform/N_Exception_Handler.
@ -127,12 +127,12 @@ index 0000000..151a3e6
++ -- used during bootstrap. They are interoperable with the v1 ++ -- used during bootstrap. They are interoperable with the v1
++ -- hooks, except that the older versions may malfunction when ++ -- hooks, except that the older versions may malfunction when
++ -- handling foreign exceptions passed to Reraise_Occurrence. ++ -- handling foreign exceptions passed to Reraise_Occurrence.
+ +
+ procedure Begin_Handler (GCC_Exception : not null GCC_Exception_Access); + procedure Begin_Handler (GCC_Exception : not null GCC_Exception_Access);
+ pragma Export (C, Begin_Handler, "__gnat_begin_handler"); + pragma Export (C, Begin_Handler, "__gnat_begin_handler");
++ -- Called when entering an exception handler translated by an old ++ -- Called when entering an exception handler translated by an old
++ -- compiler. It does nothing. ++ -- compiler. It does nothing.
+ +
+ procedure End_Handler (GCC_Exception : GCC_Exception_Access); + procedure End_Handler (GCC_Exception : GCC_Exception_Access);
+ pragma Export (C, End_Handler, "__gnat_end_handler"); + pragma Export (C, End_Handler, "__gnat_end_handler");
++ -- Called when leaving an exception handler translated by an old ++ -- Called when leaving an exception handler translated by an old
@ -142,13 +142,13 @@ index 0000000..151a3e6
++ -- End_Handler was set to null to tell End_Handler to refrain from ++ -- End_Handler was set to null to tell End_Handler to refrain from
++ -- releasing the reraised exception. In v1 safer ways are used to ++ -- releasing the reraised exception. In v1 safer ways are used to
++ -- accomplish that. ++ -- accomplish that.
+ +
+ -------------------------------------------------------------------- + --------------------------------------------------------------------
+ -- Accessors to Basic Components of a GNAT Exception Data Pointer -- + -- Accessors to Basic Components of a GNAT Exception Data Pointer --
+@@ -352,6 +412,128 @@ package body Exception_Propagation is +@@ -352,6 +412,128 @@ package body Exception_Propagation is
+ end if; + end if;
+ end Setup_Current_Excep; + end Setup_Current_Excep;
+ +
++ ---------------------- ++ ----------------------
++ -- Begin_Handler_v1 -- ++ -- Begin_Handler_v1 --
++ ---------------------- ++ ----------------------

30
patches/coreboot-4.11/0073-build-race-condition-fixes.patch
View File

@ -1,30 +0,0 @@
src/arch/x86: Ensure $(objgenerated) exists before it's used
In some rare cases it seems that make tries to build
$(objgenerated)/assembly.inc before the build-dirs target has finished,
and so assembly.inc can't be written. Enforce that build-dirs is done
before assembly.inc starts.
BUG=chromium:1098215
BRANCH=none
TEST=none
Change-Id: Ib141ea45a43836cfdde0059523c331fe5286b06d
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42883
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index 6297384..1a1aa40 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -50,7 +50,7 @@
# into a single generated file.
crt0s = $(cpu_incs-y)
-$(objgenerated)/assembly.inc: $$(crt0s)
+$(objgenerated)/assembly.inc: build-dirs $$(crt0s)
@printf " GEN $(subst $(obj)/,,$(@))\n"
printf '$(foreach crt0,$(crt0s),#include "$(crt0)"\n)' > $@