← Back to branch summary

~john-koepi/ubuntu/trusty/golang/default

« back to all changes in this revision

Viewing changes to .pc/007-use_native_dynamic_linker_on_kfreebsd.patch/src/cmd/6l/asm.c

  • Committer: Bazaar Package Importer
  • Author(s): Ondřej Surý
  • Date: 2011-08-03 17:04:59 UTC
  • mfrom: (14.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20110803170459-wzd99m3567y80ila
Tags: 1:59-1
http://bugs.debian.org/634270
* Imported Upstream version 59
* Refresh patches to a new release
* Fix FTBFS on ARM (Closes: #634270)
* Update version.bash to work with Debian packaging and not hg
  repository

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/007-use_native_dynamic_linker_on_kfreebsd.patch/src/cmd/6l/asm.c
87
87
        ElfStrText,
88
88
        ElfStrData,
89
89
        ElfStrBss,
90
 
        ElfStrGosymcounts,
91
 
        ElfStrGosymtab,
92
 
        ElfStrGopclntab,
93
90
        ElfStrShstrtab,
94
91
        ElfStrSymtab,
95
92
        ElfStrStrtab,
571
568
        elfstr[ElfStrBss] = addstring(shstrtab, ".bss");
572
569
        addstring(shstrtab, ".elfdata");
573
570
        addstring(shstrtab, ".rodata");
 
571
        addstring(shstrtab, ".gosymtab");
 
572
        addstring(shstrtab, ".gopclntab");
574
573
        if(!debug['s']) {
575
 
                elfstr[ElfStrGosymcounts] = addstring(shstrtab, ".gosymcounts");
576
 
                elfstr[ElfStrGosymtab] = addstring(shstrtab, ".gosymtab");
577
 
                elfstr[ElfStrGopclntab] = addstring(shstrtab, ".gopclntab");
578
574
                elfstr[ElfStrSymtab] = addstring(shstrtab, ".symtab");
579
575
                elfstr[ElfStrStrtab] = addstring(shstrtab, ".strtab");
580
576
                dwarfaddshstrings(shstrtab);
718
714
        seek(cout, sect->vaddr - segtext.vaddr + segtext.fileoff, 0);
719
715
        codeblk(sect->vaddr, sect->len);
720
716
 
721
 
        /* output read-only data in text segment */
722
 
        sect = segtext.sect->next;
723
 
        seek(cout, sect->vaddr - segtext.vaddr + segtext.fileoff, 0);
724
 
        datblk(sect->vaddr, sect->len);
 
717
        /* output read-only data in text segment (rodata, gosymtab and pclntab) */
 
718
        for(sect = sect->next; sect != nil; sect = sect->next) {
 
719
                seek(cout, sect->vaddr - segtext.vaddr + segtext.fileoff, 0);
 
720
                datblk(sect->vaddr, sect->len);
 
721
        }
725
722
 
726
723
        if(debug['v'])
727
724
                Bprint(&bso, "%5.2f datblk\n", cputime());
1013
1010
                        elfshbits(sect);
1014
1011
 
1015
1012
                if (!debug['s']) {
1016
 
                        sh = newElfShdr(elfstr[ElfStrGosymtab]);
1017
 
                        sh->type = SHT_PROGBITS;
1018
 
                        sh->flags = SHF_ALLOC;
1019
 
                        sh->addralign = 1;
1020
 
                        shsym(sh, lookup("symtab", 0));
1021
 
 
1022
 
                        sh = newElfShdr(elfstr[ElfStrGopclntab]);
1023
 
                        sh->type = SHT_PROGBITS;
1024
 
                        sh->flags = SHF_ALLOC;
1025
 
                        sh->addralign = 1;
1026
 
                        shsym(sh, lookup("pclntab", 0));
1027
 
 
1028
1013
                        sh = newElfShdr(elfstr[ElfStrSymtab]);
1029
1014
                        sh->type = SHT_SYMTAB;
1030
1015
                        sh->off = symo;