[gcc-6] 313/401: * In GCC ICE dumps, prefix each line with the PID of the driver.

[Ximin Luo]

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

infinity0 pushed a commit to branch pu/reproducible_builds
in repository gcc-6.

commit c91977b9967fa39648c9358f4c27be2e26233906
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Mon Dec 12 11:43:58 2016 +0000

      * In GCC ICE dumps, prefix each line with the PID of the driver.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@9175 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog                 | 1 +
 debian/patches/gcc-ice-dump.diff | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f61c321..96a997d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,7 @@ gcc-6 (6.2.1-6) UNRELEASED; urgency=medium
   * Use --push-state/--pop-state for gold as well when linking libtsan.
   * Fix the configure check for compressed debug section support in as and ld.
     Enables the -gz option again. Taken from the trunk.
+  * In GCC ICE dumps, prefix each line with the PID of the driver.
 
   [ Svante Signell ]
   * GNU/Hurd port for gccgo.
diff --git a/debian/patches/gcc-ice-dump.diff b/debian/patches/gcc-ice-dump.diff
index 45314ad..62d82f0 100644
--- a/debian/patches/gcc-ice-dump.diff
+++ b/debian/patches/gcc-ice-dump.diff
@@ -5,7 +5,7 @@ Index: b/src/gcc/gcc.c
 ===================================================================
 --- a/src/gcc/gcc.c
 +++ b/src/gcc/gcc.c
-@@ -3140,7 +3140,8 @@ execute (void)
+@@ -3152,7 +3152,8 @@ execute (void)
  	    /* For ICEs in cc1, cc1obj, cc1plus see if it is
  	       reproducible or not.  */
  	    const char *p;
@@ -15,7 +15,7 @@ Index: b/src/gcc/gcc.c
  		&& WEXITSTATUS (status) == ICE_EXIT_CODE
  		&& i == 0
  		&& (p = strrchr (commands[0].argv[0], DIR_SEPARATOR))
-@@ -6842,8 +6843,23 @@ do_report_bug (const char **new_argv, co
+@@ -6859,8 +6860,23 @@ do_report_bug (const char **new_argv, co
  
    if (status == ATTEMPT_STATUS_SUCCESS)
      {
@@ -27,7 +27,7 @@ Index: b/src/gcc/gcc.c
 +	{
 +	  char *cmd = XNEWVEC (char, 50 + strlen (*out_file));
 +
-+	  sprintf(cmd, "/bin/cat %s >&2", *out_file);
++	  sprintf(cmd, "/usr/bin/awk '{print \"%d:\", $0}' %s >&2", getpid(), *out_file);
 +	  fprintf(stderr, "=== BEGIN GCC DUMP ===\n");
 +	  fflush(stderr);
 +	  system(cmd);

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