  	lappend ALWAYS_CFLAGS "additional_flags=-shared-libgcc"
      }
  
+diff --git a/libbacktrace/Makefile.in b/libbacktrace/Makefile.in
+index 08cdd21fb40..8898251161d 100644
+--- a/libbacktrace/Makefile.in
++++ b/libbacktrace/Makefile.in
+@@ -15,7 +15,7 @@
+ @SET_MAKE@
+ 
+ # Makefile.am -- Backtrace Makefile.
+-# Copyright (C) 2012-2021 Free Software Foundation, Inc.
++# Copyright (C) 2012-2022 Free Software Foundation, Inc.
+ 
+ # Redistribution and use in source and binary forms, with or without
+ # modification, are permitted provided that the following conditions are
 diff --git a/libbacktrace/configure b/libbacktrace/configure
-index 17f470a4bec..f1c7242142e 100755
+index 17f470a4bec..957095aaf1b 100755
 --- a/libbacktrace/configure
 +++ b/libbacktrace/configure
 @@ -675,6 +675,8 @@ PIC_FLAG

+    # We cannot build and test reliably on macOS 10.11+ (Darwin15+) without use
+    # of rpaths, since runpaths set via DYLD_LIBRARY_PATH are elided by key
+    # system executables (e.g. /bin/sh).  Force rpaths on for these systems.
+      UNSET,darwin1[56789]*|UNSET,darwin2*|10.1[123456789][,.]*|1[12].*[,.]* )
+      echo "@rpath library names are needed on macOS versions later than 10.11 (rpaths enabled)" 1>&5
+      enable_darwin_at_rpath=yes
+      ;;

 				 struct locate_and_pad_arg_data *);
 extern void generate_setjmp_warnings (void);
diff --git a/gcc/gcc.cc b/gcc/gcc.cc
index bb07cc244e3..a16c1e4372b 100644
--- a/gcc/gcc.cc
+++ b/gcc/gcc.cc
@@ -572,6 +572,7 @@ or with constant text in a single argument.
