Browse Source

Plan 9 from Bell Labs 2006-05-21

David du Colombier 15 years ago
parent
commit
22b562e2ff

+ 24 - 26
dist/replica/_plan9.db

@@ -38,7 +38,7 @@
 386/bin/ape/tar - 775 sys sys 1143777737 62279
 386/bin/ape/uname - 775 sys sys 1143741925 134338
 386/bin/aquarela - 775 sys sys 1144688908 332818
-386/bin/ar - 775 sys sys 1144688909 112319
+386/bin/ar - 775 sys sys 1148180226 113869
 386/bin/archfs - 775 sys sys 1143777740 147192
 386/bin/ascii - 775 sys sys 1143777740 64979
 386/bin/astro - 775 sys sys 1144688909 138872
@@ -228,7 +228,7 @@
 386/bin/faces - 775 sys sys 1147453006 194589
 386/bin/factor - 775 sys sys 1143777789 61794
 386/bin/fcp - 775 sys sys 1143777789 82528
-386/bin/file - 775 sys sys 1144264733 121024
+386/bin/file - 775 sys sys 1148180227 122500
 386/bin/fmt - 775 sys sys 1143777790 65662
 386/bin/fortune - 775 sys sys 1143777790 67451
 386/bin/fossil - 20000000775 sys sys 1042005470 0
@@ -275,7 +275,7 @@
 386/bin/hoc - 775 sys sys 1143777798 100173
 386/bin/html2ms - 775 sys sys 1143777798 66416
 386/bin/htmlfmt - 775 sys sys 1143777798 163390
-386/bin/htmlroff - 775 sys sys 1144688932 148426
+386/bin/htmlroff - 775 sys sys 1148180227 148483
 386/bin/ico - 775 sys sys 1143777800 162105
 386/bin/iconv - 775 sys sys 1143777800 113635
 386/bin/idiff - 775 sys sys 1143777800 76437
@@ -350,7 +350,7 @@
 386/bin/netstat - 775 sys sys 1144256044 85247
 386/bin/news - 775 sys sys 1144688947 72051
 386/bin/nfs - 775 sys sys 1143777829 321720
-386/bin/nm - 775 sys sys 1144264735 125798
+386/bin/nm - 775 sys sys 1148180227 127108
 386/bin/nntpfs - 775 sys sys 1143777831 166844
 386/bin/ns - 775 sys sys 1143777831 65587
 386/bin/p - 775 sys sys 1143777831 65315
@@ -558,7 +558,7 @@
 386/lib/libhttpd.a - 664 sys sys 1143777863 99458
 386/lib/libip.a - 664 sys sys 1143777863 35576
 386/lib/libl.a - 664 sys sys 1143777863 5372
-386/lib/libmach.a - 664 sys sys 1144264739 782800
+386/lib/libmach.a - 664 sys sys 1148180229 785314
 386/lib/libmemdraw.a - 664 sys sys 1143777866 284092
 386/lib/libmemlayer.a - 664 sys sys 1143777866 47360
 386/lib/libmp.a - 664 sys sys 1144169680 79980
@@ -2979,7 +2979,7 @@ lib/font/bit/lucidasans/unicode.6.font - 664 sys sys 1115914026 1945
 lib/font/bit/lucidasans/unicode.7.font - 664 sys sys 1124884861 2042
 lib/font/bit/lucidasans/unicode.8.font - 664 sys sys 1115917409 2095
 lib/font/bit/lucidasans/unicode.8.font1 - 664 sys sys 944943795 476
-lib/font/bit/lucidasans/unicode.9x24.font - 664 sys sys 944943794 1922
+lib/font/bit/lucidasans/unicode.9x24.font - 664 sys sys 1148098357 1936
 lib/font/bit/lucm - 20000000775 sys sys 944943795 0
 lib/font/bit/lucm/NOTICE - 664 sys sys 944943795 56
 lib/font/bit/lucm/currency.9 - 664 sys sys 944943795 602
@@ -3372,8 +3372,6 @@ lib/font/bit/pelm/euro.8.font - 664 sys sys 1115917411 470
 lib/font/bit/pelm/euro.9.font - 664 sys sys 1115917411 1982
 lib/font/bit/pelm/fangsong.9.font - 664 sys sys 1115917412 2110
 lib/font/bit/pelm/fffd.9 - 664 sys sys 944943801 191
-lib/font/bit/pelm/hanc.9.font - 664 sys sys 1115917412 1940
-lib/font/bit/pelm/hanj.9.font - 664 sys sys 1115917412 1940
 lib/font/bit/pelm/hku.9.font - 664 sys sys 1115917412 1766
 lib/font/bit/pelm/jis.9.font - 664 sys sys 1115917412 1915
 lib/font/bit/pelm/latin1.8 - 664 sys sys 944943801 4114
@@ -5750,7 +5748,7 @@ sys/games - 20000000775 sys sys 952648872 0
 sys/games/lib - 20000000775 sys sys 952648879 0
 sys/games/lib/4scores - 10000000666 sys sys 1118680448 0
 sys/games/lib/5scores - 10000000666 sys sys 1118680453 0
-sys/games/lib/fortunes - 664 sys sys 1147531044 259119
+sys/games/lib/fortunes - 664 sys sys 1148103602 259533
 sys/games/lib/mahjongg - 20000000775 sys sys 1095792278 0
 sys/games/lib/mahjongg/backgrounds - 20000000775 sys sys 1095792293 0
 sys/games/lib/mahjongg/backgrounds/default.bit - 664 sys sys 1095792293 346803
@@ -5926,7 +5924,7 @@ sys/games/lib/sudoku/images/9.bit - 664 sys sys 1117226542 537
 sys/include - 20000000775 sys sys 1016902416 0
 sys/include/9p.h - 664 sys sys 1134337548 4759
 sys/include/String.h - 664 sys sys 1091904425 1319
-sys/include/a.out.h - 664 sys sys 1131293220 1407
+sys/include/a.out.h - 664 sys sys 1148106925 1418
 sys/include/ape - 20000000775 sys sys 1014927784 0
 sys/include/ape/Plan9libnet.h - 664 sys sys 944948760 487
 sys/include/ape/ar.h - 664 sys sys 944948759 354
@@ -7337,7 +7335,7 @@ sys/man/1/ms2html - 664 sys sys 1138458899 1252
 sys/man/1/nedmail - 664 sys sys 1114697978 6820
 sys/man/1/netstat - 664 sys sys 1128255431 942
 sys/man/1/news - 664 sys sys 1113743329 1151
-sys/man/1/nm - 664 sys sys 944959673 1539
+sys/man/1/nm - 664 sys sys 1148106943 1601
 sys/man/1/ns - 664 sys sys 944959677 893
 sys/man/1/p - 664 sys sys 944959673 504
 sys/man/1/page - 664 sys sys 1087829646 5839
@@ -10142,7 +10140,7 @@ sys/src/cmd/fax/receiverc - 775 sys sys 944960990 581
 sys/src/cmd/fax/send.c - 664 sys sys 944960990 923
 sys/src/cmd/fax/subr.c - 664 sys sys 1015090401 1245
 sys/src/cmd/fcp.c - 664 sys sys 1136651872 3799
-sys/src/cmd/file.c - 664 sys sys 1125313891 23512
+sys/src/cmd/file.c - 664 sys sys 1148099097 24353
 sys/src/cmd/fmt.c - 664 sys sys 1137603598 4078
 sys/src/cmd/fortune.c - 664 sys sys 1072729222 1779
 sys/src/cmd/fossil - 20000000775 sys sys 1042005512 0
