Merge pull request #487 from dbabokin/win_output

Typos and formatting fixes on Windows
This commit is contained in:
Dmitry Babokin
2013-05-01 17:07:28 -07:00
4 changed files with 6 additions and 4 deletions

View File

@@ -3,7 +3,7 @@
REM If LLVM_INSTALL_DIR isn't set globally in your environment,
REM it can be set here_
REM set LLVM_INSTALL_DIR=c:\users\mmp\llvm-dev
REM set LLVM_VERSION=3.2
REM set LLVM_VERSION=LLVM_3_2
REM Both the LLVM binaries and python need to be in the path
set path=%LLVM_INSTALL_DIR%\bin;%PATH%;c:\cygwin\bin

View File

@@ -974,7 +974,8 @@ DefineStdlib(SymbolTable *symbolTable, llvm::LLVMContext *ctx, llvm::Module *mod
// If the user wants the standard library to be included, parse the
// serialized version of the stdlib.ispc file to get its
// definitions added.
if (g->target->getISA() == Target::GENERIC&&g->target->getVectorWidth()!=1) { // 1 wide uses x86 stdlib
if (g->target->getISA() == Target::GENERIC &&
g->target->getVectorWidth() != 1) { // 1 wide uses x86 stdlib
extern char stdlib_generic_code[];
yy_scan_string(stdlib_generic_code);
yyparse();

View File

@@ -968,7 +968,7 @@ Module::writeOutput(OutputType outputType, const char *outFileName,
return 1;
}
if (fileType != NULL)
Warning(SourcePos(), "Warning: emitting %s file, but filename \"%s\" "
Warning(SourcePos(), "Emitting %s file, but filename \"%s\" "
"has suffix \"%s\"?", fileType, outFileName, suffix);
}
@@ -2325,7 +2325,7 @@ Module::CompileAndOutput(const char *srcFile,
}
else {
if (outputType == CXX) {
Error(SourcePos(), "Illegal to specify more then one target when "
Error(SourcePos(), "Illegal to specify more than one target when "
"compiling C++ output.");
return 1;
}

View File

@@ -232,6 +232,7 @@ static void
lPrintWithWordBreaks(const char *buf, int indent, int columnWidth, FILE *out) {
#ifdef ISPC_IS_WINDOWS
fputs(buf, out);
fputs("\n", out);
#else
int column = 0;
int width = std::max(40, columnWidth - 2);