[dev.power64] code review 160200044: build: merge default into dev.power64

src/cmd/9l/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 227 matching lines @@
         if(!debug['s']) {
                 // TODO: rationalize
                 if(debug['v'])
                         Bprint(&bso, "%5.2f sym\n", cputime());
                 Bflush(&bso);
                 switch(HEADTYPE) {
                 default:
                         if(iself)
                                 goto ElfSym;
                 case Hplan9:
-                        symo = HEADR+segtext.len+segdata.filelen;
+                        symo = segdata.fileoff+segdata.filelen;
                         break;
                 ElfSym:
-                        symo = rnd(HEADR+segtext.filelen, INITRND)+rnd(HEADR+segrodata.filelen, INITRND)+segdata.filelen;
+                        symo = segdata.fileoff+segdata.filelen;
                         symo = rnd(symo, INITRND);
                         break;
                 }
                 cseek(symo);
                 switch(HEADTYPE) {
                 default:
                         if(iself) {
                                 if(debug['v'])
                                         Bprint(&bso, "%5.2f elfsym\n", cputime());
                                 asmelfsym();
@@ skipping 67 matching lines @@
 
         if(r <= 0)
                 return v;
         v += r - 1;
         c = v % r;
         if(c < 0)
                 c += r;
         v -= c;
         return v;
 }