@@ -12280,7 +12278,7 @@ sys/src/cmd/htmlroff/t20.c - 664 sys sys 1138396081 1025
 sys/src/cmd/htmlroff/t3.c - 664 sys sys 1138396081 851
 sys/src/cmd/htmlroff/t4.c - 664 sys sys 1138396081 1974
 sys/src/cmd/htmlroff/t5.c - 664 sys sys 1138396081 1749
-sys/src/cmd/htmlroff/t6.c - 664 sys sys 1138396081 1135
+sys/src/cmd/htmlroff/t6.c - 664 sys sys 1148100558 1167
 sys/src/cmd/htmlroff/t7.c - 664 sys sys 1138396082 8626
 sys/src/cmd/htmlroff/t8.c - 664 sys sys 1138396082 6245
 sys/src/cmd/htmlroff/t9.c - 664 sys sys 1138396082 47
@@ -12663,7 +12661,7 @@ sys/src/cmd/ndb/time.c - 664 sys sys 957402055 321
 sys/src/cmd/netstat.c - 664 sys sys 1128255434 4086
 sys/src/cmd/news.c - 664 sys sys 1014926614 3778
 sys/src/cmd/nfs.c - 664 sys sys 1050068720 31096
-sys/src/cmd/nm.c - 664 sys sys 1131292928 4914
+sys/src/cmd/nm.c - 664 sys sys 1148106943 5322
 sys/src/cmd/nntpfs.c - 664 sys sys 1143695271 18860
 sys/src/cmd/ns.c - 664 sys sys 984717934 3558
 sys/src/cmd/p.c - 664 sys sys 1121977162 1504
@@ -13134,7 +13132,7 @@ sys/src/cmd/rio/scrl.c - 664 sys sys 1014926357 3245
 sys/src/cmd/rio/time.c - 664 sys sys 1014926357 1829
 sys/src/cmd/rio/util.c - 664 sys sys 1014926357 2061
 sys/src/cmd/rio/wctl.c - 664 sys sys 1023206837 8808
-sys/src/cmd/rio/wind.c - 664 sys sys 1143723596 33445
+sys/src/cmd/rio/wind.c - 664 sys sys 1148098042 33392
 sys/src/cmd/rio/xfid.c - 664 sys sys 1103205531 17446
 sys/src/cmd/rm.c - 664 sys sys 1014926615 1563
 sys/src/cmd/rx.c - 664 sys sys 1099760378 4382
@@ -15204,35 +15202,35 @@ sys/src/libmach - 20000000775 sys sys 969559166 0
 sys/src/libmach/0.c - 664 sys sys 1143834577 4167
 sys/src/libmach/2.c - 664 sys sys 1138471014 2085
 sys/src/libmach/2db.c - 664 sys sys 1143696097 61333
-sys/src/libmach/2obj.c - 664 sys sys 1091732624 2335
+sys/src/libmach/2obj.c - 664 sys sys 1148106911 2393
 sys/src/libmach/5.c - 664 sys sys 1138471013 1564
 sys/src/libmach/5db.c - 664 sys sys 1143696172 21599
-sys/src/libmach/5obj.c - 664 sys sys 1091732625 2209
+sys/src/libmach/5obj.c - 664 sys sys 1148106911 2267
 sys/src/libmach/6.c - 664 sys sys 1138471019 3482
 sys/src/libmach/6c - 20000000775 sys sys 1123100867 0
 sys/src/libmach/6c/6.out.h - 664 sys sys 1114459480 7984
-sys/src/libmach/6obj.c - 664 sys sys 1114459831 2382
+sys/src/libmach/6obj.c - 664 sys sys 1148106911 2440
 sys/src/libmach/7.c - 664 sys sys 1138471022 3310
 sys/src/libmach/7db.c - 664 sys sys 1136322405 17355
-sys/src/libmach/7obj.c - 664 sys sys 1091732676 2367
+sys/src/libmach/7obj.c - 664 sys sys 1148106912 2425
 sys/src/libmach/8.c - 664 sys sys 1138471020 2071
 sys/src/libmach/8db.c - 664 sys sys 1136322405 50889
-sys/src/libmach/8obj.c - 664 sys sys 1091732625 2200
+sys/src/libmach/8obj.c - 664 sys sys 1148106912 2258
 sys/src/libmach/access.c - 664 sys sys 1131289377 4588
 sys/src/libmach/elf.h - 664 sys sys 1131292881 2301
 sys/src/libmach/executable.c - 664 sys sys 1144256627 16172
 sys/src/libmach/k.c - 664 sys sys 1138471021 3381
 sys/src/libmach/kdb.c - 664 sys sys 1136322404 21222
-sys/src/libmach/kobj.c - 664 sys sys 1091732625 2217
+sys/src/libmach/kobj.c - 664 sys sys 1148106912 2275
 sys/src/libmach/machdata.c - 664 sys sys 1131289377 8799
 sys/src/libmach/map.c - 664 sys sys 1131289376 3056
 sys/src/libmach/mips2ureg.h - 664 sys sys 1143821483 886
 sys/src/libmach/mkfile - 664 sys sys 1144151016 482
-sys/src/libmach/obj.c - 664 sys sys 1131289376 5929
-sys/src/libmach/obj.h - 664 sys sys 1131292890 604
+sys/src/libmach/obj.c - 664 sys sys 1148106918 5986
+sys/src/libmach/obj.h - 664 sys sys 1148170078 648
 sys/src/libmach/q.c - 664 sys sys 1131289379 3630
 sys/src/libmach/qdb.c - 664 sys sys 1136322404 27544
-sys/src/libmach/qobj.c - 664 sys sys 1091732625 2310
+sys/src/libmach/qobj.c - 664 sys sys 1148106912 2368
 sys/src/libmach/setmach.c - 664 sys sys 1119476886 2911
 sys/src/libmach/swap.c - 664 sys sys 1131289376 1056
 sys/src/libmach/sym.c - 664 sys sys 1138471012 26745
@@ -15241,11 +15239,11 @@ sys/src/libmach/uc - 20000000775 sys sys 1114459488 0
 sys/src/libmach/uc/README - 664 sys sys 1114459488 73
 sys/src/libmach/uc/u.out.h - 664 sys sys 1114459488 3137
 sys/src/libmach/udb.c - 664 sys sys 1136322404 21967
-sys/src/libmach/uobj.c - 664 sys sys 1114459831 2219
+sys/src/libmach/uobj.c - 664 sys sys 1148106912 2277
 sys/src/libmach/v.c - 664 sys sys 1131289378 3446
 sys/src/libmach/vcodas.c - 664 sys sys 1136329351 10293
 sys/src/libmach/vdb.c - 664 sys sys 1144151030 22870
-sys/src/libmach/vobj.c - 664 sys sys 1091732625 2206
+sys/src/libmach/vobj.c - 664 sys sys 1148106913 2264
 sys/src/libmemdraw - 20000000775 sys sys 985020762 0
 sys/src/libmemdraw/alloc.c - 664 sys sys 1135895512 3334
 sys/src/libmemdraw/alpha.hoc - 664 sys sys 944961741 220

+ 24 - 26
dist/replica/plan9.db

@@ -38,7 +38,7 @@
 386/bin/ape/tar - 775 sys sys 1143777737 62279
 386/bin/ape/uname - 775 sys sys 1143741925 134338
 386/bin/aquarela - 775 sys sys 1144688908 332818
