diff options
| author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2014-05-08 12:37:48 +0000 |
|---|---|---|
| committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2014-05-08 12:37:48 +0000 |
| commit | 1a64c02eda2be5198838064fb20fe244def6b94d (patch) | |
| tree | 1daa34f2945b5134cad8ceca796cb09b99735e09 | |
| parent | 8c2f12f0007f7612015899a7e80e17e5e9fbac0c (diff) | |
| download | gcc-49-1a64c02eda2be5198838064fb20fe244def6b94d.tar.gz | |
* Apply the proposed patch for PR driver/61106. Closes: #747345.
git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.9@7369 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/pr61106.diff | 24 | ||||
| -rw-r--r-- | debian/rules.patch | 1 |
3 files changed, 26 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 1c50691..e40680a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ gcc-4.9 (4.9.0-3) UNRELEASED; urgency=medium with_deps_on_target_arch_pkgs=yes (Helmit Grohne). Closes: #716795. * Build the gcc-X.Y-base package with with_deps_on_target_arch_pkgs=yes (Helmit Grohne). Addresses: #744782. + * Apply the proposed patch for PR driver/61106. Closes: #747345. [ Aurelien Jarno ] * Fix libasan1 symbols file for sparc and sparc64. diff --git a/debian/patches/pr61106.diff b/debian/patches/pr61106.diff new file mode 100644 index 0000000..fd5dc57 --- /dev/null +++ b/debian/patches/pr61106.diff @@ -0,0 +1,24 @@ +# DP: Proposed patch for PR driver/61106 + +--- a/src/gcc/optc-gen.awk ++++ b/src/gcc/optc-gen.awk +@@ -404,15 +404,17 @@ for (i = 0; i < n_enabledby; i++) { + for (j = 1; j < n_enables; j++) { + opt_var_name = var_name(flags[opt_numbers[thisenable[j]]]); + if (opt_var_name != "") { + condition = "!opts_set->x_" opt_var_name + if (thisenableif[j] != "") { +- condition = condition " && (" thisenableif[j] ")" ++ value = "(" thisenableif[j] ")" ++ } else { ++ value = "value" + } + print " if (" condition ")" + print " handle_generated_option (opts, opts_set," +- print " " opt_enum(thisenable[j]) ", NULL, value," ++ print " " opt_enum(thisenable[j]) ", NULL, " value "," + print " lang_mask, kind, loc, handlers, dc);" + } else { + print "#error " thisenable[j] " does not have a Var() flag" + } + } diff --git a/debian/rules.patch b/debian/rules.patch index 2e67b95..517e883 100644 --- a/debian/rules.patch +++ b/debian/rules.patch @@ -294,6 +294,7 @@ debian_patches += libgomp-kfreebsd-testsuite debian_patches += go-testsuite debian_patches += libstdc++-link-pthread debian_patches += fix-ffi_call_VFP-with-no-VFP-argument +debian_patches += pr61106 # Ada patches needed for both the stable package and snapshot builds debian_patches += ada-ppc64 |