Remove useless files

parent b2ba13d1
kind: cmake
depends:
- filename: bootstrap-import.bst
junction: freedesktop-sdk.bst
type: build
- filename: base/libffi.bst
junction: freedesktop-sdk.bst
type: build
- filename: base/buildsystem-cmake.bst
junction: freedesktop-sdk.bst
type: build
- filename: app-lib.bst
type: runtime
variables:
(?):
- target_arch == "i686":
targets: X86;AMDGPU;NVPTX
- target_arch == "x86_64":
targets: X86;AMDGPU;NVPTX
- target_arch == "arm":
targets: ARM
- target_arch == "aarch64":
targets: AArch64
cmake-local: |
-DLLVM_ENABLE_ASSERTIONS:BOOL=OFF \
-DBUILD_SHARED_LIBS:BOOL=OFF \
-DLLVM_BUILD_LLVM_DYLIB:BOOL=ON \
-DLLVM_DYLIB_SYMBOL_VERSIONING:BOOL=ON \
-DLLVM_LINK_LLVM_DYLIB:BOOL=ON \
-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DLLVM_LIBDIR_SUFFIX="" \
-DLLVM_ENABLE_LIBCXX:BOOL=OFF \
-DLLVM_ENABLE_ZLIB:BOOL=ON \
-DLLVM_ENABLE_FFI:BOOL=ON \
-DLLVM_ENABLE_RTTI:BOOL=ON \
-DLLVM_INCLUDE_TESTS:BOOL=OFF \
-DLLVM_INCLUDE_EXAMPLES:BOOL=OFF \
-DLLVM_INCLUDE_UTILS:BOOL=ON \
-DLLVM_INSTALL_UTILS:BOOL=ON \
-DLLVM_INCLUDE_DOCS:BOOL=OFF \
-DLLVM_ENABLE_DOXYGEN:BOOL=OFF \
-DLLVM_BUILD_EXTERNAL_COMPILER_RT:BOOL=ON \
-DLLVM_BINUTILS_INCDIR=/usr/include \
-DFFI_INCLUDE_DIR="%{runtime-libdir}/libffi-3.2.1/include" \
-DLLVM_INSTALL_TOOLCHAIN_ONLY:BOOL=OFF \
-DLLVM_DEFAULT_TARGET_TRIPLE=%{build-triplet} \
-DLLVM_TARGETS_TO_BUILD="%{targets}"
config:
install-commands:
(>):
- |
rm "%{install-root}%{libdir}"/lib*.a
public:
bst:
split-rules:
devel:
(>):
- '%{debugdir}%{bindir}/**'
- '%{debugdir}%{libdir}/LLVMHello.so.debug'
- '%{debugdir}%{libdir}/LLVMgold.so.debug'
- '%{debugdir}%{libdir}/BugpointPasses.so.debug'
- '%{bindir}/**'
- '%{libexecdir}/**'
- '%{libdir}/libLLVM-7.0.1.so'
- '%{libdir}/libLLVM.so'
- '%{libdir}/LLVMgold.so'
- '%{libdir}/LLVMHello.so'
- '%{libdir}/libLTO.so'
- '%{libdir}/libclang.so'
- '%{libdir}/BugpointPasses.so'
- '%{libdir}/clang'
- '%{libdir}/clang/**'
- '%{datadir}/clang'
- '%{datadir}/clang/**'
- '%{datadir}/opt-viewer'
- '%{datadir}/opt-viewer/**'
- '%{datadir}/scan-build'
- '%{datadir}/scan-build/**'
- '%{datadir}/scan-view'
- '%{datadir}/scan-view/**'
sources:
- kind: tar
url: https://releases.llvm.org/7.0.1/llvm-7.0.1.src.tar.xz
ref: a38dfc4db47102ec79dcc2aa61e93722c5f6f06f0a961073bd84b78fb949419b
- kind: tar
url: https://releases.llvm.org/7.0.1/cfe-7.0.1.src.tar.xz
ref: a45b62dde5d7d5fdcdfa876b0af92f164d434b06e9e89b5d0b1cbc65dfe3f418
directory: tools/clang
- kind: tar
url: https://releases.llvm.org/7.0.1/compiler-rt-7.0.1.src.tar.xz
ref: 782edfc119ee172f169c91dd79f2c964fb6b248bd9b73523149030ed505bbe18
directory: tools/compiler-rt
- kind: patch
path: patches/llvm-clang-ignore-fstack-clash-protection.patch
- kind: patch
path: patches/llvm7-no-rpath.patch
- kind: patch
path: patches/llvm-debug-1.patch
- kind: patch
path: patches/llvm-debug-2.patch
Source: https://reviews.llvm.org/D42593
Index: tools/clang/include/clang/Driver/Options.td
===================================================================
--- a/tools/clang/include/clang/Driver/Options.td
+++ b/tools/clang/include/clang/Driver/Options.td
@@ -2705,6 +2705,7 @@
Group<clang_ignored_gcc_optimization_f_Group>;
defm spec_constr_count : BooleanFFlag<"spec-constr-count">, Group<clang_ignored_f_Group>;
defm stack_check : BooleanFFlag<"stack-check">, Group<clang_ignored_f_Group>;
+defm stack_clash_protection : BooleanFFlag<"stack-clash-protection">, Group<clang_ignored_f_Group>;
defm strength_reduce :
BooleanFFlag<"strength-reduce">, Group<clang_ignored_gcc_optimization_f_Group>;
defm tls_model : BooleanFFlag<"tls-model">, Group<clang_ignored_f_Group>;
Index: test/Driver/clang_f_opts.c
===================================================================
--- a/tools/clang/test/Driver/clang_f_opts.c
+++ b/tools/clang/test/Driver/clang_f_opts.c
@@ -284,6 +284,7 @@
// RUN: -ffriend-injection \
// RUN: -fno-implement-inlines -fimplement-inlines \
// RUN: -fstack-check \
+// RUN: -fstack-clash-protection \
// RUN: -fforce-addr \
// RUN: -malign-functions=100 \
// RUN: -malign-loops=100 \
commit da1fb72bb305d6bc1f3899d541414146934bf80f
Author: Jonas Devlieghere <[email protected]>
Date: Fri Sep 21 12:03:14 2018 +0000
Ensure that variant part discriminator is read by MetadataLoader
https://reviews.llvm.org/D42082 introduced variant parts to debug info
in LLVM. Subsequent work on the Rust compiler has found a bug in that
patch; namely, there is a path in MetadataLoader that fails to restore
the discriminator.
This patch fixes the bug.
Patch by: Tom Tromey
Differential revision: https://reviews.llvm.org/D52340
git-svn-id: https://llvm.org/svn/llvm-project/llvm/[email protected] 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Bitcode/Reader/MetadataLoader.cpp b/lib/Bitcode/Reader/MetadataLoader.cpp
index 3fe7d220563..4781cfe3dea 100644
--- a/lib/Bitcode/Reader/MetadataLoader.cpp
+++ b/lib/Bitcode/Reader/MetadataLoader.cpp
@@ -1313,7 +1313,7 @@ Error MetadataLoader::MetadataLoaderImpl::parseOneMetadata(
(Context, Tag, Name, File, Line, Scope, BaseType,
SizeInBits, AlignInBits, OffsetInBits, Flags,
Elements, RuntimeLang, VTableHolder, TemplateParams,
- Identifier));
+ Identifier, Discriminator));
if (!IsNotUsedInTypeRef && Identifier)
MetadataList.addTypeRef(*Identifier, *cast<DICompositeType>(CT));
diff --git a/test/Assembler/debug-variant-discriminator.ll b/test/Assembler/debug-variant-discriminator.ll
new file mode 100644
index 00000000000..5be001cad6b
--- /dev/null
+++ b/test/Assembler/debug-variant-discriminator.ll
@@ -0,0 +1,14 @@
+; RUN: llvm-as < %s | llvm-dis | llvm-as | llvm-dis | FileCheck %s
+; RUN: verify-uselistorder %s
+
+; CHECK: !named = !{!0, !1, !2}
+!named = !{!0, !1, !2}
+
+; CHECK: !0 = !DICompositeType(tag: DW_TAG_structure_type, name: "Outer", size: 64, align: 64, identifier: "Outer")
+; CHECK-NEXT: !1 = !DICompositeType(tag: DW_TAG_variant_part, scope: !0, size: 64, discriminator: !2)
+; CHECK-NEXT: !2 = !DIDerivedType(tag: DW_TAG_member, scope: !1, baseType: !3, size: 64, align: 64, flags: DIFlagArtificial)
+; CHECK-NEXT: !3 = !DIBasicType(name: "u64", size: 64, encoding: DW_ATE_unsigned)
+!0 = !DICompositeType(tag: DW_TAG_structure_type, name: "Outer", size: 64, align: 64, identifier: "Outer")
+!1 = !DICompositeType(tag: DW_TAG_variant_part, scope: !0, size: 64, discriminator: !2)
+!2 = !DIDerivedType(tag: DW_TAG_member, scope: !1, baseType: !3, size: 64, align: 64, flags: DIFlagArtificial)
+!3 = !DIBasicType(name: "u64", size: 64, encoding: DW_ATE_unsigned)
commit cc1f2a595ead516812a6c50398f0f3480ebe031f
Author: Jonas Devlieghere <[email protected]>
Date: Fri Sep 21 12:28:44 2018 +0000
[test] Fix Assembler/debug-info.ll
Update Assembler/debug-info.ll to contain discriminator.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/[email protected] 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/Assembler/debug-info.ll b/test/Assembler/debug-info.ll
index 4404b741d34..d54dba07ac1 100644
--- a/test/Assembler/debug-info.ll
+++ b/test/Assembler/debug-info.ll
@@ -83,7 +83,7 @@
; CHECK-NEXT: !32 = !DIFile(filename: "file", directory: "dir", checksumkind: CSK_MD5, checksum: "000102030405060708090a0b0c0d0e0f")
!35 = !DIFile(filename: "file", directory: "dir", checksumkind: CSK_MD5, checksum: "000102030405060708090a0b0c0d0e0f")
-; CHECK-NEXT: !33 = !DICompositeType(tag: DW_TAG_variant_part, name: "A", scope: !14, size: 64)
+; CHECK-NEXT: !33 = !DICompositeType(tag: DW_TAG_variant_part, name: "A", scope: !14, size: 64, discriminator: !34)
; CHECK-NEXT: !34 = !DIDerivedType(tag: DW_TAG_member, scope: !33, baseType: !35, size: 64, align: 64, flags: DIFlagArtificial)
; CHECK-NEXT: !35 = !DIBasicType(name: "u64", size: 64, encoding: DW_ATE_unsigned)
!36 = !DICompositeType(tag: DW_TAG_variant_part, name: "A", scope: !16, size: 64, discriminator: !37)
diff -u -r llvm7.old/cmake/modules/AddLLVM.cmake llvm7/cmake/modules/AddLLVM.cmake
--- llvm7.old/cmake/modules/AddLLVM.cmake 2019-02-20 13:05:46.625863076 +0100
+++ llvm7/cmake/modules/AddLLVM.cmake 2019-02-20 13:07:56.756632497 +0100
@@ -1635,7 +1635,7 @@
set(_install_name_dir INSTALL_NAME_DIR "@rpath")
set(_install_rpath "@loader_path/../lib" ${extra_libdir})
elseif(UNIX)
- set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})
+ set(_install_rpath ${extra_libdir})
if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)")
set_property(TARGET ${name} APPEND_STRING PROPERTY
LINK_FLAGS " -Wl,-z,origin ")
diff --git a/src/bootstrap/install.rs b/src/bootstrap/install.rs
index cb28698aa3..649c6a50f8 100644
--- a/src/bootstrap/install.rs
+++ b/src/bootstrap/install.rs
@@ -74,9 +74,7 @@ fn install_sh(
let bindir_default = PathBuf::from("bin");
let libdir_default = PathBuf::from("lib");
let mandir_default = datadir_default.join("man");
- let prefix = builder.config.prefix.as_ref().map_or(prefix_default, |p| {
- fs::canonicalize(p).unwrap_or_else(|_| panic!("could not canonicalize {}", p.display()))
- });
+ let prefix = builder.config.prefix.as_ref().unwrap_or(&prefix_default);
let sysconfdir = builder.config.sysconfdir.as_ref().unwrap_or(&sysconfdir_default);
let datadir = builder.config.datadir.as_ref().unwrap_or(&datadir_default);
let docdir = builder.config.docdir.as_ref().unwrap_or(&docdir_default);
diff -ur rustc-1.28.0-src.old/src/bootstrap/dist.rs rustc-1.28.0-src/src/bootstrap/dist.rs
--- rustc-1.28.0-src.old/src/bootstrap/dist.rs 2018-08-04 21:19:13.304292468 +0300
+++ rustc-1.28.0-src/src/bootstrap/dist.rs 2018-08-05 05:52:12.731588011 +0300
@@ -482,8 +482,9 @@
// Copy over the codegen backends
let backends_src = builder.sysroot_codegen_backends(compiler);
- let backends_rel = backends_src.strip_prefix(&src).unwrap();
- let backends_dst = image.join(&backends_rel);
+ let libdir_relative = builder.build.config.libdir_relative().unwrap();
+ let backends_rel = backends_src.strip_prefix(&src).unwrap().strip_prefix(&libdir_relative).unwrap();
+ let backends_dst = image.join("lib").join(&backends_rel);
t!(fs::create_dir_all(&backends_dst));
builder.cp_r(&backends_src, &backends_dst);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment