← Back to branch summary

~ubuntu-branches/ubuntu/vivid/golang/vivid

« back to all changes in this revision

Viewing changes to src/libmach/5obj.c

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2013-08-20 14:06:23 UTC
  • mfrom: (14.1.23 saucy-proposed)
  • Revision ID: package-import@ubuntu.com-20130820140623-b414jfxi3m0qkmrq
Tags: 2:1.1.2-2ubuntu1
https://launchpad.net/bugs/1211749
https://launchpad.net/bugs/1202027
* Merge from Debian unstable (LP: #1211749, #1202027). Remaining changes:
  - 016-armhf-elf-header.patch: Use correct ELF header for armhf binaries.
  - d/control,control.cross: Update Breaks/Replaces for Ubuntu
    versions to ensure smooth upgrades, regenerate control file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/libmach/5obj.c
42
42
        char    type;
43
43
        char    sym;
44
44
        char    name;
 
45
        char    gotype;
45
46
};
46
47
static Addr addr(Biobuf*);
47
48
static char type2char(int);
115
116
        skip(bp,1);             /* reg */
116
117
        a.sym = Bgetc(bp);      /* sym index */
117
118
        a.name = Bgetc(bp);     /* sym type */
 
119
        a.gotype = Bgetc(bp);   /* go type */
118
120
        switch(a.type){
119
121
        default:
120
122
        case D_NONE:
124
126
        case D_FPCR:
125
127
                break;
126
128
        case D_REGREG:
 
129
        case D_REGREG2:
127
130
                Bgetc(bp);
128
131
                break;
129
132
        case D_CONST2: