aaron/ispc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moving --dllexport to proper help section under Windows ifdef

Browse Source
This commit is contained in:
Dmitry Babokin
2015-05-29 18:14:38 +03:00
parent 4d96244b29
commit 0ed674296f
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
main.cpp
View File

@@ -101,6 +101,9 @@ usage(int ret) {
PrintWithWordBreaks(cpuHelp, 16, TerminalWidth(), stdout); PrintWithWordBreaks(cpuHelp, 16, TerminalWidth(), stdout);
printf(" [-D<foo>]\t\t\t\t#define given value when running preprocessor\n"); printf(" [-D<foo>]\t\t\t\t#define given value when running preprocessor\n");
printf(" [--dev-stub <filename>]\t\tEmit device-side offload stub functions to file\n"); printf(" [--dev-stub <filename>]\t\tEmit device-side offload stub functions to file\n");
#ifdef ISPC_IS_WINDOWS
printf(" [--dllexport]\t\t\tMake non-static functions DLL exported. Windows only.\n");
#endif
printf(" [--emit-asm]\t\t\tGenerate assembly language file as output\n"); printf(" [--emit-asm]\t\t\tGenerate assembly language file as output\n");
printf(" [--emit-c++]\t\t\tEmit a C++ source file as output\n"); printf(" [--emit-c++]\t\t\tEmit a C++ source file as output\n");
printf(" [--emit-llvm]\t\t\tEmit LLVM bitode file as output\n"); printf(" [--emit-llvm]\t\t\tEmit LLVM bitode file as output\n");
@@ -154,7 +157,6 @@ devUsage(int ret) {
printf("\nusage (developer options): ispc\n"); printf("\nusage (developer options): ispc\n");
printf(" [--debug]\t\t\t\tPrint information useful for debugging ispc\n"); printf(" [--debug]\t\t\t\tPrint information useful for debugging ispc\n");
printf(" [--print-target]\t\t\tPrint target's information\n"); printf(" [--print-target]\t\t\tPrint target's information\n");
printf(" [--dllexport]\t\t\tMake non-static functions DLL exported. Windows only.\n");
printf(" [--fuzz-test]\t\t\tRandomly perturb program input to test error conditions\n"); printf(" [--fuzz-test]\t\t\tRandomly perturb program input to test error conditions\n");
printf(" [--fuzz-seed=<value>]\t\tSeed value for RNG for fuzz testing\n"); printf(" [--fuzz-seed=<value>]\t\tSeed value for RNG for fuzz testing\n");
printf(" [--opt=<option>]\t\t\tSet optimization option\n"); printf(" [--opt=<option>]\t\t\tSet optimization option\n");
@@ -381,8 +383,10 @@ int main(int Argc, char *Argv[]) {
} }
else if (!strcmp(argv[i], "--debug")) else if (!strcmp(argv[i], "--debug"))
g->debugPrint = true; g->debugPrint = true;
#ifdef ISPC_IS_WINDOWS
else if (!strcmp(argv[i], "--dllexport")) else if (!strcmp(argv[i], "--dllexport"))
g->dllExport = true; g->dllExport = true;
#endif
else if (!strcmp(argv[i], "--print-target")) else if (!strcmp(argv[i], "--print-target"))
g->printTarget = true; g->printTarget = true;
else if (!strcmp(argv[i], "--instrument")) else if (!strcmp(argv[i], "--instrument"))

2
module.cpp
View File

@@ -985,7 +985,7 @@ Module::AddFunctionDeclaration(const std::string &name,
llvm::Function *function = llvm::Function *function =
llvm::Function::Create(llvmFunctionType, linkage, functionName.c_str(), llvm::Function::Create(llvmFunctionType, linkage, functionName.c_str(),
module); module);
#ifdef ISPC_IS_WINDOWS #ifdef ISPC_IS_WINDOWS
// Make export functions callable from DLLS. // Make export functions callable from DLLS.
if ((g->dllExport) && (storageClass != SC_STATIC)) { if ((g->dllExport) && (storageClass != SC_STATIC)) {