diff options
| author | Takashi Iwai <[email protected]> | 2021-01-07 18:51:39 +0100 |
|---|---|---|
| committer | Takashi Iwai <[email protected]> | 2021-01-07 18:51:39 +0100 |
| commit | 7b62275507232f01f66d3e7d05c77bbd9009b726 (patch) | |
| tree | 172dd8a7632877df2b623462bc871ab42e093bcc /scripts/gcc-plugins/gcc-generate-gimple-pass.h | |
| parent | 91bc156817a3c2007332b64b4f85c32aafbbbea6 (diff) | |
| parent | 1f092d1c8819679d78a7d9c62a46d4939d217a9d (diff) | |
Merge tag 'asoc-fix-v5.11-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.11
A collection of mostly driver specific fixes, plus a maintainership
update for TI and a fix for DAPM driver removal paths.
Diffstat (limited to 'scripts/gcc-plugins/gcc-generate-gimple-pass.h')
| -rw-r--r-- | scripts/gcc-plugins/gcc-generate-gimple-pass.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/scripts/gcc-plugins/gcc-generate-gimple-pass.h b/scripts/gcc-plugins/gcc-generate-gimple-pass.h index f20797e80b6d..51780828734e 100644 --- a/scripts/gcc-plugins/gcc-generate-gimple-pass.h +++ b/scripts/gcc-plugins/gcc-generate-gimple-pass.h @@ -73,18 +73,11 @@ #define TODO_FLAGS_FINISH 0 #endif -#if BUILDING_GCC_VERSION >= 4009 namespace { static const pass_data _PASS_NAME_PASS_DATA = { -#else -static struct gimple_opt_pass _PASS_NAME_PASS = { - .pass = { -#endif .type = GIMPLE_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, @@ -102,12 +95,8 @@ static struct gimple_opt_pass _PASS_NAME_PASS = { .properties_destroyed = PROPERTIES_DESTROYED, .todo_flags_start = TODO_FLAGS_START, .todo_flags_finish = TODO_FLAGS_FINISH, -#if BUILDING_GCC_VERSION < 4009 - } -#endif }; -#if BUILDING_GCC_VERSION >= 4009 class _PASS_NAME_PASS : public gimple_opt_pass { public: _PASS_NAME_PASS() : gimple_opt_pass(_PASS_NAME_PASS_DATA, g) {} @@ -128,7 +117,6 @@ public: #else virtual unsigned int execute(void) { return _EXECUTE(); } #endif -#endif }; } |