← Back to branch summary

~ubuntu-branches/ubuntu/utopic/golang/utopic

« back to all changes in this revision

Viewing changes to src/cmd/nm/nm.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/cmd/nm/nm.c
43
43
 
44
44
char    *errs;                  /* exit status */
45
45
char    *filename;              /* current file */
46
 
char    symname[]="__.SYMDEF";  /* table of contents file name */
 
46
char    symname[]="__.GOSYMDEF";        /* table of contents file name */
47
47
int     multifile;              /* processing multiple files */
48
48
int     aflag;
49
49
int     gflag;
275
275
                        return;
276
276
                break;
277
277
        case 'm':
 
278
                if(!aflag || uflag || gflag)
 
279
                        return;
 
280
                break;
278
281
        case 'f':       /* we only see a 'z' when the following is true*/
279
282
                if(!aflag || uflag || gflag)
280
283
                        return;
281
 
                if (strcmp(s->name, ".frame"))
282
 
                        zenter(s);
 
284
                zenter(s);
283
285
                break;
284
286
        case 'a':
285
287
        case 'p':