[gcc-7] 62/354: - remove obsolete unused patches

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository gcc-7.

commit c1cb1dcbaf88ddcd4dbedf3c771d0b912e070388
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Wed Nov 30 18:42:48 2016 +0000

     - remove obsolete unused patches
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9158 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog            |  2 +-
 debian/patches/pr61106.diff | 24 ---------------------
 debian/patches/pr61126.diff | 51 ---------------------------------------------
 debian/rules.patch          |  2 --
 4 files changed, 1 insertion(+), 78 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b5e2a9a..aa9e197 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-gcc-7 (7-20161125-1ubuntu1) UNRELEASED; urgency=medium
+gcc-7 (7-20161125-2) UNRELEASED; urgency=medium
 
   * Install missing vecintrin.h header on s390x.
   * Install missing avx512 intrinsics headers on x86*. Closes: #846075.
diff --git a/debian/patches/pr61106.diff b/debian/patches/pr61106.diff
deleted file mode 100644
index fd5dc57..0000000
--- a/debian/patches/pr61106.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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/patches/pr61126.diff b/debian/patches/pr61126.diff
deleted file mode 100644
index 2c9aeb9..0000000
--- a/debian/patches/pr61126.diff
+++ /dev/null
@@ -1,51 +0,0 @@
-Index: gcc/fortran/lang.opt
-===================================================================
---- a/src/gcc/fortran/lang.opt	(revision 210277)
-+++ b/src/gcc/fortran/lang.opt	(working copy)
-@@ -301,6 +301,10 @@
- Fortran Warning
- Warn about unused dummy arguments.
- 
-+Wunused-parameter
-+LangEnabledBy(Fortran,Wextra)
-+; Documented in common.opt
-+
- Wzerotrip
- Fortran Warning
- Warn about zero-trip DO loops
-Index: gcc/fortran/options.c
-===================================================================
---- a/src/gcc/fortran/options.c	(revision 210277)
-+++ b/src/gcc/fortran/options.c	(working copy)
-@@ -674,12 +674,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: gcc/opts-global.c
-===================================================================
---- a/src/gcc/opts-global.c	(revision 210277)
-+++ b/src/gcc/opts-global.c	(working copy)
-@@ -273,10 +273,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 50242b7..1a60aa8 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -259,8 +259,6 @@ endif
 
 debian_patches += libgomp-kfreebsd-testsuite
 debian_patches += go-testsuite
-# FIXME: Still relevant?
-#debian_patches += pr61106
 
 # Ada patches needed for both the stable package and snapshot builds
 debian_patches += ada-749574

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-7.git