Skip to content

Commit 3074f4b

Browse files
committed
---
yaml --- r: 231783 b: refs/heads/auto c: 0f0c48b h: refs/heads/master i: 231781: 09e0b63 231779: 8905403 231775: 26e00ac v: v3
1 parent f2a2882 commit 3074f4b

File tree

38 files changed

+357
-1673
lines changed

38 files changed

+357
-1673
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
88
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
99
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1010
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
11-
refs/heads/auto: 7ee876cb8e0e3308669d3e00faa3ffe1034ca562
11+
refs/heads/auto: 0f0c48b0b10358427f23572096d117d07daa67cb
1212
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1313
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
1414
refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/configure

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1180,27 +1180,16 @@ 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-
11941183
# Use the REG program to figure out where VS is installed
11951184
# We need to figure out where cl.exe and link.exe are, so we do some
11961185
# munging and some probing here. We also look for the default
11971186
# INCLUDE and LIB variables for MSVC so we can set those in the
11981187
# build system as well.
1199-
install=$(cmd //c reg QUERY \
1188+
install=$(reg QUERY \
12001189
'HKLM\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0' \
12011190
-v InstallDir)
12021191
if [ -z "$install" ]; then
1203-
install=$(cmd //c reg QUERY \
1192+
install=$(reg QUERY \
12041193
'HKLM\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\12.0' \
12051194
-v InstallDir)
12061195
fi
@@ -1233,9 +1222,9 @@ do
12331222
eval CFG_MSVC_LINK_$bits="\"$bindir/link.exe\""
12341223

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

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

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

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -336,48 +336,6 @@
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-
},
381339
{
382340
"intrinsic": "padd{0.width}_{0.data_type}",
383341
"width": [64, 128],

0 commit comments

Comments
 (0)