summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/trans/codegen_c.cpp6
-rw-r--r--vsproject/build_rustc_minicargo.cmd11
2 files changed, 6 insertions, 11 deletions
diff --git a/src/trans/codegen_c.cpp b/src/trans/codegen_c.cpp
index 4131c820..5f22f081 100644
--- a/src/trans/codegen_c.cpp
+++ b/src/trans/codegen_c.cpp
@@ -5233,11 +5233,7 @@ namespace {
m_of << "atomic_store_explicit("; emit_atomic_cast(); emit_param(e.args.at(0)); m_of << ", "; emit_param(e.args.at(1)); m_of << ", " << get_atomic_ty_gcc(ordering) << ")";
break;
case Compiler::Msvc:
- emit_msvc_atomic_op("InterlockedCompareExchange", ordering, true); emit_param(e.args.at(0)); m_of << ", ";
- emit_param(e.args.at(1));
- m_of << ", ";
- emit_param(e.args.at(1));
- m_of << ")";
+ m_of << "*"; emit_param(e.args.at(0)); m_of << " = "; emit_param(e.args.at(1));
break;
}
}
diff --git a/vsproject/build_rustc_minicargo.cmd b/vsproject/build_rustc_minicargo.cmd
index acaadf47..af4ffb7b 100644
--- a/vsproject/build_rustc_minicargo.cmd
+++ b/vsproject/build_rustc_minicargo.cmd
@@ -1,7 +1,6 @@
-@echo off
-call build_std.cmd
-if %errorlevel% neq 0 exit /b %errorlevel%
+@call build_std.cmd
+@if %errorlevel% neq 0 exit /b %errorlevel%
-mkdir output\rustc-build
-x64\Release\minicargo.exe ..\rustc-1.19.0-src\src\rustc -L output --output-dir output\rustc-build --vendor-dir ..\rustc-1.19.0-src\src\vendor
-if %errorlevel% neq 0 exit /b %errorlevel% \ No newline at end of file
+@mkdir output\rustc-build
+x64\Release\minicargo.exe ..\rustc-%RUSTC_VERSION%-src\src\rustc -L %OUTDIR% --output-dir %OUTDIR%\rustc-build --vendor-dir ..\rustc-%RUSTC_VERSION%-src\src\vendor
+@if %errorlevel% neq 0 exit /b %errorlevel% \ No newline at end of file