[llvm-commits] [dragonegg] r162290 - in /dragonegg/trunk: src/Backend.cpp test/validator/c/StackProtector.c

[Duncan Sands]

Author: baldrick
Date: Tue Aug 21 12:07:59 2012
New Revision: 162290

URL: http://llvm.org/viewvc/llvm-project?rev=162290&view=rev
Log:
Unbreak the use of "--param ssp-buffer-size=" in dragonegg after Chad's changes.

Added:
    dragonegg/trunk/test/validator/c/StackProtector.c
Modified:
    dragonegg/trunk/src/Backend.cpp

Modified: dragonegg/trunk/src/Backend.cpp
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/src/Backend.cpp?rev=162290&r1=162289&r2=162290&view=diff
==============================================================================
--- dragonegg/trunk/src/Backend.cpp (original)
+++ dragonegg/trunk/src/Backend.cpp Tue Aug 21 12:07:59 2012
@@ -354,12 +354,6 @@
 //TODO    ArgStrings.push_back(Arg);
 //TODO  }
 
-  if (flag_stack_protect > 0) {
-    std::string Arg("--stack-protector-buffer-size=" +
-                    utostr(PARAM_VALUE(PARAM_SSP_BUFFER_SIZE)));
-    ArgStrings.push_back(Arg);
-  }
-
   for (unsigned i = 0, e = ArgStrings.size(); i != e; ++i)
     Args.push_back(ArgStrings[i].c_str());
 
@@ -491,6 +485,7 @@
 #else
   Options.UseInitArray = false;
 #endif
+  Options.SSPBufferSize = PARAM_VALUE(PARAM_SSP_BUFFER_SIZE);
 #ifdef LLVM_SET_TARGET_MACHINE_OPTIONS
   LLVM_SET_TARGET_MACHINE_OPTIONS(Options);
 #endif

Added: dragonegg/trunk/test/validator/c/StackProtector.c
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/test/validator/c/StackProtector.c?rev=162290&view=auto
==============================================================================
--- dragonegg/trunk/test/validator/c/StackProtector.c (added)
+++ dragonegg/trunk/test/validator/c/StackProtector.c Tue Aug 21 12:07:59 2012
@@ -0,0 +1 @@
+// RUN: %dragonegg -S %s -fstack-protector --param ssp-buffer-size=1