-386/bin/ar - 775 sys sys 1144688909 112319
+386/bin/ar - 775 sys sys 1148180226 113869
 386/bin/archfs - 775 sys sys 1143777740 147192
 386/bin/ascii - 775 sys sys 1143777740 64979
 386/bin/astro - 775 sys sys 1144688909 138872
@@ -228,7 +228,7 @@
 386/bin/faces - 775 sys sys 1147453006 194589
 386/bin/factor - 775 sys sys 1143777789 61794
 386/bin/fcp - 775 sys sys 1143777789 82528
-386/bin/file - 775 sys sys 1144264733 121024
+386/bin/file - 775 sys sys 1148180227 122500
 386/bin/fmt - 775 sys sys 1143777790 65662
 386/bin/fortune - 775 sys sys 1143777790 67451
 386/bin/fossil - 20000000775 sys sys 1042005470 0
@@ -275,7 +275,7 @@
 386/bin/hoc - 775 sys sys 1143777798 100173
 386/bin/html2ms - 775 sys sys 1143777798 66416
 386/bin/htmlfmt - 775 sys sys 1143777798 163390
-386/bin/htmlroff - 775 sys sys 1144688932 148426
+386/bin/htmlroff - 775 sys sys 1148180227 148483
 386/bin/ico - 775 sys sys 1143777800 162105
 386/bin/iconv - 775 sys sys 1143777800 113635
 386/bin/idiff - 775 sys sys 1143777800 76437
@@ -350,7 +350,7 @@
 386/bin/netstat - 775 sys sys 1144256044 85247
 386/bin/news - 775 sys sys 1144688947 72051
 386/bin/nfs - 775 sys sys 1143777829 321720
-386/bin/nm - 775 sys sys 1144264735 125798
+386/bin/nm - 775 sys sys 1148180227 127108
 386/bin/nntpfs - 775 sys sys 1143777831 166844
 386/bin/ns - 775 sys sys 1143777831 65587
 386/bin/p - 775 sys sys 1143777831 65315
@@ -558,7 +558,7 @@
 386/lib/libhttpd.a - 664 sys sys 1143777863 99458
 386/lib/libip.a - 664 sys sys 1143777863 35576
 386/lib/libl.a - 664 sys sys 1143777863 5372
-386/lib/libmach.a - 664 sys sys 1144264739 782800
+386/lib/libmach.a - 664 sys sys 1148180229 785314
 386/lib/libmemdraw.a - 664 sys sys 1143777866 284092
 386/lib/libmemlayer.a - 664 sys sys 1143777866 47360
 386/lib/libmp.a - 664 sys sys 1144169680 79980
@@ -2979,7 +2979,7 @@ lib/font/bit/lucidasans/unicode.6.font - 664 sys sys 1115914026 1945
 lib/font/bit/lucidasans/unicode.7.font - 664 sys sys 1124884861 2042
 lib/font/bit/lucidasans/unicode.8.font - 664 sys sys 1115917409 2095
 lib/font/bit/lucidasans/unicode.8.font1 - 664 sys sys 944943795 476
-lib/font/bit/lucidasans/unicode.9x24.font - 664 sys sys 944943794 1922
+lib/font/bit/lucidasans/unicode.9x24.font - 664 sys sys 1148098357 1936
 lib/font/bit/lucm - 20000000775 sys sys 944943795 0
 lib/font/bit/lucm/NOTICE - 664 sys sys 944943795 56
 lib/font/bit/lucm/currency.9 - 664 sys sys 944943795 602
@@ -3372,8 +3372,6 @@ lib/font/bit/pelm/euro.8.font - 664 sys sys 1115917411 470
 lib/font/bit/pelm/euro.9.font - 664 sys sys 1115917411 1982
 lib/font/bit/pelm/fangsong.9.font - 664 sys sys 1115917412 2110
 lib/font/bit/pelm/fffd.9 - 664 sys sys 944943801 191
-lib/font/bit/pelm/hanc.9.font - 664 sys sys 1115917412 1940
-lib/font/bit/pelm/hanj.9.font - 664 sys sys 1115917412 1940
 lib/font/bit/pelm/hku.9.font - 664 sys sys 1115917412 1766
 lib/font/bit/pelm/jis.9.font - 664 sys sys 1115917412 1915
 lib/font/bit/pelm/latin1.8 - 664 sys sys 944943801 4114
@@ -5750,7 +5748,7 @@ sys/games - 20000000775 sys sys 952648872 0
 sys/games/lib - 20000000775 sys sys 952648879 0
 sys/games/lib/4scores - 10000000666 sys sys 1118680448 0
 sys/games/lib/5scores - 10000000666 sys sys 1118680453 0
-sys/games/lib/fortunes - 664 sys sys 1147531044 259119
+sys/games/lib/fortunes - 664 sys sys 1148103602 259533
 sys/games/lib/mahjongg - 20000000775 sys sys 1095792278 0
 sys/games/lib/mahjongg/backgrounds - 20000000775 sys sys 1095792293 0
 sys/games/lib/mahjongg/backgrounds/default.bit - 664 sys sys 1095792293 346803
@@ -5926,7 +5924,7 @@ sys/games/lib/sudoku/images/9.bit - 664 sys sys 1117226542 537
 sys/include - 20000000775 sys sys 1016902416 0
 sys/include/9p.h - 664 sys sys 1134337548 4759
 sys/include/String.h - 664 sys sys 1091904425 1319
-sys/include/a.out.h - 664 sys sys 1131293220 1407
+sys/include/a.out.h - 664 sys sys 1148106925 1418
 sys/include/ape - 20000000775 sys sys 1014927784 0
 sys/include/ape/Plan9libnet.h - 664 sys sys 944948760 487
 sys/include/ape/ar.h - 664 sys sys 944948759 354
@@ -7337,7 +7335,7 @@ sys/man/1/ms2html - 664 sys sys 1138458899 1252
 sys/man/1/nedmail - 664 sys sys 1114697978 6820
 sys/man/1/netstat - 664 sys sys 1128255431 942
 sys/man/1/news - 664 sys sys 1113743329 1151
-sys/man/1/nm - 664 sys sys 944959673 1539
+sys/man/1/nm - 664 sys sys 1148106943 1601
 sys/man/1/ns - 664 sys sys 944959677 893
 sys/man/1/p - 664 sys sys 944959673 504
 sys/man/1/page - 664 sys sys 1087829646 5839
@@ -10142,7 +10140,7 @@ sys/src/cmd/fax/receiverc - 775 sys sys 944960990 581
 sys/src/cmd/fax/send.c - 664 sys sys 944960990 923
 sys/src/cmd/fax/subr.c - 664 sys sys 1015090401 1245
 sys/src/cmd/fcp.c - 664 sys sys 1136651872 3799
-sys/src/cmd/file.c - 664 sys sys 1125313891 23512
+sys/src/cmd/file.c - 664 sys sys 1148099097 24353
 sys/src/cmd/fmt.c - 664 sys sys 1137603598 4078
 sys/src/cmd/fortune.c - 664 sys sys 1072729222 1779
 sys/src/cmd/fossil - 20000000775 sys sys 1042005512 0
@@ -12280,7 +12278,7 @@ sys/src/cmd/htmlroff/t20.c - 664 sys sys 1138396081 1025
 sys/src/cmd/htmlroff/t3.c - 664 sys sys 1138396081 851
 sys/src/cmd/htmlroff/t4.c - 664 sys sys 1138396081 1974
 sys/src/cmd/htmlroff/t5.c - 664 sys sys 1138396081 1749
