Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

[linux-2.6-microblaze.git] / scripts / gcc-plugins / gcc-generate-ipa-pass.h

diff --git a/scripts/gcc-plugins/gcc-generate-ipa-pass.h b/scripts/gcc-plugins/gcc-generate-ipa-pass.h
index 92bb4f3..c34ffec 100644 (file)
--- a/scripts/gcc-plugins/gcc-generate-ipa-pass.h
+++ b/scripts/gcc-plugins/gcc-generate-ipa-pass.h
@@ -141,18 +141,11 @@
 #define FUNCTION_TRANSFORM_TODO_FLAGS_START 0
 #endif
 
-#if BUILDING_GCC_VERSION >= 4009
 namespace {
 static const pass_data _PASS_NAME_PASS_DATA = {
-#else
-static struct ipa_opt_pass_d _PASS_NAME_PASS = {
-       .pass = {
-#endif
                .type                   = IPA_PASS,
                .name                   = _PASS_NAME_NAME,
-#if BUILDING_GCC_VERSION >= 4008
                .optinfo_flags          = OPTGROUP_NONE,
-#endif
 #if BUILDING_GCC_VERSION >= 5000
 #elif BUILDING_GCC_VERSION == 4009
                .has_gate               = _HAS_GATE,
@@ -170,23 +163,8 @@ static struct ipa_opt_pass_d _PASS_NAME_PASS = {
                .properties_destroyed   = PROPERTIES_DESTROYED,
                .todo_flags_start       = TODO_FLAGS_START,
                .todo_flags_finish      = TODO_FLAGS_FINISH,
-#if BUILDING_GCC_VERSION < 4009
-       },
-       .generate_summary               = _GENERATE_SUMMARY,
-       .write_summary                  = _WRITE_SUMMARY,
-       .read_summary                   = _READ_SUMMARY,
-#if BUILDING_GCC_VERSION >= 4006
-       .write_optimization_summary     = _WRITE_OPTIMIZATION_SUMMARY,
-       .read_optimization_summary      = _READ_OPTIMIZATION_SUMMARY,
-#endif
-       .stmt_fixup                     = _STMT_FIXUP,
-       .function_transform_todo_flags_start    = FUNCTION_TRANSFORM_TODO_FLAGS_START,
-       .function_transform             = _FUNCTION_TRANSFORM,
-       .variable_transform             = _VARIABLE_TRANSFORM,
-#endif
 };
 
-#if BUILDING_GCC_VERSION >= 4009
 class _PASS_NAME_PASS : public ipa_opt_pass_d {
 public:
        _PASS_NAME_PASS() : ipa_opt_pass_d(_PASS_NAME_PASS_DATA,
@@ -206,7 +184,6 @@ public:
        virtual bool gate(function *) { return _GATE(); }
 #else
        virtual bool gate(void) { return _GATE(); }
-#endif
 #endif
 
        virtual opt_pass *clone() { return new _PASS_NAME_PASS(); }