commit 9b5a059df9f0015af4a013b6dc217581abf5ce49
author Fabian Sommer <fabiansommer@chromium.org> Fri Oct 28 11:59:56 2022
committer Nacl LUCI CQ <nacl-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Oct 28 17:41:48 2022
tree 03e08a99ed669de17824f1a6a601a865782e2b2b
parent 7d275eb5878e29cf3d7338617c1e0c5e5856195a

Rebase saigo

Bug: 1284673
Change-Id: I9a7f9bfe5edc87ff8b0d32dbdd9c1d2c0cbdf767
Reviewed-on: https://chromium-review.googlesource.com/c/native_client/src/native_client/+/3975391
Commit-Queue: Derek Schuff <dschuff@chromium.org>
Auto-Submit: Fabian Sommer <fabiansommer@chromium.org>
Reviewed-by: Derek Schuff <dschuff@chromium.org>

pnacl/COMPONENT_REVISIONS

diff --git a/pnacl/COMPONENT_REVISIONS b/pnacl/COMPONENT_REVISIONS
index 452ec8c..13878e1 100644
--- a/pnacl/COMPONENT_REVISIONS
+++ b/pnacl/COMPONENT_REVISIONS
@@ -51,4 +51,4 @@
 #
 # Three lines avoid merge conflicts.
 #
-llvm_saigo=575f5d159aa954dae8b0a69bae6684b732c4a569
+llvm_saigo=5b61e57148d620824925829ed884cd728282dee2

toolchain_build/pnacl_targetlibs.py

diff --git a/toolchain_build/pnacl_targetlibs.py b/toolchain_build/pnacl_targetlibs.py
index 1adda4c..537aae3 100755
--- a/toolchain_build/pnacl_targetlibs.py
+++ b/toolchain_build/pnacl_targetlibs.py
@@ -691,7 +691,7 @@
                        PnaclTool('illegal', bias_arch, saigo=True),
                    '-DCMAKE_LIBTOOL=' + PnaclTool('ar', bias_arch, saigo=True),
                    '-DCMAKE_SYSTEM_NAME=nacl',
-                   '-DLLVM_ENABLE_PROJECTS=libcxx;libcxxabi',
+                   '-DLLVM_ENABLE_RUNTIMES=libcxx;libcxxabi',
                    '-DLLVM_DEFAULT_TARGET_TRIPLE=' + target_triple,
                    '-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=0',
                    '-DLLVM_ENABLE_PIC=OFF',
@@ -708,7 +708,7 @@
                    '-DCMAKE_POSITION_INDEPENDENT_CODE=OFF',
                    '-DCMAKE_C_FLAGS=' + LibCxxSaigoCflags(bias_arch),
                    '-DCMAKE_CXX_FLAGS=' + LibCxxSaigoCflags(bias_arch),
-                   '%(llvm_saigo_src)s/llvm']),
+                   '%(llvm_saigo_src)s/runtimes']),
               command.Copy(os.path.join('%(gcc_src)s', 'gcc',
                                         'unwind-generic.h'),
                            os.path.join('include', 'unwind.h')),