diff options
| author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2014-05-14 17:23:26 +0000 |
|---|---|---|
| committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2014-05-14 17:23:26 +0000 |
| commit | 961405f280a82dfef75d3c06ea3c65df85e38edb (patch) | |
| tree | f2923e34039e244fa53bd960402e274ca1002145 | |
| parent | 3a1bc5ce89a470a55c24febbe05534fab7f74229 (diff) | |
| download | gcc-48-961405f280a82dfef75d3c06ea3c65df85e38edb.tar.gz | |
* Apply the proposed patch for PR driver/61126.
git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.8@7373 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/pr61126.diff | 53 | ||||
| -rw-r--r-- | debian/rules.patch | 1 |
3 files changed, 55 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 5571efb..e1f50ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ gcc-4.8 (4.8.2-23) UNRELEASED; urgency=medium * Update to SVN 20140514 (r210436) from the gcc-4_8-branch. + * Apply the proposed patch for PR driver/61126. -- Matthias Klose <doko@debian.org> Wed, 14 May 2014 14:21:37 +0200 diff --git a/debian/patches/pr61126.diff b/debian/patches/pr61126.diff new file mode 100644 index 0000000..c3f6688 --- /dev/null +++ b/debian/patches/pr61126.diff @@ -0,0 +1,53 @@ +# DP: Proposed patch for PR driver/61126. + +Index: b/src/gcc/fortran/lang.opt +=================================================================== +--- a/src/gcc/fortran/lang.opt ++++ b/src/gcc/fortran/lang.opt +@@ -293,6 +293,10 @@ + Fortran Warning + Warn about unused dummy arguments. + ++Wunused-parameter ++LangEnabledBy(Fortran,Wextra) ++; Documented in common.opt ++ + cpp + Fortran Negative(nocpp) + Enable preprocessing +Index: b/src/gcc/fortran/options.c +=================================================================== +--- a/src/gcc/fortran/options.c ++++ b/src/gcc/fortran/options.c +@@ -658,12 +658,7 @@ + break; + + case OPT_Wextra: +- handle_generated_option (&global_options, &global_options_set, +- OPT_Wunused_parameter, NULL, value, +- gfc_option_lang_mask (), kind, loc, +- handlers, global_dc); + set_Wextra (value); +- + break; + + case OPT_Wfunction_elimination: +Index: b/src/gcc/opts-global.c +=================================================================== +--- a/src/gcc/opts-global.c ++++ b/src/gcc/opts-global.c +@@ -301,10 +301,10 @@ + handlers->unknown_option_callback = unknown_option_callback; + handlers->wrong_lang_callback = complain_wrong_lang; + handlers->num_handlers = 3; +- handlers->handlers[0].handler = lang_handle_option; +- handlers->handlers[0].mask = initial_lang_mask; +- handlers->handlers[1].handler = common_handle_option; +- handlers->handlers[1].mask = CL_COMMON; ++ handlers->handlers[0].handler = common_handle_option; ++ handlers->handlers[0].mask = CL_COMMON; ++ handlers->handlers[1].handler = lang_handle_option; ++ handlers->handlers[1].mask = initial_lang_mask; + handlers->handlers[2].handler = target_handle_option; + handlers->handlers[2].mask = CL_TARGET; + } diff --git a/debian/rules.patch b/debian/rules.patch index 3f11455..cf0b1b1 100644 --- a/debian/rules.patch +++ b/debian/rules.patch @@ -91,6 +91,7 @@ debian_patches += \ fix-ffi_call_VFP-with-no-VFP-argument \ $(if $(with_linaro_branch),pr60034) \ pr61106 \ + pr61126 \ # FIXME: still necessary for cross building the native compiler? # gcc-auto-build \ |