code review 4794046: ld: fix freebsd build reverting .interp move

src/cmd/5l/asm.c

 // Inferno utils/5l/asm.c
 // http://code.google.com/p/inferno-os/source/browse/utils/5l/asm.c
 //
 //      Copyright © 1994-1999 Lucent Technologies Inc.  All rights reserved.
 //      Portions Copyright © 1995-1997 C H Forsyth (forsyth@terzarima.net)
 //      Portions Copyright © 1997-1999 Vita Nuova Limited
 //      Portions Copyright © 2000-2007 Vita Nuova Holdings Limited (www.vitanuova.com)
 //      Portions Copyright © 2004,2006 Bruce Ellis
 //      Portions Copyright © 2005-2007 C H Forsyth (forsyth@terzarima.net)
 //      Revisions Copyright © 2000-2007 Lucent Technologies Inc. and others
@@ skipping 166 matching lines @@
                 elfstr[ElfStrInterp] = addstring(shstrtab, ".interp");
                 elfstr[ElfStrHash] = addstring(shstrtab, ".hash");
                 elfstr[ElfStrGot] = addstring(shstrtab, ".got");
                 elfstr[ElfStrGotPlt] = addstring(shstrtab, ".got.plt");
                 elfstr[ElfStrDynamic] = addstring(shstrtab, ".dynamic");
                 elfstr[ElfStrDynsym] = addstring(shstrtab, ".dynsym");
                 elfstr[ElfStrDynstr] = addstring(shstrtab, ".dynstr");
                 elfstr[ElfStrRel] = addstring(shstrtab, ".rel");
                 elfstr[ElfStrRelPlt] = addstring(shstrtab, ".rel.plt");
                 elfstr[ElfStrPlt] = addstring(shstrtab, ".plt");
-
-                /* interpreter string */
-                if(interpreter == nil)
-                        interpreter = linuxdynld;
-                s = lookup(".interp", 0);
-                s->type = SELFROSECT;
-                s->reachable = 1;
-                addstring(s, interpreter);
 
                 /* dynamic symbol table - first entry all zeros */
                 s = lookup(".dynsym", 0);
                 s->type = SELFROSECT;
                 s->reachable = 1;
                 s->value += ELF32SYMSIZE;
 
                 /* dynamic string table */
                 s = lookup(".dynstr", 0);
                 s->type = SELFROSECT;
@@ skipping 280 matching lines @@
                 o = segtext.fileoff - pph->off;
                 segtext.fileoff -= o;
                 segtext.filelen += o;
 
                 if(!debug['d']) {
                         /* interpreter for dynamic linking */
                         sh = newElfShdr(elfstr[ElfStrInterp]);
                         sh->type = SHT_PROGBITS;
                         sh->flags = SHF_ALLOC;
                         sh->addralign = 1;
-                        shsym(sh, lookup(".interp", 0));
+                        if(interpreter == nil)
+                                interpreter = linuxdynld;
+                        elfinterp(sh, startva, interpreter);
 
                         ph = newElfPhdr();
                         ph->type = PT_INTERP;
                         ph->flags = PF_R;
                         phsh(ph, sh);
                 }
 
                 elfphload(&segtext);
                 elfphload(&segdata);
 
@@ skipping 125 matching lines @@
                         pph->filesz = eh->phnum * eh->phentsize;
                         pph->memsz = pph->filesz;
                 }
 
                 cseek(0);
                 a = 0;
                 a += elfwritehdr();
                 a += elfwritephdrs();
                 a += elfwriteshdrs();
                 cflush();
-                if(a > ELFRESERVE) ·····
+                if(a+elfwriteinterp() > ELFRESERVE) ····
                         diag("ELFRESERVE too small: %d > %d", a, ELFRESERVE);
                 break;
         }
         cflush();
         if(debug['c']){
                 print("textsize=%d\n", textsize);
                 print("datsize=%ulld\n", segdata.filelen);
                 print("bsssize=%ulld\n", segdata.len - segdata.filelen);
                 print("symsize=%d\n", symsize);
                 print("lcsize=%d\n", lcsize);
@@ skipping 1223 matching lines @@
         if(debug['v'] || debug['n'])
                 Bprint(&bso, "symsize = %ud\n", symsize);
         Bflush(&bso);
 }
 
 void
 setpersrc(Sym *s)
 {
         USED(s);
 }