Skip to content

Commit 4761247

Browse files
committed
---
yaml --- r: 234366 b: refs/heads/tmp c: 973da4f h: refs/heads/master v: v3
1 parent 9b15c63 commit 4761247

File tree

36 files changed

+1666
-350
lines changed

36 files changed

+1666
-350
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
2626
refs/heads/beta: d2e13e822a73e0ea46ae9e21afdd3155fc997f6d
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
28-
refs/heads/tmp: 0f0c48b0b10358427f23572096d117d07daa67cb
28+
refs/heads/tmp: 973da4fe6f5a3b3b8ac78af401f1d77c5ba6fc37
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3030
refs/tags/homu-tmp: ab792abf1fcc28afbd315426213f6428da25c085
3131
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828

branches/tmp/configure

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1180,16 +1180,27 @@ do
11801180
# MSVC requires cmake because that's how we're going to build LLVM
11811181
probe_need CFG_CMAKE cmake
11821182

1183+
# There are three builds of cmake on windows: MSVC, MinGW and Cygwin
1184+
# The Cygwin build does not have generators for Visual Studio, so
1185+
# detect that here and error.
1186+
if ! "$CFG_CMAKE" --help | sed -n '/^Generators/,$p' | grep 'Visual Studio' > /dev/null
1187+
then
1188+
err "cmake does not support Visual Studio generators.\n\n \
1189+
This is likely due to it being an msys/cygwin build of cmake, \
1190+
rather than the required windows version, built using MinGW \
1191+
or Visual Studio."
1192+
fi
1193+
11831194
# Use the REG program to figure out where VS is installed
11841195
# We need to figure out where cl.exe and link.exe are, so we do some
11851196
# munging and some probing here. We also look for the default
11861197
# INCLUDE and LIB variables for MSVC so we can set those in the
11871198
# build system as well.
1188-
install=$(reg QUERY \
1199+
install=$(cmd //c reg QUERY \
11891200
'HKLM\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0' \
11901201
-v InstallDir)
11911202
if [ -z "$install" ]; then
1192-
install=$(reg QUERY \
1203+
install=$(cmd //c reg QUERY \
11931204
'HKLM\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\12.0' \
11941205
-v InstallDir)
11951206
fi
@@ -1222,9 +1233,9 @@ do
12221233
eval CFG_MSVC_LINK_$bits="\"$bindir/link.exe\""
12231234

12241235
vcvarsall="${CFG_MSVC_ROOT}/VC/vcvarsall.bat"
1225-
include_path=$(cmd /c "\"$vcvarsall\" $msvc_part && cmd /c echo %INCLUDE%")
1236+
include_path=$(cmd //V:ON //c "$vcvarsall" $msvc_part \& echo !INCLUDE!)
12261237
need_ok "failed to learn about MSVC's INCLUDE"
1227-
lib_path=$(cmd /c "\"$vcvarsall\" $msvc_part && cmd /c echo %LIB%")
1238+
lib_path=$(cmd //V:ON //c "$vcvarsall" $msvc_part \& echo !LIB!)
12281239
need_ok "failed to learn about MSVC's LIB"
12291240

12301241
eval CFG_MSVC_INCLUDE_PATH_${bits}="\"$include_path\""

branches/tmp/src/etc/platform-intrinsics/aarch64.json

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,48 @@
336336
"ret": "i8",
337337
"args": ["0"]
338338
},
339+
{
340+
"intrinsic": "ld2{0[0].width}_{0[0].data_type}",
341+
"width": [64, 128],
342+
"llvm": "ld2.{0[0].llvm_name}.{1.llvm_name}",
343+
"ret": ["[i(8-64);2]","[f(32-64);2]"],
344+
"args": ["0.0SPc/0.0"]
345+
},
346+
{
347+
"intrinsic": "ld3{0[0].width}_{0[0].data_type}",
348+
"width": [64, 128],
349+
"llvm": "ld3.{0[0].llvm_name}.{1.llvm_name}",
350+
"ret": ["[i(8-64);3]","[f(32-64);3]"],
351+
"args": ["0.0SPc/0.0"]
352+
},
353+
{
354+
"intrinsic": "ld4{0[0].width}_{0[0].data_type}",
355+
"width": [64, 128],
356+
"llvm": "ld4.{0[0].llvm_name}.{1.llvm_name}",
357+
"ret": ["[i(8-64);4]","[f(32-64);4]"],
358+
"args": ["0.0SPc/0.0"]
359+
},
360+
{
361+
"intrinsic": "ld2{0[0].width}_dup_{0[0].data_type}",
362+
"width": [64, 128],
363+
"llvm": "ld2.{0[0].llvm_name}.{1.llvm_name}",
364+
"ret": ["[i(8-64);2]","[f(32-64);2]"],
365+
"args": ["0.0SPc"]
366+
},
367+
{
368+
"intrinsic": "ld3{0[0].width}_dup_{0[0].data_type}",
369+
"width": [64, 128],
370+
"llvm": "ld3.{0[0].llvm_name}.{1.llvm_name}",
371+
"ret": ["[i(8-64);3]","[f(32-64);3]"],
372+
"args": ["0.0SPc"]
373+
},
374+
{
375+
"intrinsic": "ld4{0[0].width}_dup_{0[0].data_type}",
376+
"width": [64, 128],
377+
"llvm": "ld4.{0[0].llvm_name}.{1.llvm_name}",
378+
"ret": ["[i(8-64);4]","[f(32-64);4]"],
379+
"args": ["0.0SPc"]
380+
},
339381
{
340382
"intrinsic": "padd{0.width}_{0.data_type}",
341383
"width": [64, 128],

0 commit comments

Comments
 (0)