-sys/src/cmd/htmlroff/t6.c - 664 sys sys 1138396081 1135
+sys/src/cmd/htmlroff/t6.c - 664 sys sys 1148100558 1167
 sys/src/cmd/htmlroff/t7.c - 664 sys sys 1138396082 8626
 sys/src/cmd/htmlroff/t8.c - 664 sys sys 1138396082 6245
 sys/src/cmd/htmlroff/t9.c - 664 sys sys 1138396082 47
@@ -12663,7 +12661,7 @@ sys/src/cmd/ndb/time.c - 664 sys sys 957402055 321
 sys/src/cmd/netstat.c - 664 sys sys 1128255434 4086
 sys/src/cmd/news.c - 664 sys sys 1014926614 3778
 sys/src/cmd/nfs.c - 664 sys sys 1050068720 31096
-sys/src/cmd/nm.c - 664 sys sys 1131292928 4914
+sys/src/cmd/nm.c - 664 sys sys 1148106943 5322
 sys/src/cmd/nntpfs.c - 664 sys sys 1143695271 18860
 sys/src/cmd/ns.c - 664 sys sys 984717934 3558
 sys/src/cmd/p.c - 664 sys sys 1121977162 1504
@@ -13134,7 +13132,7 @@ sys/src/cmd/rio/scrl.c - 664 sys sys 1014926357 3245
 sys/src/cmd/rio/time.c - 664 sys sys 1014926357 1829
 sys/src/cmd/rio/util.c - 664 sys sys 1014926357 2061
 sys/src/cmd/rio/wctl.c - 664 sys sys 1023206837 8808
-sys/src/cmd/rio/wind.c - 664 sys sys 1143723596 33445
+sys/src/cmd/rio/wind.c - 664 sys sys 1148098042 33392
 sys/src/cmd/rio/xfid.c - 664 sys sys 1103205531 17446
 sys/src/cmd/rm.c - 664 sys sys 1014926615 1563
 sys/src/cmd/rx.c - 664 sys sys 1099760378 4382
@@ -15204,35 +15202,35 @@ sys/src/libmach - 20000000775 sys sys 969559166 0
 sys/src/libmach/0.c - 664 sys sys 1143834577 4167
 sys/src/libmach/2.c - 664 sys sys 1138471014 2085
 sys/src/libmach/2db.c - 664 sys sys 1143696097 61333
-sys/src/libmach/2obj.c - 664 sys sys 1091732624 2335
+sys/src/libmach/2obj.c - 664 sys sys 1148106911 2393
 sys/src/libmach/5.c - 664 sys sys 1138471013 1564
 sys/src/libmach/5db.c - 664 sys sys 1143696172 21599
-sys/src/libmach/5obj.c - 664 sys sys 1091732625 2209
+sys/src/libmach/5obj.c - 664 sys sys 1148106911 2267
 sys/src/libmach/6.c - 664 sys sys 1138471019 3482
 sys/src/libmach/6c - 20000000775 sys sys 1123100867 0
 sys/src/libmach/6c/6.out.h - 664 sys sys 1114459480 7984
-sys/src/libmach/6obj.c - 664 sys sys 1114459831 2382
+sys/src/libmach/6obj.c - 664 sys sys 1148106911 2440
 sys/src/libmach/7.c - 664 sys sys 1138471022 3310
 sys/src/libmach/7db.c - 664 sys sys 1136322405 17355
-sys/src/libmach/7obj.c - 664 sys sys 1091732676 2367
+sys/src/libmach/7obj.c - 664 sys sys 1148106912 2425
 sys/src/libmach/8.c - 664 sys sys 1138471020 2071
 sys/src/libmach/8db.c - 664 sys sys 1136322405 50889
-sys/src/libmach/8obj.c - 664 sys sys 1091732625 2200
+sys/src/libmach/8obj.c - 664 sys sys 1148106912 2258
 sys/src/libmach/access.c - 664 sys sys 1131289377 4588
 sys/src/libmach/elf.h - 664 sys sys 1131292881 2301
 sys/src/libmach/executable.c - 664 sys sys 1144256627 16172
 sys/src/libmach/k.c - 664 sys sys 1138471021 3381
 sys/src/libmach/kdb.c - 664 sys sys 1136322404 21222
-sys/src/libmach/kobj.c - 664 sys sys 1091732625 2217
+sys/src/libmach/kobj.c - 664 sys sys 1148106912 2275
 sys/src/libmach/machdata.c - 664 sys sys 1131289377 8799
 sys/src/libmach/map.c - 664 sys sys 1131289376 3056
 sys/src/libmach/mips2ureg.h - 664 sys sys 1143821483 886
 sys/src/libmach/mkfile - 664 sys sys 1144151016 482
-sys/src/libmach/obj.c - 664 sys sys 1131289376 5929
-sys/src/libmach/obj.h - 664 sys sys 1131292890 604
+sys/src/libmach/obj.c - 664 sys sys 1148106918 5986
+sys/src/libmach/obj.h - 664 sys sys 1148170078 648
 sys/src/libmach/q.c - 664 sys sys 1131289379 3630
 sys/src/libmach/qdb.c - 664 sys sys 1136322404 27544
-sys/src/libmach/qobj.c - 664 sys sys 1091732625 2310
+sys/src/libmach/qobj.c - 664 sys sys 1148106912 2368
 sys/src/libmach/setmach.c - 664 sys sys 1119476886 2911
 sys/src/libmach/swap.c - 664 sys sys 1131289376 1056
 sys/src/libmach/sym.c - 664 sys sys 1138471012 26745
@@ -15241,11 +15239,11 @@ sys/src/libmach/uc - 20000000775 sys sys 1114459488 0
 sys/src/libmach/uc/README - 664 sys sys 1114459488 73
 sys/src/libmach/uc/u.out.h - 664 sys sys 1114459488 3137
 sys/src/libmach/udb.c - 664 sys sys 1136322404 21967
-sys/src/libmach/uobj.c - 664 sys sys 1114459831 2219
+sys/src/libmach/uobj.c - 664 sys sys 1148106912 2277
 sys/src/libmach/v.c - 664 sys sys 1131289378 3446
 sys/src/libmach/vcodas.c - 664 sys sys 1136329351 10293
 sys/src/libmach/vdb.c - 664 sys sys 1144151030 22870
-sys/src/libmach/vobj.c - 664 sys sys 1091732625 2206
+sys/src/libmach/vobj.c - 664 sys sys 1148106913 2264
 sys/src/libmemdraw - 20000000775 sys sys 985020762 0
 sys/src/libmemdraw/alloc.c - 664 sys sys 1135895512 3334
 sys/src/libmemdraw/alpha.hoc - 664 sys sys 944961741 220

+ 27 - 0
dist/replica/plan9.log

@@ -29669,3 +29669,30 @@
 1147707122 2 c sys/src/libframe/frinsert.c - 664 sys sys 1147706378 6720
 1147712524 0 c 386/bin/acme - 775 sys sys 1147712341 432237
 1147712524 1 c 386/lib/libframe.a - 664 sys sys 1147712341 66398
