From 12678f984a991895460afb057c0438ab344708c7 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Mar 28 2023 06:49:26 +0000
Subject: Update OpenMP rpath patch


---

diff --git a/0001-Revert-Revert-D118493-Set-rpath-on-openmp-executable.patch b/0001-Revert-Revert-D118493-Set-rpath-on-openmp-executable.patch
index c3d3a12..56b4f20 100644
--- a/0001-Revert-Revert-D118493-Set-rpath-on-openmp-executable.patch
+++ b/0001-Revert-Revert-D118493-Set-rpath-on-openmp-executable.patch
@@ -1,7 +1,7 @@
-From 91dce5ac2ea952c772fe2f9bc767c122cb208c11 Mon Sep 17 00:00:00 2001
+From ba0f129dc5c3c8ff989204108c5fc55da67387e2 Mon Sep 17 00:00:00 2001
 From: Tom Stellard <tstellar@redhat.com>
 Date: Thu, 9 Mar 2023 21:52:41 -0800
-Subject: [PATCH 1/2] Revert "Revert D118493 "Set rpath on openmp executables""
+Subject: [PATCH] Revert "Revert D118493 "Set rpath on openmp executables""
 
 This reverts commit 555b572e3f407ac48b5f30fc06760cc4d0549977.
 ---
@@ -13,10 +13,10 @@ This reverts commit 555b572e3f407ac48b5f30fc06760cc4d0549977.
  create mode 100644 clang/test/OpenMP/Inputs/libomp.a
 
 diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td
-index 5c49450914a6..6f9ef66808a1 100644
+index c01859bc18a9..9fa4ff493f26 100644
 --- a/clang/include/clang/Driver/Options.td
 +++ b/clang/include/clang/Driver/Options.td
-@@ -4262,6 +4262,12 @@ def offload_add_rpath: Flag<["--"], "offload-add-rpath">, Flags<[NoArgumentUnuse
+@@ -4266,6 +4266,12 @@ def offload_add_rpath: Flag<["--"], "offload-add-rpath">, Flags<[NoArgumentUnuse
    Alias<frtlib_add_rpath>;
  def no_offload_add_rpath: Flag<["--"], "no-offload-add-rpath">, Flags<[NoArgumentUnused]>,
    Alias<frtlib_add_rpath>;
@@ -28,9 +28,9 @@ index 5c49450914a6..6f9ef66808a1 100644
 +  BothFlags<[NoArgumentUnused]>>;
  def r : Flag<["-"], "r">, Flags<[LinkerInput,NoArgumentUnused]>,
          Group<Link_Group>;
- def save_temps_EQ : Joined<["-", "--"], "save-temps=">, Flags<[CC1Option, FlangOption, NoXarchOption]>,
+ def save_temps_EQ : Joined<["-", "--"], "save-temps=">, Flags<[CC1Option, FlangOption, FC1Option, NoXarchOption]>,
 diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp b/clang/lib/Driver/ToolChains/CommonArgs.cpp
-index bc32b8d8cac8..dc46b625bb67 100644
+index 4273373f62f3..828b79c9ea9b 100644
 --- a/clang/lib/Driver/ToolChains/CommonArgs.cpp
 +++ b/clang/lib/Driver/ToolChains/CommonArgs.cpp
 @@ -795,6 +795,22 @@ void tools::addLTOOptions(const ToolChain &ToolChain, const ArgList &Args,