[pushed] Darwin, libgcc: Fix build errors on powerpc-darwin8.

Message ID 20220304164728.86428-1-iain@sandoe.co.uk
State Committed
Commit c18ddb05b0391a397f8882fc6a12a1bab7e0df52
Headers
Series [pushed] Darwin, libgcc: Fix build errors on powerpc-darwin8. |

Commit Message

Iain Sandoe March 4, 2022, 4:47 p.m. UTC
  PowerPC Darwin8 is the last version to use an unwind frame fallback routine.
This had been omitted from the new shared EH library, along with one more
header dependency that only fires there.

tested on x86_64-darwin18, powerpc-darwin9 and cross to powerpc-darwin8
pushed to master, thanks
Iain

Signed-off-by: Iain Sandoe <iain@sandoe.co.uk>

libgcc/ChangeLog:

	* config/rs6000/t-darwin-ehs: Add darwin-fallback.o.
	* config/t-darwin-ehs: Add dependency on unwind.h.
---
 libgcc/config/rs6000/t-darwin-ehs | 4 ++--
 libgcc/config/t-darwin-ehs        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
  

Patch

diff --git a/libgcc/config/rs6000/t-darwin-ehs b/libgcc/config/rs6000/t-darwin-ehs
index 42f521411af..581344e862a 100644
--- a/libgcc/config/rs6000/t-darwin-ehs
+++ b/libgcc/config/rs6000/t-darwin-ehs
@@ -1,3 +1,3 @@ 
-# We need the save_world code for the EH library.
+# We need the save_world and anu unwind fallback code for the EH library.
 
-LIBEHSOBJS += darwin-world_s.o
+LIBEHSOBJS += darwin-world_s.o darwin-fallback.o
diff --git a/libgcc/config/t-darwin-ehs b/libgcc/config/t-darwin-ehs
index 95275023dac..df46f8a6529 100644
--- a/libgcc/config/t-darwin-ehs
+++ b/libgcc/config/t-darwin-ehs
@@ -3,5 +3,5 @@ 
 
 LIBEHSOBJS = unwind-dw2_s.o unwind-dw2-fde-darwin_s.o unwind-c_s.o
 
-unwind-dw2_s.o: gthr-default.h md-unwind-support.h
+unwind-dw2_s.o: gthr-default.h md-unwind-support.h unwind.h
 $(LIBEHSOBJS): libgcc_tm.h