+1148099524 0 c lib/font/bit/lucidasans/unicode.9x24.font - 664 sys sys 1148098357 1936
+1148099524 1 c sys/games/lib/fortunes - 664 sys sys 1148099227 259411
+1148099524 2 c sys/src/cmd/rio/wind.c - 664 sys sys 1148098042 33392
+1148099524 3 c sys/src/cmd/file.c - 664 sys sys 1148099097 24353
+1148099524 4 d lib/font/bit/pelm/hanj.9.font - 664 sys sys 1115917412 0
+1148099524 5 d lib/font/bit/pelm/hanc.9.font - 664 sys sys 1115917412 0
+1148101324 0 c sys/src/cmd/htmlroff/t6.c - 664 sys sys 1148100558 1167
+1148104805 0 c sys/games/lib/fortunes - 664 sys sys 1148103602 259533
+1148108407 0 c sys/include/a.out.h - 664 sys sys 1148106925 1418
+1148108407 1 c sys/man/1/nm - 664 sys sys 1148106943 1601
+1148108407 2 c sys/src/cmd/nm.c - 664 sys sys 1148106943 5322
+1148108407 3 c sys/src/libmach/2obj.c - 664 sys sys 1148106911 2393
+1148108407 4 c sys/src/libmach/5obj.c - 664 sys sys 1148106911 2267
+1148108407 5 c sys/src/libmach/6obj.c - 664 sys sys 1148106911 2440
+1148108407 6 c sys/src/libmach/7obj.c - 664 sys sys 1148106912 2425
+1148108407 7 c sys/src/libmach/8obj.c - 664 sys sys 1148106912 2258
+1148108407 8 c sys/src/libmach/kobj.c - 664 sys sys 1148106912 2275
+1148108407 9 c sys/src/libmach/obj.c - 664 sys sys 1148106918 5986
+1148108407 10 c sys/src/libmach/qobj.c - 664 sys sys 1148106912 2368
+1148108407 11 c sys/src/libmach/uobj.c - 664 sys sys 1148106912 2277
+1148108407 12 c sys/src/libmach/vobj.c - 664 sys sys 1148106913 2264
+1148171427 0 c sys/src/libmach/obj.h - 664 sys sys 1148170078 648
+1148180431 0 c 386/bin/ar - 775 sys sys 1148180226 113869
+1148180431 1 c 386/bin/file - 775 sys sys 1148180227 122500
+1148180431 2 c 386/bin/nm - 775 sys sys 1148180227 127108
+1148180431 3 c 386/bin/htmlroff - 775 sys sys 1148180227 148483
+1148180431 4 c 386/lib/libmach.a - 664 sys sys 1148180229 785314

+ 3 - 3
lib/font/bit/lucidasans/unicode.9x24.font

@@ -5,7 +5,7 @@
 0x0370	0x03F5	../lucm/greek.9
 0x0400	0x0475	../misc/cyrillic.9
 0x2000	0x2044	../misc/genpunc.9
-0x2070	0x208E	supsub.9
+0x2070	0x208E	../lucm/supsub.9
 0x20A0	0x20AC	../lucm/currency.9
 0x2100	0x2138	../misc/letterlike.8
 0x2190	0x21EA	../misc/arrows
@@ -59,5 +59,5 @@
 0x9a00 0x9bff ../jis/jis9a00.24
 0x9c00 0x9dff ../jis/jis9c00.24
 0x9e00 0x9fff ../jis/jis9e00.24
-0xfee0	0xff5e	latin1.9
-0xfffd	0xfffd	fffd.9
+0xfee0	0xff5e	lsr.24
+0xfffd	0xfffd	../pelm/fffd.9

+ 0 - 65
lib/font/bit/pelm/hanc.9.font

@@ -1,65 +0,0 @@
-18	14
-0x0000	0x00FF	latin1.9
-0x0100	0x017E	latineur.9
-0x0250	0x02E9	../lucm/ipa.9
-0x0370	0x03F5	../lucm/greek.9
-0x0400	0x0475	../misc/cyrillic.9
-0x2000	0x2044	../misc/genpunc.9
-0x2070	0x208E	supsub.9
-0x20A0	0x20AC	currency.9
-0x2100	0x2138	../misc/letterlike.8
-0x215b	0x2183	../misc/numbforms.9
-0x2190	0x21EA	../misc/arrows
-0x2200	0x227F	../misc/math1
-0x2280	0x22F1	../misc/math2
-0x2300	0x232C	../misc/tech
-0x2500	0x257F	../misc/chart
-0x2580	0x25ff	../misc/geometric
-0x2600	0x266F	../misc/ding
-0x2700	0x27BF	../misc/zapf
-0x3000 0x303f ../jis/jis3000.16
-0x30a1 0x30fe ../jis/katakana.16
-0x3041 0x309e ../jis/hiragana.16
-0x4e00 0x4fff ../han/c.4e00.16
-0x5000 0x51ff ../han/c.5000.16
-0x5200 0x53ff ../han/c.5200.16
-0x5400 0x55ff ../han/c.5400.16
-0x5600 0x57ff ../han/c.5600.16
-0x5800 0x59ff ../han/c.5800.16
-0x5a00 0x5bff ../han/c.5a00.16
-0x5c00 0x5dff ../han/c.5c00.16
-0x5e00 0x5fff ../han/c.5e00.16
-0x6000 0x61ff ../han/c.6000.16
-0x6200 0x63ff ../han/c.6200.16
-0x6400 0x65ff ../han/c.6400.16
-0x6600 0x67ff ../han/c.6600.16
-0x6800 0x69ff ../han/c.6800.16
-0x6a00 0x6bff ../han/c.6a00.16
-0x6c00 0x6dff ../han/c.6c00.16
-0x6e00 0x6fff ../han/c.6e00.16
-0x7000 0x71ff ../han/c.7000.16
-0x7200 0x73ff ../han/c.7200.16
-0x7400 0x75ff ../han/c.7400.16
-0x7600 0x77ff ../han/c.7600.16
-0x7800 0x79ff ../han/c.7800.16
-0x7a00 0x7bff ../han/c.7a00.16
-0x7c00 0x7dff ../han/c.7c00.16
-0x7e00 0x7fff ../han/c.7e00.16
-0x8000 0x81ff ../han/c.8000.16
-0x8200 0x83ff ../han/c.8200.16
-0x8400 0x85ff ../han/c.8400.16
-0x8600 0x87ff ../han/c.8600.16
-0x8800 0x89ff ../han/c.8800.16
-0x8a00 0x8bff ../han/c.8a00.16
-0x8c00 0x8dff ../han/c.8c00.16
-0x8e00 0x8fff ../han/c.8e00.16
-0x9000 0x91ff ../han/c.9000.16
-0x9200 0x93ff ../han/c.9200.16
-0x9400 0x95ff ../han/c.9400.16
-0x9600 0x97ff ../han/c.9600.16
-0x9800 0x99ff ../han/c.9800.16
-0x9a00 0x9bff ../han/c.9a00.16
-0x9c00 0x9dff ../han/c.9c00.16
-0x9e00 0x9fff ../han/c.9e00.16
-0xfee0	0xff5e	latin1.9
-0xFFFD 0xFFFD 0x80 latin1.9

+ 0 - 65
lib/font/bit/pelm/hanj.9.font

