[llvm-commits] [llvm-gcc-4.2] r58675 - in /llvm-gcc-4.2/trunk/gcc: llvm-backend.cpp opts.c

[Bill Wendling]

Author: void
Date: Mon Nov  3 20:15:23 2008
New Revision: 58675

URL: http://llvm.org/viewvc/llvm-project?rev=58675&view=rev
Log:
Add the "enable-stack-protector" flag to the backend calling stuff. Don't change
the default in common.opt for the flag_stack_protect just yet!

Modified:
    llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp
    llvm-gcc-4.2/trunk/gcc/opts.c

Modified: llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp?rev=58675&r1=58674&r2=58675&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp Mon Nov  3 20:15:23 2008
@@ -70,6 +70,7 @@
 #include "tree-inline.h"
 #include "langhooks.h"
 #include "cgraph.h"
+#include "params.h"
 }
 
 // Non-zero if bytecode from PCH is successfully read.
@@ -165,6 +166,13 @@
     ArgStrings.push_back(Arg);
   }
 
+  if (flag_stack_protect > 0) {
+    std::string Arg("--enable-stack-protector=" + utostr(flag_stack_protect));
+    ArgStrings.push_back(Arg);
+    Arg = "--ssp-buffer-size=" + utostr(PARAM_VALUE(PARAM_SSP_BUFFER_SIZE));
+    ArgStrings.push_back(Arg);
+  }
+
   if (llvm_optns) {
     std::string Opts = llvm_optns;
     for (std::string Opt = getToken(Opts); !Opt.empty(); Opt = getToken(Opts))

Modified: llvm-gcc-4.2/trunk/gcc/opts.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/opts.c?rev=58675&r1=58674&r2=58675&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/opts.c (original)
+++ llvm-gcc-4.2/trunk/gcc/opts.c Mon Nov  3 20:15:23 2008
@@ -206,13 +206,6 @@
 
   opt = argv[0];
 
-  /* LLVM LOCAL begin stack protector */
-#ifdef ENABLE_LLVM
-  if (strncmp(opt, "-fstack-protector", 17) == 0)
-    error ("-fstack-protector is not supported.");
-#endif
-  /* LLVM LOCAL end stack protector */
-
   opt_index = find_opt (opt + 1, lang_mask | CL_COMMON | CL_TARGET);
   if (opt_index == cl_options_count
       && (opt[1] == 'W' || opt[1] == 'f' || opt[1] == 'm')