code review 4633043: 8l/ld: Further adjustments for a port of Go to Plan 9 n...

src/cmd/ld/ldelf.c

 /*
 Derived from Plan 9 from User Space's src/libmach/elf.h, elf.c
 http://code.swtch.com/plan9port/src/tip/src/libmach/
 
         Copyright © 2004 Russ Cox.
         Portions Copyright © 2008-2010 Google Inc.
         Portions Copyright © 2010 The Go Authors.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ skipping 310 matching lines @@
         uchar hdrbuf[64];
         uchar *p;
         ElfHdrBytes *hdr;
         ElfObj *obj;
         ElfSect *sect, *rsect;
         ElfSym sym;
         Endian *e;
         Reloc *r, *rp;
         Sym *s;
 
+        USED(pkg);
         if(debug['v'])
                 Bprint(&bso, "%5.2f ldelf %s\n", cputime(), pn);
 
         version++;
         base = Boffset(f);
 
-        if(Bread(f, &hdrbuf, sizeof hdrbuf) != sizeof hdrbuf)
+        if(Bread(f, hdrbuf, sizeof hdrbuf) != sizeof hdrbuf)
                 goto bad;
-        hdr = (ElfHdrBytes*)&hdrbuf;
+        hdr = (ElfHdrBytes*)hdrbuf;
         if(memcmp(hdr->ident, ElfMagic, 4) != 0)
                 goto bad;
         switch(hdr->ident[5]) {
         case ElfDataLsb:
                 e = ≤
                 break;
         case ElfDataMsb:
                 e = &be;
                 break;
         default:
@@ skipping 161 matching lines @@
         for(i=0; i<obj->nsect; i++) {
                 sect = &obj->sect[i];
                 if((sect->type != ElfSectProgbits && sect->type != ElfSectNobits) || !(sect->flags&ElfSectFlagAlloc))
                         continue;
                 if(sect->type != ElfSectNobits && map(obj, sect) < 0)
                         goto bad;
 ················
                 name = smprint("%s(%s)", pn, sect->name);
                 s = lookup(name, version);
                 free(name);
-                switch(sect->flags&(ElfSectFlagAlloc|ElfSectFlagWrite|ElfSectFlagExec)) {
+                switch((int)sect->flags&(ElfSectFlagAlloc|ElfSectFlagWrite|ElfSectFlagExec)) {
                 default:
                         werrstr("unexpected flags for ELF section %s", sect->name);
                         goto bad;
                 case ElfSectFlagAlloc:
                         s->type = SRODATA;
                         break;
                 case ElfSectFlagAlloc + ElfSectFlagWrite:
                         s->type = SDATA;
                         break;
                 case ElfSectFlagAlloc + ElfSectFlagExec:
@@ skipping 274 matching lines @@
         case R('8', R_386_GOTPC):
                 *siz = 4;
                 break;
         case R('6', R_X86_64_64):
                 *siz = 8;
                 break;
         }
 
         return 256+elftype;
 }