@@ -1,65 +0,0 @@
-18	14
-0x0000	0x00FF	latin1.9
-0x0100	0x017E	latineur.9
-0x0250	0x02E9	../lucm/ipa.9
-0x0370	0x03F5	../lucm/greek.9
-0x0400	0x0475	../misc/cyrillic.9
-0x2000	0x2044	../misc/genpunc.9
-0x2070	0x208E	supsub.9
-0x20A0	0x20AC	currency.9
-0x2100	0x2138	../misc/letterlike.8
-0x215b	0x2183	../misc/numbforms.9
-0x2190	0x21EA	../misc/arrows
-0x2200	0x227F	../misc/math1
-0x2280	0x22F1	../misc/math2
-0x2300	0x232C	../misc/tech
-0x2500	0x257F	../misc/chart
-0x2580	0x25ff	../misc/geometric
-0x2600	0x266F	../misc/ding
-0x2700	0x27BF	../misc/zapf
-0x3000 0x303f ../jis/jis3000.16
-0x30a1 0x30fe ../jis/katakana.16
-0x3041 0x309e ../jis/hiragana.16
-0x4e00 0x4fff ../han/j.4e00.16
-0x5000 0x51ff ../han/j.5000.16
-0x5200 0x53ff ../han/j.5200.16
-0x5400 0x55ff ../han/j.5400.16
-0x5600 0x57ff ../han/j.5600.16
-0x5800 0x59ff ../han/j.5800.16
-0x5a00 0x5bff ../han/j.5a00.16
-0x5c00 0x5dff ../han/j.5c00.16
-0x5e00 0x5fff ../han/j.5e00.16
-0x6000 0x61ff ../han/j.6000.16
-0x6200 0x63ff ../han/j.6200.16
-0x6400 0x65ff ../han/j.6400.16
-0x6600 0x67ff ../han/j.6600.16
-0x6800 0x69ff ../han/j.6800.16
-0x6a00 0x6bff ../han/j.6a00.16
-0x6c00 0x6dff ../han/j.6c00.16
-0x6e00 0x6fff ../han/j.6e00.16
-0x7000 0x71ff ../han/j.7000.16
-0x7200 0x73ff ../han/j.7200.16
-0x7400 0x75ff ../han/j.7400.16
-0x7600 0x77ff ../han/j.7600.16
-0x7800 0x79ff ../han/j.7800.16
-0x7a00 0x7bff ../han/j.7a00.16
-0x7c00 0x7dff ../han/j.7c00.16
-0x7e00 0x7fff ../han/j.7e00.16
-0x8000 0x81ff ../han/j.8000.16
-0x8200 0x83ff ../han/j.8200.16
-0x8400 0x85ff ../han/j.8400.16
-0x8600 0x87ff ../han/j.8600.16
-0x8800 0x89ff ../han/j.8800.16
-0x8a00 0x8bff ../han/j.8a00.16
-0x8c00 0x8dff ../han/j.8c00.16
-0x8e00 0x8fff ../han/j.8e00.16
-0x9000 0x91ff ../han/j.9000.16
-0x9200 0x93ff ../han/j.9200.16
-0x9400 0x95ff ../han/j.9400.16
-0x9600 0x97ff ../han/j.9600.16
-0x9800 0x99ff ../han/j.9800.16
-0x9a00 0x9bff ../han/j.9a00.16
-0x9c00 0x9dff ../han/j.9c00.16
-0x9e00 0x9fff ../han/j.9e00.16
-0xfee0	0xff5e	latin1.9
-0xFFFD 0xFFFD 0x80 latin1.9

+ 4 - 0
sys/games/lib/fortunes

@@ -4123,3 +4123,7 @@ After you have rotated your monitor, you need to complete the procedure below to
 The human genome is about 3 gigabases long, which boils down to 750 megabytes. Depressingly enough, this is only 2.8 Mozilla browsers.  - Bert Hubert
 cc: The parameter is incorrect.	- cygwin cc
 Some people are like slinkies.  They don't really have a purpose, but they still bring a smile to your face when you push them down the stairs.
+/* Not static, because we don't want the compiler removing it */
+It appears that you are accessing Myspace.com from a location that is not authorized to view our licensed videos.  Please go to the United States or its territories and try again.
+Subject: There's More to Nevada Than You Think
+The user of distributed operating systems will know a new kind of reliability.  - MIT video about computer networks, 1972

+ 1 - 0
sys/include/a.out.h

@@ -39,6 +39,7 @@ typedef	struct	Sym	Sym;
 struct	Sym
 {
 	vlong	value;
+	uint	sig;
 	char	type;
 	char	*name;
 };

+ 4 - 1
sys/man/1/nm

@@ -4,7 +4,7 @@ nm \- name list (symbol table)
 .SH SYNOPSIS
 .B nm
 [
-.B -aghnsu
+.B -aghnsTu
 ]
 .I file ...
 .SH DESCRIPTION
@@ -91,6 +91,9 @@ Sort according to the address of the symbols.
 .B -s
 Don't sort; print in symbol-table order.
 .TP
+.B -T
+Prefix each line with the symbol's type signature.
+.TP
 .B -u
 Print only undefined symbols.
 .SH SOURCE

+ 60 - 6
sys/src/cmd/file.c

@@ -162,6 +162,8 @@ int	istring(void);
 int	iff(void);
 int	long0(void);
 int	istar(void);
+int	isface(void);
+int	isexec(void);
 int	p9bitnum(uchar*);
 int	p9subfont(uchar*);
 void	print_utf(void);
@@ -173,6 +175,8 @@ int	(*call[])(void) =
 {
 	long0,		/* recognizable by first 4 bytes */
 	istring,	/* recognizable by first string */
+	iself,		/* ELF (foreign) executable */
+	isexec,		/* native executables */
 	iff,		/* interchange file format (strings) */
 	isrfc822,	/* email file */
 	ismbox,		/* mail box */
@@ -188,7 +192,7 @@ int	(*call[])(void) =
 	isenglish,	/* char frequency English */
 	isrtf,		/* rich text format */
 	ismsdos,	/* msdos exe (virus file attachement) */
-	iself,		/* ELF (foreign) executable */
+	isface,		/* ascii face file */
 	0
 };
 
@@ -542,20 +546,28 @@ filemagic(Filemagic *tab, int ntab, ulong x)
 int
 long0(void)
 {
-	Fhdr f;
 	long x;
 
+	x = LENDIAN(buf);
+	if(filemagic(long0tab, nelem(long0tab), x))
+		return 1;
+	return 0;
+}
+
+int
+isexec(void)
+{
+	Fhdr f;
+
 	seek(fd, 0, 0);		/* reposition to start of file */
 	if(crackhdr(fd, &f)) {
 		print(mime ? OCTET : "%s\n", f.name);
 		return 1;
 	}
-	x = LENDIAN(buf);
-	if(filemagic(long0tab, nelem(long0tab), x))
-		return 1;
 	return 0;
 }
 
+
 /* from tar.c */
 enum { NAMSIZ = 100, TBLOCK = 512 };
 
@@ -662,6 +674,9 @@ struct	FILE_STRING
 	"\033%-12345X",	"HPJCL file",		9,	"application/hpjcl",
 	"ID3",			"mp3 audio with id3",	3,	"audio/mpeg",
 	"\211PNG",		"PNG image",		4,	"image/png",
+	"P3\n",			"ppm",				3,	"image/ppm",
+	"P6\n",			"ppm",				3,	"image/ppm",
+	"/* XPM */\n",	"xbm",				10,	"image/xbm",
 	0,0,0,0
 };
 
@@ -1161,7 +1176,7 @@ isp9font(void)
 		return 0;
 	if (!getfontnum(cp, &cp))	/* ascent */
 		return 0;
