← Back to branch summary

~mwhudson/ubuntu/utopic/gccgo-go/build-cgo

« back to all changes in this revision

Viewing changes to src/pkg/runtime/traceback_arm.c

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-03-26 10:50:18 UTC
  • mfrom: (1.1.1)
  • Revision ID: package-import@ubuntu.com-20140326105018-wylov017k3e0a01v
Tags: 1.2.1-0ubuntu1
https://launchpad.net/bugs/1289067
* New upstream point release.
* Fix error running unit tests due to duplicated symbols (LP: #1289067):
  - d/p/issue61970044_40001.diff: Replace with issue61970044_80001.diff,
    update to existing proposed fix upstream.
  - d/p/issue80300043_60001.diff: Cherry pick upstream trunk fix for
    cmd/go: go test -compiler gccgo produces duplicate symbol errors.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/pkg/runtime/traceback_arm.c
20
20
        Stktop *stk;
21
21
        String file;
22
22
 
 
23
        if(pc0 == ~(uintptr)0 && sp0 == ~(uintptr)0) { // Signal to fetch saved values from gp.
 
24
                if(gp->syscallstack != (uintptr)nil) {
 
25
                        pc0 = gp->syscallpc;
 
26
                        sp0 = gp->syscallsp;
 
27
                        lr0 = 0;
 
28
                } else {
 
29
                        pc0 = gp->sched.pc;
 
30
                        sp0 = gp->sched.sp;
 
31
                        lr0 = gp->sched.lr;
 
32
                }
 
33
        }
 
34
 
23
35
        nprint = 0;
24
36
        runtime·memclr((byte*)&frame, sizeof frame);
25
37
        frame.pc = pc0;