From ec6fdef5a46f450c8b7a52b491de6a17155101df Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Tue, 14 Jul 2009 00:30:55 +0200 Subject: Make kernel opt-level the default again. * main.cxx (main): Default gcc_flags to kernel opt-level (empty). * buildrun.cxx (compile_pass): Add -freorder-blocks back, document choices. * stap.1.in: Document new default opt-level. * testsuite/systemtap.base/cache.exp: Adjust for new caching results. --- main.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'main.cxx') diff --git a/main.cxx b/main.cxx index 2aeff580..130812ad 100644 --- a/main.cxx +++ b/main.cxx @@ -118,7 +118,7 @@ usage (systemtap_session& s, int exitcode) << " -O2 Optimize more, takes more time" << endl << " -O3 Optimize even more, takes even more time" << endl << " -Os Optimize for size, like -O2 but tuned for small code size" << endl - << " Default is -O0." << endl + << " Default is the kernel opt-level default (-O2 or -Os)." << endl << " -c CMD start the probes, run CMD, and exit when it finishes" << endl << " -x PID sets target() to PID" << endl << " -F run as on-file flight recorder with -o." << endl @@ -411,7 +411,7 @@ main (int argc, char * const argv []) s.ignore_dwarf = false; s.load_only = false; s.skip_badvars = false; - s.gcc_flags = "-O0"; + s.gcc_flags = ""; // Default to kernel opt-level. // Location of our signing certificate. // If we're root, use the database in SYSCONFDIR, otherwise -- cgit From 011165968c00e4125dfb9ee132e79f65dbea50c4 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Tue, 14 Jul 2009 11:47:46 +0200 Subject: Remove -O[0123s] gcc optimization flags for gcc pass 4 speedups again. We cannot guarantee that (un)optimized code compiles and/or generates fully functional code, so don't tempt the user to try it out. * session.h (struct systemtap_session): Remove gcc_flags string field. * hash.cxx (find_script_hash): Don't add gcc_flags. * main.cxx (usage): Remove -O[0123s] documentation. (main): Don't use gcc_flags. * buildrun.cxx (compile_pass): Don't add gcc_flags to EXTRA_CFLAGS. * stap1.in: Remove -O[0123s] documentation. * testsuite/systemtap.base/cache.exp: Remove tests for -O[0123s]. --- main.cxx | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) (limited to 'main.cxx') diff --git a/main.cxx b/main.cxx index 130812ad..9dc658ff 100644 --- a/main.cxx +++ b/main.cxx @@ -111,14 +111,6 @@ usage (systemtap_session& s, int exitcode) << " " << s.module_name << endl << " -o FILE send script output to file, instead of stdout. This supports" << endl << " strftime(3) formats for FILE" << endl - << " -O[0123s] optimization to use for C code. Passed to gcc in pass 4." << endl - << " -O Alias for -O1" << endl - << " -O0 Fast compilation" << endl - << " -O1 Optimize, takes a bit more time" << endl - << " -O2 Optimize more, takes more time" << endl - << " -O3 Optimize even more, takes even more time" << endl - << " -Os Optimize for size, like -O2 but tuned for small code size" << endl - << " Default is the kernel opt-level default (-O2 or -Os)." << endl << " -c CMD start the probes, run CMD, and exit when it finishes" << endl << " -x PID sets target() to PID" << endl << " -F run as on-file flight recorder with -o." << endl @@ -411,7 +403,6 @@ main (int argc, char * const argv []) s.ignore_dwarf = false; s.load_only = false; s.skip_badvars = false; - s.gcc_flags = ""; // Default to kernel opt-level. // Location of our signing certificate. // If we're root, use the database in SYSCONFDIR, otherwise @@ -496,7 +487,7 @@ main (int argc, char * const argv []) { "vp", 1, &long_opt, LONG_OPT_VERBOSE_PASS }, { NULL, 0, NULL, 0 } }; - int grc = getopt_long (argc, argv, "hVMvtp:I:e:o:O::R:r:m:kgPc:x:D:bs:uqwl:d:L:FS:", + int grc = getopt_long (argc, argv, "hVMvtp:I:e:o:R:r:m:kgPc:x:D:bs:uqwl:d:L:FS:", long_options, NULL); if (grc < 0) break; @@ -560,22 +551,6 @@ main (int argc, char * const argv []) s.output_file = string (optarg); break; - case 'O': - if (optarg == NULL) - s.gcc_flags = "-O1"; - else - s.gcc_flags = "-O" + string (optarg); - - if (s.gcc_flags != "-O0" && s.gcc_flags != "-O1" - && s.gcc_flags != "-O2" && s.gcc_flags != "-O3" - && s.gcc_flags != "-Os") - { - cerr << "'" << s.gcc_flags << "'" - << " isn't a valid optimization option." << endl; - usage (s, 1); - } - break; - case 'R': s.runtime_path = string (optarg); break; -- cgit