-	for (i = 0; 1; i++) {
+	for (i = 0;; i++) {
 		if (!getfontnum(cp, &cp))	/* min */
 			break;
 		if (!getfontnum(cp, &cp))	/* max */
@@ -1276,3 +1291,42 @@ iself(void)
 
 	return 0;
 }
+
+int
+isface(void)
+{
+	int i, j, ldepth, l;
+	char *p;
+
+	ldepth = -1;
+	for(j = 0; j < 3; j++){
+		for(p = (char*)buf, i=0; i<3; i++){
+			if(p[0] != '0' || p[1] != 'x')
+				return 0;
+			if(buf[2+8] == ',')
+				l = 2;
+			else if(buf[2+4] == ',')
+				l = 1;
+			else
+				return 0;
+			if(ldepth == -1)
+				ldepth = l;
+			if(l != ldepth)
+				return 0;
+			strtoul(p, &p, 16);
+			if(*p++ != ',')
+				return 0;
+			while(*p == ' ' || *p == '\t')
+				p++;
+		}
+		if (*p++ != '\n')
+			return 0;
+	}
+	
+	if(mime)
+		print("application/x-face\n");
+	else
+		print("face image depth %d\n", ldepth);
+	return 1;
+}
+

+ 3 - 0
sys/src/cmd/htmlroff/t6.c

@@ -33,11 +33,13 @@ in(int v)
 {
 	nr(L(".i0"), getnr(L(".i")));
 	nr(L(".i"), v);
+	nr(L(".ti"), 0);
 	/* XXX */
 }
 void
 r_in(int argc, Rune **argv)
 {
+	br();
 	if(argc < 2)
 		in(getnr(L(".i0")));
 	else if(argv[1][0] == '+')
@@ -59,6 +61,7 @@ void
 r_ti(int argc, Rune **argv)
 {
 	USED(argc);
+	br();
 	ti(evalscale(argv[1], 'm'));
 }
 

+ 29 - 4
sys/src/cmd/nm.c

@@ -21,6 +21,7 @@ int	hflag;
 int	nflag;
 int	sflag;
 int	uflag;
+int	Tflag;
 
 Sym	**fnames;		/* file path translation table */
 Sym	**symptr;
@@ -36,6 +37,13 @@ void	doar(Biobuf*);
 void	dofile(Biobuf*);
 void	zenter(Sym*);
 
+void
+usage(void)
+{
+	fprint(2, "usage: nm [-aghnsTu] file ...\n");
+	exits("usage");
+}
+
 void
 main(int argc, char *argv[])
 {
@@ -45,13 +53,17 @@ main(int argc, char *argv[])
 	Binit(&bout, 1, OWRITE);
 	argv0 = argv[0];
 	ARGBEGIN {
+	default:	usage();
 	case 'a':	aflag = 1; break;
 	case 'g':	gflag = 1; break;
 	case 'h':	hflag = 1; break;
 	case 'n':	nflag = 1; break;
 	case 's':	sflag = 1; break;
 	case 'u':	uflag = 1; break;
+	case 'T':	Tflag = 1; break;
 	} ARGEND
+	if (argc == 0)
+		usage();
 	if (argc > 1)
 		multifile++;
 	for(i=0; i<argc; i++){
@@ -249,14 +261,24 @@ psym(Sym *s, void* p)
 void
 printsyms(Sym **symptr, long nsym)
 {
+	int i, wid;
 	Sym *s;
 	char *cp;
 	char path[512];
 
 	if(!sflag)
 		qsort(symptr, nsym, sizeof(*symptr), cmp);
-	while (nsym-- > 0) {
-		s = *symptr++;
+	
+	wid = 0;
+	for (i=0; i<nsym; i++) {
+		s = symptr[i];
+		if (s->value && wid == 0)
+			wid = 8;
+		else if (s->value >= 0x100000000LL && wid == 8)
+			wid = 16;
+	}	
+	for (i=0; i<nsym; i++) {
+		s = symptr[i];
 		if (multifile && !hflag)
 			Bprint(&bout, "%s:", filename);
 		if (s->type == 'z') {
@@ -264,10 +286,13 @@ printsyms(Sym **symptr, long nsym)
 			cp = path;
 		} else
 			cp = s->name;
+		if (Tflag)
+			Bprint(&bout, "%8ux ", s->sig);
 		if (s->value || s->type == 'a' || s->type == 'p')
-			Bprint(&bout, "%16llux %c %s\n", s->value, s->type, cp);
+			Bprint(&bout, "%*llux ", wid, s->value);
 		else
-			Bprint(&bout, "         %c %s\n", s->type, cp);
+			Bprint(&bout, "%*s ", wid, "");
+		Bprint(&bout, "%c %s\n", s->type, cp);
 	}
 }
 

+ 2 - 5
sys/src/cmd/rio/wind.c

@@ -709,11 +709,8 @@ void
 wrepaint(Window *w)
 {
 	wsetcols(w);
-	if(!w->mouseopen){
-		if(font->maxdepth > 1)
-			draw(w->Frame.b, w->Frame.r, cols[BACK], nil, ZP);
-		_frredraw(w, w->Frame.r.min);
-	}
+	if(!w->mouseopen)
+		_frredraw(w, w->Frame.r.min, w->cols[TEXT], w->cols[BACK]);
 	if(w == input){
 		wborder(w, Selborder);
 		wsetcursor(w, 0);

+ 6 - 2
sys/src/libmach/2obj.c

@@ -4,6 +4,7 @@
 #include <u.h>
 #include <libc.h>
 #include <bio.h>
+#include <mach.h>
 #include "2c/2.out.h"
 #include "obj.h"
 
@@ -43,9 +44,12 @@ _read2(Biobuf *bp, Prog *p)
 		return 0;
 	as |= ((c & 0xff) << 8);
 	p->kind = aNone;
+	p->sig = 0;
 	if(as == ANAME || as == ASIGNAME){
-		if(as == ASIGNAME)
-			skip(bp, 4);	/* signature */
+		if(as == ASIGNAME){
+			Bread(bp, &p->sig, 4);
+			p->sig = beswal(p->sig);
+		}
 		p->kind = aName;
 		p->type = type2char(Bgetc(bp));		/* type */
 		p->sym = Bgetc(bp);			/* sym */

+ 6 - 2
sys/src/libmach/5obj.c

@@ -4,6 +4,7 @@
 #include <u.h>
 #include <libc.h>
 #include <bio.h>
+#include <mach.h>
 #include "5c/5.out.h"
 #include "obj.h"
 
@@ -37,9 +38,12 @@ _read5(Biobuf *bp, Prog *p)
 	if(as < 0)
 		return 0;
 	p->kind = aNone;
+	p->sig = 0;
 	if(as == ANAME || as == ASIGNAME){
-		if(as == ASIGNAME)
-			skip(bp, 4);	/* signature */
+		if(as == ASIGNAME){
+			Bread(bp, &p->sig, 4);
+			p->sig = leswal(p->sig);
+		}
 		p->kind = aName;
 		p->type = type2char(Bgetc(bp));		/* type */
 		p->sym = Bgetc(bp);			/* sym */

+ 6 - 2
sys/src/libmach/6obj.c

@@ -4,6 +4,7 @@
 #include <u.h>
 #include <libc.h>
 #include <bio.h>
+#include <mach.h>
 #include "6c/6.out.h"
 #include "obj.h"
 
@@ -43,9 +44,12 @@ _read6(Biobuf *bp, Prog* p)
 		return 0;
 	as |= ((c & 0xff) << 8);
 	p->kind = aNone;
+	p->sig = 0;
 	if(as == ANAME || as == ASIGNAME){
-		if(as == ASIGNAME)
-			skip(bp, 4);	/* signature */
+		if(as == ASIGNAME){
+			Bread(bp, &p->sig, 4);
+			p->sig = leswal(p->sig);
+		}
 		p->kind = aName;
 		p->type = type2char(Bgetc(bp));		/* type */
 		p->sym = Bgetc(bp);			/* sym */

+ 6 - 2
sys/src/libmach/7obj.c

@@ -4,6 +4,7 @@
 #include <u.h>
 #include <libc.h>
 #include <bio.h>
+#include <mach.h>
 #include "7c/7.out.h"
 #include "obj.h"
 
@@ -37,9 +38,12 @@ _read7(Biobuf *bp, Prog *p)
 	if(as < 0)
 		return 0;
 	p->kind = aNone;
+	p->sig = 0;
 	if(as == ANAME || as == ASIGNAME){
-		if(as == ASIGNAME)
-			skip(bp, 4);	/* signature */
+		if(as == ASIGNAME){
+			Bread(bp, &p->sig, 4);
+			p->sig = leswal(p->sig);
+		}
 		p->kind = aName;
 		p->type = type2char(Bgetc(bp));		/* type */
 		p->sym = Bgetc(bp);			/* sym */

+ 6 - 2
sys/src/libmach/8obj.c

@@ -4,6 +4,7 @@
 #include <u.h>
 #include <libc.h>
 #include <bio.h>
+#include <mach.h>
 #include "8c/8.out.h"
 #include "obj.h"
 
@@ -43,9 +44,12 @@ _read8(Biobuf *bp, Prog* p)
 		return 0;
 	as |= ((c & 0xff) << 8);
 	p->kind = aNone;
+	p->sig = 0;
 	if(as == ANAME || as == ASIGNAME){
-		if(as == ASIGNAME)
-			skip(bp, 4);	/* signature */
+		if(as == ASIGNAME){
+			Bread(bp, &p->sig, 4);
+			p->sig = leswal(p->sig);
+		}
 		p->kind = aName;
 		p->type = type2char(Bgetc(bp));		/* type */
 		p->sym = Bgetc(bp);			/* sym */

+ 6 - 2
sys/src/libmach/kobj.c

@@ -4,6 +4,7 @@
 #include <u.h>
 #include <libc.h>
 #include <bio.h>
+#include <mach.h>
 #include "kc/k.out.h"
 #include "obj.h"
 
@@ -39,9 +40,12 @@ _readk(Biobuf *bp, Prog *p)
 	if(as < 0)
 		return 0;
 	p->kind = aNone;
+	p->sig = 0;
 	if(as == ANAME || as == ASIGNAME){
-		if(as == ASIGNAME)
-			skip(bp, 4);	/* signature */
+		if(as == ASIGNAME){
+			Bread(bp, &p->sig, 4);
+			p->sig = beswal(p->sig);
+		}
 		p->kind = aName;
 		p->type = type2char(Bgetc(bp));		/* type */
 		p->sym = Bgetc(bp);			/* sym */

+ 5 - 3
sys/src/libmach/obj.c

@@ -74,7 +74,7 @@ static	Sym	*names[NNAMES];	/* working set of active names */
 
 static	int	processprog(Prog*,int);	/* decode each symbol reference */
 static	void	objreset(void);
-static	void	objlookup(int, char *, int );
+static	void	objlookup(int, char *, int, uint);
 static	void 	objupdate(int, int);
 
 int
@@ -156,7 +156,7 @@ processprog(Prog *p, int doautos)
 		if (!doautos)
 		if(p->type != 'U' && p->type != 'b')
 			break;
-		objlookup(p->sym, p->id, p->type);
+		objlookup(p->sym, p->id, p->type, p->sig);
 		break;
 	case aText:
 		objupdate(p->sym, 'T');
@@ -175,7 +175,7 @@ processprog(Prog *p, int doautos)
  * make a new entry if it is not already there.
  */
 static void
-objlookup(int id, char *name, int type)
+objlookup(int id, char *name, int type, uint sig)
 {
 	long h;
 	char *cp;
@@ -185,6 +185,7 @@ objlookup(int id, char *name, int type)
 	s = names[id];
 	if(s && strcmp(s->name, name) == 0) {
 		s->type = type;
+		s->sig = sig;
 		return;
 	}
 
@@ -229,6 +230,7 @@ objlookup(int id, char *name, int type)
 	sp = malloc(sizeof(Symtab));
 	sp->s.name = name;
 	sp->s.type = type;
+	sp->s.sig = sig;
 	sp->s.value = islocal(type) ? MAXOFF : 0;
 	names[id] = &sp->s;
 	sp->next = hash[h];

+ 1 - 0
sys/src/libmach/obj.h

@@ -18,6 +18,7 @@ struct Prog		/* info from .$O files */
 	char	type;		/* type of the symbol: ie, 'T', 'a', etc. */
 	char	sym;		/* index of symbol's name */
 	char	*id;		/* name for the symbol, if it introduces one */
+	uint	sig;		/* type signature for symbol */
 };
 
 #define UNKNOWN	'?'

+ 6 - 2
sys/src/libmach/qobj.c

@@ -5,6 +5,7 @@
 #include <u.h>
 #include <libc.h>
 #include <bio.h>
+#include <mach.h>
 #include "qc/q.out.h"
 #include "obj.h"
 
@@ -38,9 +39,12 @@ _readq(Biobuf *bp, Prog *p)
 	if(as < 0)
 		return 0;
 	p->kind = aNone;
+	p->sig = 0;
 	if(as == ANAME || as == ASIGNAME){
-		if(as == ASIGNAME)
-			skip(bp, 4);	/* signature */
+		if(as == ASIGNAME){
+			Bread(bp, &p->sig, 4);
+			p->sig = beswal(p->sig);
+		}
 		p->kind = aName;
 		p->type = type2char(Bgetc(bp));		/* type */
 		p->sym = Bgetc(bp);			/* sym */

+ 6 - 2
sys/src/libmach/uobj.c

@@ -4,6 +4,7 @@
 #include <u.h>
 #include <libc.h>
 #include <bio.h>
+#include <mach.h>
 #include "uc/u.out.h"
 #include "obj.h"
 
@@ -39,9 +40,12 @@ _readu(Biobuf *bp, Prog *p)
 	if(as < 0)
 		return 0;
 	p->kind = aNone;
+	p->sig = 0;
 	if(as == ANAME || as == ASIGNAME){
-		if(as == ASIGNAME)
-			skip(bp, 4);	/* signature */
+		if(as == ASIGNAME){
+			Bread(bp, &p->sig, 4);
+			p->sig = beswal(p->sig);
+		}
 		p->kind = aName;
 		p->type = type2char(Bgetc(bp));		/* type */
 		p->sym = Bgetc(bp);			/* sym */

+ 6 - 2
sys/src/libmach/vobj.c

@@ -4,6 +4,7 @@
 #include <u.h>
 #include <libc.h>
 #include <bio.h>
+#include <mach.h>
 #include "vc/v.out.h"
 #include "obj.h"
 
@@ -37,9 +38,12 @@ _readv(Biobuf *bp, Prog *p)
 	if(as < 0)
 		return 0;
 	p->kind = aNone;
+	p->sig = 0;
 	if(as == ANAME || as == ASIGNAME){
-		if(as == ASIGNAME)
-			skip(bp, 4);	/* signature */
+		if(as == ASIGNAME){
+			Bread(bp, &p->sig, 4);
+			p->sig = leswal(p->sig);
+		}
 		p->kind = aName;
 		p->type = type2char(Bgetc(bp));		/* type */
 		p->sym = Bgetc(bp);			/* sym */