Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
6e17a5c5
R
Rust
项目概览
int
/
Rust
11 个月 前同步成功
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
Rust
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6e17a5c5
编写于
3月 25, 2021
作者:
B
bors
浏览文件
操作
浏览文件
下载
差异文件
Auto merge of #83387 - cuviper:min-llvm-10, r=nagisa
Update the minimum external LLVM to 10 r? `@nikic`
上级
bba40880
fcb37cb7
变更
16
隐藏空白更改
内联
并排
Showing
16 changed file
with
19 addition
and
137 deletion
+19
-137
.github/workflows/ci.yml
.github/workflows/ci.yml
+2
-2
compiler/rustc_codegen_llvm/src/context.rs
compiler/rustc_codegen_llvm/src/context.rs
+0
-9
compiler/rustc_llvm/build.rs
compiler/rustc_llvm/build.rs
+0
-14
compiler/rustc_llvm/llvm-wrapper/ArchiveWrapper.cpp
compiler/rustc_llvm/llvm-wrapper/ArchiveWrapper.cpp
+0
-4
compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp
compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp
+0
-41
compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp
compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp
+0
-38
compiler/rustc_llvm/src/lib.rs
compiler/rustc_llvm/src/lib.rs
+1
-4
library/core/src/num/dec2flt/algorithm.rs
library/core/src/num/dec2flt/algorithm.rs
+4
-6
library/profiler_builtins/build.rs
library/profiler_builtins/build.rs
+1
-3
library/std/src/sys/sgx/abi/mem.rs
library/std/src/sys/sgx/abi/mem.rs
+2
-3
library/std/src/sys/sgx/ext/arch.rs
library/std/src/sys/sgx/ext/arch.rs
+2
-4
src/bootstrap/native.rs
src/bootstrap/native.rs
+2
-2
src/ci/docker/host-x86_64/x86_64-gnu-llvm-10/Dockerfile
src/ci/docker/host-x86_64/x86_64-gnu-llvm-10/Dockerfile
+3
-3
src/ci/github-actions/ci.yml
src/ci/github-actions/ci.yml
+2
-2
src/test/codegen/simd-intrinsic/simd-intrinsic-transmute-array.rs
.../codegen/simd-intrinsic/simd-intrinsic-transmute-array.rs
+0
-1
src/test/ui/simd/simd-intrinsic-generic-reduction.rs
src/test/ui/simd/simd-intrinsic-generic-reduction.rs
+0
-1
未找到文件。
.github/workflows/ci.yml
浏览文件 @
6e17a5c5
...
...
@@ -43,7 +43,7 @@ jobs:
-
name
:
mingw-check
os
:
ubuntu-latest-xl
env
:
{}
-
name
:
x86_64-gnu-llvm-
9
-
name
:
x86_64-gnu-llvm-
10
os
:
ubuntu-latest-xl
env
:
{}
-
name
:
x86_64-gnu-tools
...
...
@@ -265,7 +265,7 @@ jobs:
-
name
:
x86_64-gnu-distcheck
os
:
ubuntu-latest-xl
env
:
{}
-
name
:
x86_64-gnu-llvm-
9
-
name
:
x86_64-gnu-llvm-
10
env
:
RUST_BACKTRACE
:
1
os
:
ubuntu-latest-xl
...
...
compiler/rustc_codegen_llvm/src/context.rs
浏览文件 @
6e17a5c5
...
...
@@ -101,10 +101,6 @@ fn to_llvm_tls_model(tls_model: TlsModel) -> llvm::ThreadLocalMode {
}
}
fn
strip_x86_address_spaces
(
data_layout
:
String
)
->
String
{
data_layout
.replace
(
"-p270:32:32-p271:32:32-p272:64:64-"
,
"-"
)
}
fn
strip_powerpc64_vectors
(
data_layout
:
String
)
->
String
{
data_layout
.replace
(
"-v256:256:256-v512:512:512"
,
""
)
}
...
...
@@ -119,11 +115,6 @@ pub unsafe fn create_module(
let
llmod
=
llvm
::
LLVMModuleCreateWithNameInContext
(
mod_name
.as_ptr
(),
llcx
);
let
mut
target_data_layout
=
sess
.target.data_layout
.clone
();
if
llvm_util
::
get_version
()
<
(
10
,
0
,
0
)
&&
(
sess
.target.arch
==
"x86"
||
sess
.target.arch
==
"x86_64"
)
{
target_data_layout
=
strip_x86_address_spaces
(
target_data_layout
);
}
if
llvm_util
::
get_version
()
<
(
12
,
0
,
0
)
&&
sess
.target.arch
==
"powerpc64"
{
target_data_layout
=
strip_powerpc64_vectors
(
target_data_layout
);
}
...
...
compiler/rustc_llvm/build.rs
浏览文件 @
6e17a5c5
...
...
@@ -88,16 +88,6 @@ fn main() {
"riscv"
,
];
let
mut
version_cmd
=
Command
::
new
(
&
llvm_config
);
version_cmd
.arg
(
"--version"
);
let
version_output
=
output
(
&
mut
version_cmd
);
let
mut
parts
=
version_output
.split
(
'.'
)
.take
(
2
)
.filter_map
(|
s
|
s
.parse
::
<
u32
>
()
.ok
());
let
(
major
,
_
minor
)
=
if
let
(
Some
(
major
),
Some
(
minor
))
=
(
parts
.next
(),
parts
.next
())
{
(
major
,
minor
)
}
else
{
(
8
,
0
)
};
let
required_components
=
&
[
"ipo"
,
"bitreader"
,
...
...
@@ -123,10 +113,6 @@ fn main() {
println!
(
"cargo:rustc-cfg=llvm_component=
\"
{}
\"
"
,
component
);
}
if
major
>=
9
{
println!
(
"cargo:rustc-cfg=llvm_has_msp430_asm_parser"
);
}
// Link in our own LLVM shims, compiled with the same flags as LLVM
let
mut
cmd
=
Command
::
new
(
&
llvm_config
);
cmd
.arg
(
"--cxxflags"
);
...
...
compiler/rustc_llvm/llvm-wrapper/ArchiveWrapper.cpp
浏览文件 @
6e17a5c5
...
...
@@ -91,11 +91,7 @@ extern "C" void LLVMRustDestroyArchive(LLVMRustArchiveRef RustArchive) {
extern
"C"
LLVMRustArchiveIteratorRef
LLVMRustArchiveIteratorNew
(
LLVMRustArchiveRef
RustArchive
)
{
Archive
*
Archive
=
RustArchive
->
getBinary
();
#if LLVM_VERSION_GE(10, 0)
std
::
unique_ptr
<
Error
>
Err
=
std
::
make_unique
<
Error
>
(
Error
::
success
());
#else
std
::
unique_ptr
<
Error
>
Err
=
llvm
::
make_unique
<
Error
>
(
Error
::
success
());
#endif
auto
Cur
=
Archive
->
child_begin
(
*
Err
);
if
(
*
Err
)
{
LLVMRustSetLastError
(
toString
(
std
::
move
(
*
Err
)).
c_str
());
...
...
compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp
浏览文件 @
6e17a5c5
...
...
@@ -65,13 +65,9 @@ extern "C" void LLVMInitializePasses() {
}
extern
"C"
void
LLVMTimeTraceProfilerInitialize
()
{
#if LLVM_VERSION_GE(10, 0)
timeTraceProfilerInitialize
(
/* TimeTraceGranularity */
0
,
/* ProcName */
"rustc"
);
#else
timeTraceProfilerInitialize
();
#endif
}
extern
"C"
void
LLVMTimeTraceProfilerFinish
(
const
char
*
FileName
)
{
...
...
@@ -596,7 +592,6 @@ enum class LLVMRustFileType {
ObjectFile
,
};
#if LLVM_VERSION_GE(10, 0)
static
CodeGenFileType
fromRust
(
LLVMRustFileType
Type
)
{
switch
(
Type
)
{
case
LLVMRustFileType
::
AssemblyFile
:
...
...
@@ -607,18 +602,6 @@ static CodeGenFileType fromRust(LLVMRustFileType Type) {
report_fatal_error
(
"Bad FileType."
);
}
}
#else
static
TargetMachine
::
CodeGenFileType
fromRust
(
LLVMRustFileType
Type
)
{
switch
(
Type
)
{
case
LLVMRustFileType
::
AssemblyFile
:
return
TargetMachine
::
CGFT_AssemblyFile
;
case
LLVMRustFileType
::
ObjectFile
:
return
TargetMachine
::
CGFT_ObjectFile
;
default:
report_fatal_error
(
"Bad FileType."
);
}
}
#endif
extern
"C"
LLVMRustResult
LLVMRustWriteOutputFile
(
LLVMTargetMachineRef
Target
,
LLVMPassManagerRef
PMR
,
...
...
@@ -868,13 +851,11 @@ LLVMRustOptimizeWithNewPassManager(
}
);
#else
#if LLVM_VERSION_GE(10, 0)
PipelineStartEPCallbacks
.
push_back
(
[
Options
](
ModulePassManager
&
MPM
,
PassBuilder
::
OptimizationLevel
Level
)
{
MPM
.
addPass
(
MemorySanitizerPass
(
Options
));
}
);
#endif
OptimizerLastEPCallbacks
.
push_back
(
[
Options
](
FunctionPassManager
&
FPM
,
PassBuilder
::
OptimizationLevel
Level
)
{
FPM
.
addPass
(
MemorySanitizerPass
(
Options
));
...
...
@@ -892,13 +873,11 @@ LLVMRustOptimizeWithNewPassManager(
}
);
#else
#if LLVM_VERSION_GE(10, 0)
PipelineStartEPCallbacks
.
push_back
(
[](
ModulePassManager
&
MPM
,
PassBuilder
::
OptimizationLevel
Level
)
{
MPM
.
addPass
(
ThreadSanitizerPass
());
}
);
#endif
OptimizerLastEPCallbacks
.
push_back
(
[](
FunctionPassManager
&
FPM
,
PassBuilder
::
OptimizationLevel
Level
)
{
FPM
.
addPass
(
ThreadSanitizerPass
());
...
...
@@ -989,13 +968,11 @@ LLVMRustOptimizeWithNewPassManager(
MPM
.
addPass
(
AlwaysInlinerPass
(
EmitLifetimeMarkers
));
# if LLVM_VERSION_GE(10, 0)
if
(
PGOOpt
)
{
PB
.
addPGOInstrPassesForO0
(
MPM
,
DebugPassManager
,
PGOOpt
->
Action
==
PGOOptions
::
IRInstr
,
/*IsCS=*/
false
,
PGOOpt
->
ProfileFile
,
PGOOpt
->
ProfileRemappingFile
);
}
# endif
#endif
}
else
{
#if LLVM_VERSION_GE(12, 0)
...
...
@@ -1366,11 +1343,7 @@ LLVMRustCreateThinLTOData(LLVMRustThinLTOModule *modules,
int
num_modules
,
const
char
**
preserved_symbols
,
int
num_symbols
)
{
#if LLVM_VERSION_GE(10, 0)
auto
Ret
=
std
::
make_unique
<
LLVMRustThinLTOData
>
();
#else
auto
Ret
=
llvm
::
make_unique
<
LLVMRustThinLTOData
>
();
#endif
// Load each module's summary and merge it into one combined index
for
(
int
i
=
0
;
i
<
num_modules
;
i
++
)
{
...
...
@@ -1463,7 +1436,6 @@ LLVMRustCreateThinLTOData(LLVMRustThinLTOModule *modules,
ExportedGUIDs
.
insert
(
GUID
);
}
}
#if LLVM_VERSION_GE(10, 0)
auto
isExported
=
[
&
](
StringRef
ModuleIdentifier
,
ValueInfo
VI
)
{
const
auto
&
ExportList
=
Ret
->
ExportLists
.
find
(
ModuleIdentifier
);
return
(
ExportList
!=
Ret
->
ExportLists
.
end
()
&&
...
...
@@ -1471,15 +1443,6 @@ LLVMRustCreateThinLTOData(LLVMRustThinLTOModule *modules,
ExportedGUIDs
.
count
(
VI
.
getGUID
());
};
thinLTOInternalizeAndPromoteInIndex
(
Ret
->
Index
,
isExported
,
isPrevailing
);
#else
auto
isExported
=
[
&
](
StringRef
ModuleIdentifier
,
GlobalValue
::
GUID
GUID
)
{
const
auto
&
ExportList
=
Ret
->
ExportLists
.
find
(
ModuleIdentifier
);
return
(
ExportList
!=
Ret
->
ExportLists
.
end
()
&&
ExportList
->
second
.
count
(
GUID
))
||
ExportedGUIDs
.
count
(
GUID
);
};
thinLTOInternalizeAndPromoteInIndex
(
Ret
->
Index
,
isExported
);
#endif
return
Ret
.
release
();
}
...
...
@@ -1636,11 +1599,7 @@ struct LLVMRustThinLTOBuffer {
extern
"C"
LLVMRustThinLTOBuffer
*
LLVMRustThinLTOBufferCreate
(
LLVMModuleRef
M
)
{
#if LLVM_VERSION_GE(10, 0)
auto
Ret
=
std
::
make_unique
<
LLVMRustThinLTOBuffer
>
();
#else
auto
Ret
=
llvm
::
make_unique
<
LLVMRustThinLTOBuffer
>
();
#endif
{
raw_string_ostream
OS
(
Ret
->
data
);
{
...
...
compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp
浏览文件 @
6e17a5c5
...
...
@@ -541,11 +541,6 @@ static DINode::DIFlags fromRust(LLVMRustDIFlags Flags) {
if
(
isSet
(
Flags
&
LLVMRustDIFlags
::
FlagAppleBlock
))
{
Result
|=
DINode
::
DIFlags
::
FlagAppleBlock
;
}
#if LLVM_VERSION_LT(10, 0)
if
(
isSet
(
Flags
&
LLVMRustDIFlags
::
FlagBlockByrefStruct
))
{
Result
|=
DINode
::
DIFlags
::
FlagBlockByrefStruct
;
}
#endif
if
(
isSet
(
Flags
&
LLVMRustDIFlags
::
FlagVirtual
))
{
Result
|=
DINode
::
DIFlags
::
FlagVirtual
;
}
...
...
@@ -910,9 +905,7 @@ extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateStaticVariable(
unwrapDI
<
DIDescriptor
>
(
Context
),
StringRef
(
Name
,
NameLen
),
StringRef
(
LinkageName
,
LinkageNameLen
),
unwrapDI
<
DIFile
>
(
File
),
LineNo
,
unwrapDI
<
DIType
>
(
Ty
),
IsLocalToUnit
,
#if LLVM_VERSION_GE(10, 0)
/* isDefined */
true
,
#endif
InitExpr
,
unwrapDIPtr
<
MDNode
>
(
Decl
),
/* templateParams */
nullptr
,
AlignInBits
);
...
...
@@ -1099,19 +1092,11 @@ inline section_iterator *unwrap(LLVMSectionIteratorRef SI) {
extern
"C"
size_t
LLVMRustGetSectionName
(
LLVMSectionIteratorRef
SI
,
const
char
**
Ptr
)
{
#if LLVM_VERSION_GE(10, 0)
auto
NameOrErr
=
(
*
unwrap
(
SI
))
->
getName
();
if
(
!
NameOrErr
)
report_fatal_error
(
NameOrErr
.
takeError
());
*
Ptr
=
NameOrErr
->
data
();
return
NameOrErr
->
size
();
#else
StringRef
Ret
;
if
(
std
::
error_code
EC
=
(
*
unwrap
(
SI
))
->
getName
(
Ret
))
report_fatal_error
(
EC
.
message
());
*
Ptr
=
Ret
.
data
();
return
Ret
.
size
();
#endif
}
// LLVMArrayType function does not support 64-bit ElementCount
...
...
@@ -1450,47 +1435,28 @@ extern "C" LLVMValueRef LLVMRustBuildMemCpy(LLVMBuilderRef B,
LLVMValueRef
Dst
,
unsigned
DstAlign
,
LLVMValueRef
Src
,
unsigned
SrcAlign
,
LLVMValueRef
Size
,
bool
IsVolatile
)
{
#if LLVM_VERSION_GE(10, 0)
return
wrap
(
unwrap
(
B
)
->
CreateMemCpy
(
unwrap
(
Dst
),
MaybeAlign
(
DstAlign
),
unwrap
(
Src
),
MaybeAlign
(
SrcAlign
),
unwrap
(
Size
),
IsVolatile
));
#else
return
wrap
(
unwrap
(
B
)
->
CreateMemCpy
(
unwrap
(
Dst
),
DstAlign
,
unwrap
(
Src
),
SrcAlign
,
unwrap
(
Size
),
IsVolatile
));
#endif
}
extern
"C"
LLVMValueRef
LLVMRustBuildMemMove
(
LLVMBuilderRef
B
,
LLVMValueRef
Dst
,
unsigned
DstAlign
,
LLVMValueRef
Src
,
unsigned
SrcAlign
,
LLVMValueRef
Size
,
bool
IsVolatile
)
{
#if LLVM_VERSION_GE(10, 0)
return
wrap
(
unwrap
(
B
)
->
CreateMemMove
(
unwrap
(
Dst
),
MaybeAlign
(
DstAlign
),
unwrap
(
Src
),
MaybeAlign
(
SrcAlign
),
unwrap
(
Size
),
IsVolatile
));
#else
return
wrap
(
unwrap
(
B
)
->
CreateMemMove
(
unwrap
(
Dst
),
DstAlign
,
unwrap
(
Src
),
SrcAlign
,
unwrap
(
Size
),
IsVolatile
));
#endif
}
extern
"C"
LLVMValueRef
LLVMRustBuildMemSet
(
LLVMBuilderRef
B
,
LLVMValueRef
Dst
,
unsigned
DstAlign
,
LLVMValueRef
Val
,
LLVMValueRef
Size
,
bool
IsVolatile
)
{
#if LLVM_VERSION_GE(10, 0)
return
wrap
(
unwrap
(
B
)
->
CreateMemSet
(
unwrap
(
Dst
),
unwrap
(
Val
),
unwrap
(
Size
),
MaybeAlign
(
DstAlign
),
IsVolatile
));
#else
return
wrap
(
unwrap
(
B
)
->
CreateMemSet
(
unwrap
(
Dst
),
unwrap
(
Val
),
unwrap
(
Size
),
DstAlign
,
IsVolatile
));
#endif
}
extern
"C"
LLVMValueRef
...
...
@@ -1676,11 +1642,7 @@ struct LLVMRustModuleBuffer {
extern
"C"
LLVMRustModuleBuffer
*
LLVMRustModuleBufferCreate
(
LLVMModuleRef
M
)
{
#if LLVM_VERSION_GE(10, 0)
auto
Ret
=
std
::
make_unique
<
LLVMRustModuleBuffer
>
();
#else
auto
Ret
=
llvm
::
make_unique
<
LLVMRustModuleBuffer
>
();
#endif
{
raw_string_ostream
OS
(
Ret
->
data
);
{
...
...
compiler/rustc_llvm/src/lib.rs
浏览文件 @
6e17a5c5
...
...
@@ -125,10 +125,7 @@ fn init() { }
LLVMInitializeMSP430TargetInfo
,
LLVMInitializeMSP430Target
,
LLVMInitializeMSP430TargetMC
,
LLVMInitializeMSP430AsmPrinter
);
init_target!
(
all
(
llvm_component
=
"msp430"
,
llvm_has_msp430_asm_parser
),
LLVMInitializeMSP430AsmPrinter
,
LLVMInitializeMSP430AsmParser
);
init_target!
(
...
...
library/core/src/num/dec2flt/algorithm.rs
浏览文件 @
6e17a5c5
...
...
@@ -62,10 +62,9 @@ fn set_cw(cw: u16) {
// any `u16`
unsafe
{
asm!
(
"fldcw
({})
"
,
"fldcw
word ptr [{}]
"
,
in
(
reg
)
&
cw
,
// FIXME: We are using ATT syntax to support LLVM 8 and LLVM 9.
options
(
att_syntax
,
nostack
),
options
(
nostack
),
)
}
}
...
...
@@ -87,10 +86,9 @@ pub fn set_precision<T>() -> FPUControlWord {
// any `u16`
unsafe
{
asm!
(
"fnstcw
({})
"
,
"fnstcw
word ptr [{}]
"
,
in
(
reg
)
&
mut
cw
,
// FIXME: We are using ATT syntax to support LLVM 8 and LLVM 9.
options
(
att_syntax
,
nostack
),
options
(
nostack
),
)
}
...
...
library/profiler_builtins/build.rs
浏览文件 @
6e17a5c5
...
...
@@ -24,13 +24,11 @@ fn main() {
"InstrProfilingPlatformLinux.c"
,
"InstrProfilingPlatformOther.c"
,
"InstrProfilingPlatformWindows.c"
,
"InstrProfilingRuntime.cpp"
,
"InstrProfilingUtil.c"
,
"InstrProfilingValue.c"
,
"InstrProfilingVersionVar.c"
,
"InstrProfilingWriter.c"
,
// This file was renamed in LLVM 10.
"InstrProfilingRuntime.cc"
,
"InstrProfilingRuntime.cpp"
,
// These files were added in LLVM 11.
"InstrProfilingInternal.c"
,
"InstrProfilingBiasVar.c"
,
...
...
library/std/src/sys/sgx/abi/mem.rs
浏览文件 @
6e17a5c5
...
...
@@ -36,10 +36,9 @@ pub fn image_base() -> u64 {
let
base
:
u64
;
unsafe
{
asm!
(
"lea
IMAGE_BASE(%rip), {}
"
,
"lea
{}, qword ptr [rip + IMAGE_BASE]
"
,
lateout
(
reg
)
base
,
// NOTE(#76738): ATT syntax is used to support LLVM 8 and 9.
options
(
att_syntax
,
nostack
,
preserves_flags
,
nomem
,
pure
),
options
(
nostack
,
preserves_flags
,
nomem
,
pure
),
)
};
base
...
...
library/std/src/sys/sgx/ext/arch.rs
浏览文件 @
6e17a5c5
...
...
@@ -36,8 +36,7 @@
inlateout
(
"eax"
)
ENCLU_EGETKEY
=>
error
,
in
(
"rbx"
)
request
,
in
(
"rcx"
)
out
.as_mut_ptr
(),
// NOTE(#76738): ATT syntax is used to support LLVM 8 and 9.
options
(
att_syntax
,
nostack
),
options
(
nostack
),
);
match
error
{
...
...
@@ -66,8 +65,7 @@ pub fn ereport(
in
(
"rbx"
)
targetinfo
,
in
(
"rcx"
)
reportdata
,
in
(
"rdx"
)
report
.as_mut_ptr
(),
// NOTE(#76738): ATT syntax is used to support LLVM 8 and 9.
options
(
att_syntax
,
preserves_flags
,
nostack
),
options
(
preserves_flags
,
nostack
),
);
report
.assume_init
()
...
...
src/bootstrap/native.rs
浏览文件 @
6e17a5c5
...
...
@@ -347,11 +347,11 @@ fn check_llvm_version(builder: &Builder<'_>, llvm_config: &Path) {
let
version
=
output
(
cmd
.arg
(
"--version"
));
let
mut
parts
=
version
.split
(
'.'
)
.take
(
2
)
.filter_map
(|
s
|
s
.parse
::
<
u32
>
()
.ok
());
if
let
(
Some
(
major
),
Some
(
_
minor
))
=
(
parts
.next
(),
parts
.next
())
{
if
major
>=
9
{
if
major
>=
10
{
return
;
}
}
panic!
(
"
\n\n
bad LLVM version: {}, need >=
9
.0
\n\n
"
,
version
)
panic!
(
"
\n\n
bad LLVM version: {}, need >=
10
.0
\n\n
"
,
version
)
}
fn
configure_cmake
(
...
...
src/ci/docker/host-x86_64/x86_64-gnu-llvm-
9
/Dockerfile
→
src/ci/docker/host-x86_64/x86_64-gnu-llvm-
10
/Dockerfile
浏览文件 @
6e17a5c5
...
...
@@ -13,8 +13,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
cmake
\
sudo
\
gdb
\
llvm-
9
-tools
\
llvm-
9
-dev
\
llvm-
10
-tools
\
llvm-
10
-dev
\
libedit-dev
\
libssl-dev
\
pkg-config
\
...
...
@@ -28,7 +28,7 @@ RUN sh /scripts/sccache.sh
# using llvm-link-shared due to libffi issues -- see #34486
ENV
RUST_CONFIGURE_ARGS \
--build=x86_64-unknown-linux-gnu \
--llvm-root=/usr/lib/llvm-
9
\
--llvm-root=/usr/lib/llvm-
10
\
--enable-llvm-link-shared \
--set rust.thin-lto-import-instr-limit=10
...
...
src/ci/github-actions/ci.yml
浏览文件 @
6e17a5c5
...
...
@@ -280,7 +280,7 @@ jobs:
-
name
:
mingw-check
<<
:
*job-linux-xl
-
name
:
x86_64-gnu-llvm-
9
-
name
:
x86_64-gnu-llvm-
10
<<
:
*job-linux-xl
-
name
:
x86_64-gnu-tools
...
...
@@ -412,7 +412,7 @@ jobs:
-
name
:
x86_64-gnu-distcheck
<<
:
*job-linux-xl
-
name
:
x86_64-gnu-llvm-
9
-
name
:
x86_64-gnu-llvm-
10
env
:
RUST_BACKTRACE
:
1
<<
:
*job-linux-xl
...
...
src/test/codegen/simd-intrinsic/simd-intrinsic-transmute-array.rs
浏览文件 @
6e17a5c5
// ignore-tidy-linelength
// compile-flags: -C no-prepopulate-passes
// min-llvm-version 8.0
#![crate_type
=
"lib"
]
...
...
src/test/ui/simd/simd-intrinsic-generic-reduction.rs
浏览文件 @
6e17a5c5
...
...
@@ -2,7 +2,6 @@
#![allow(non_camel_case_types)]
// ignore-emscripten
// min-system-llvm-version: 9.0
// Test that the simd_reduce_{op} intrinsics produce the correct results.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录