Update to the latest version of libcxx

This version can do without the two patches we carried locally.
This commit is contained in:
Martin Storsjö authored and Martin Storsjo committed 2017-09-13 09:58:00 +03:00
1 parent 403cbade55
commit c571ff004e
3 files changed
+1 -63

No files matched your search

+1 -7
View File
@@ -161,18 +161,12 @@ RUN cd compiler-rt && \
RUN git clone -b master https://github.com/llvm-mirror/libcxx.git && \
git clone -b master https://github.com/llvm-mirror/libcxxabi.git && \
cd libcxx && \
git checkout ea75e09e617815faace7bfeb7ad8885067a46fb6 && \
git checkout 5f919fe349450b3da0e29611ae37f6a940179290 && \
cd ../libcxxabi && \
git checkout b157fdd968a4e1093645ec7c65213736c4bc7ea6
# git clone -b release_40 --depth=1 https://github.com/llvm-mirror/libunwind.git
RUN mkdir /build/patches
COPY patches/libcxx-*.patch /build/patches/
RUN cd libcxx && \
git am /build/patches/libcxx-*.patch
#RUN cd libunwind && mkdir build && cd build && \
# CXXFLAGS="-nodefaultlibs -D_LIBUNWIND_IS_BAREMETAL" \
# LDFLAGS="/build/prefix/armv7-w64-mingw32/lib/crt2.o /build/prefix/armv7-w64-mingw32/lib/crtbegin.o -lmingw32 /build/prefix/bin/../lib/clang/4.0.1/lib/windows/libclang_rt.builtins-arm.a -lmoldname -lmingwex -lmsvcrt -ladvapi32 -lshell32 -luser32 -lkernel32 /build/prefix/armv7-w64-mingw32/lib/crtend.o" \
-26
View File
@@ -1,26 +0,0 @@
From f12a5570d2d24b147122d7b64fc1dadf7226db2c Mon Sep 17 00:00:00 2001
From: Martin Storsjo <martin@martin.st>
Date: Fri, 25 Aug 2017 11:00:37 +0300
Subject: [PATCH 1/2] Handle object files named *.obj in merge_archives.py
Differential Revision: https://reviews.llvm.org/D37133
---
utils/merge_archives.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/utils/merge_archives.py b/utils/merge_archives.py
index 856dd3b..b1bd3cb 100755
--- a/utils/merge_archives.py
+++ b/utils/merge_archives.py
@@ -120,6 +120,8 @@ def main():
files = glob.glob(os.path.join(temp_directory_root, '*.o'))
if not files:
+ files = glob.glob(os.path.join(temp_directory_root, '*.obj'))
+ if not files:
print_and_exit('Failed to glob for %s' % glob_path)
cmd = [ar_exe, '-qc', args.output] + files
execute_command_verbose(cmd, cwd=temp_directory_root, verbose=args.verbose)
--
2.7.4
-30
View File
@@ -1,30 +0,0 @@
From 79a72b66ba63b97812b8f0076c032da9a0033e9e Mon Sep 17 00:00:00 2001
From: Martin Storsjo <martin@martin.st>
Date: Fri, 25 Aug 2017 11:06:31 +0300
Subject: [PATCH 2/2] Rerun ranlib manually after merging the static libraries
In cross build setups, the ar used in merge_archives.py might
not be the right one for the target; make sure to rebuild the
index for the static library.
Differential Revision: https://reviews.llvm.org/D37134
---
lib/CMakeLists.txt | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 5786514..56b9a22 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -272,6 +272,8 @@ if (LIBCXX_ENABLE_STATIC)
"$<TARGET_LINKER_FILE:cxx_static>"
"${MERGE_ARCHIVES_ABI_TARGET}"
"${MERGE_ARCHIVES_SEARCH_PATHS}"
+ COMMAND
+ ${CMAKE_RANLIB} $<TARGET_LINKER_FILE:cxx_static>
WORKING_DIRECTORY ${LIBCXX_BUILD_DIR}
)
endif()
--
2.7.4