[gcc-6] 63/401: - update pr66904, and reenable it

[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 5c1322ad514eb3f537b08138e31aa83edfee376f
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Fri Jan 29 00:52:53 2016 +0000

     - update pr66904, and reenable it
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8630 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/patches/pr66904.diff | 21 ++++++++++++++-------
 debian/rules.patch          |  3 +--
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/debian/patches/pr66904.diff b/debian/patches/pr66904.diff
index 4b700bc..5a4af61 100644
--- a/debian/patches/pr66904.diff
+++ b/debian/patches/pr66904.diff
@@ -25,19 +25,27 @@ Date:   Thu Jan 21 14:53:55 2016 +1300
     
     Change-Id: I35621878014e1e107eda77a5b0b23d0240ec5750
 
-diff --git a/src/cmd/go/build.go b/src/cmd/go/build.go
-index 6a8edaf..327cc9f 100644
 --- a/src/libgo/go/cmd/go/build.go
 +++ a/src/libgo/go/cmd/go/build.go
-@@ -1437,6 +1437,7 @@ func (b *builder) build(a *action) (err error) {
+@@ -1437,6 +1437,9 @@ func (b *builder) build(a *action) (err error) {
  		if err != nil {
  			return err
  		}
-+		cgoObjects = append(cgoObjects, filepath.Join(a.objdir, "_cgo_flags"))
++		if _, ok := buildToolchain.(gccgoToolchain); ok {
++			cgoObjects = append(cgoObjects, filepath.Join(a.objdir, "_cgo_flags"))
++		}
  		cgoObjects = append(cgoObjects, outObj...)
  		gofiles = append(gofiles, outGo...)
  	}
-@@ -2627,16 +2628,52 @@ func (tools gccgoToolchain) ld(b *builder, root *action, out string, allactions
+@@ -2610,6 +2613,7 @@ func (tools gccgoToolchain) ld(b *builder, root *action, out string, allactions
+ 	// construction of the graph means that if any path to a node passes through
+ 	// a shared library action, they all do).
+ 	var walk func(a *action, seenShlib bool)
++	var err error
+ 	walk = func(a *action, seenShlib bool) {
+ 		if actionsSeen[a] {
+ 			return
+@@ -2628,16 +2632,52 @@ func (tools gccgoToolchain) ld(b *builder, root *action, out string, allactions
  			// doesn't work.
  			if !apackagesSeen[a.p] {
  				apackagesSeen[a.p] = true
@@ -93,7 +101,7 @@ index 6a8edaf..327cc9f 100644
  				}
  			}
  		}
-@@ -2646,10 +2683,17 @@ func (tools gccgoToolchain) ld(b *builder, root *action, out string, allactions
+@@ -2647,10 +2687,16 @@ func (tools gccgoToolchain) ld(b *builder, root *action, out string, allactions
  		}
  		for _, a1 := range a.deps {
  			walk(a1, seenShlib)
@@ -102,7 +110,6 @@ index 6a8edaf..327cc9f 100644
 +			}
  		}
  	}
-+	var err error
  	for _, a1 := range root.deps {
  		walk(a1, false)
 +		if err != nil {
diff --git a/debian/rules.patch b/debian/rules.patch
index f15201e..ad5a553 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -82,8 +82,7 @@ debian_patches += \
 	ada-gnattools-ldflags \
 	libjit-ldflags \
 	gdc-libphobos-no-werror \
-
-#	pr66904 \
+	pr66904 \
 
 # this is still needed on powerpc, e.g. firefox and insighttoolkit4 will ftbfs.
 ifneq (,$(filter $(DEB_TARGET_ARCH),powerpc))

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