cmd/nm: accept macho files which don't have symbol table in the archive

After https://golang.org/cl/64793, we started to include Mach-O object
files which don't have symbol table into cgo archive.
However, toolchains didn't handle those files yet.

Fixes #21959

Change-Id: Ibb2f6492f1fa59368f2dfd4cff19783997539875
Reviewed-on: https://go-review.googlesource.com/65170
Reviewed-by: Ian Lance Taylor <iant@golang.org>

diff --git a/src/cmd/internal/objfile/macho.go b/src/cmd/internal/objfile/macho.go
index d6d545c23ecc6160219473e027383940d6e372b5..7a8999e5ba38a61c3bc7dabb173e0f965eb59087 100644 (file)
--- a/src/cmd/internal/objfile/macho.go
+++ b/src/cmd/internal/objfile/macho.go
@@ -30,7 +30,7 @@ func openMacho(r io.ReaderAt) (rawFile, error) {
 
 func (f *machoFile) symbols() ([]Sym, error) {
        if f.macho.Symtab == nil {
-               return nil, fmt.Errorf("missing symbol table")
+               return nil, nil
        }
 
        // Build sorted list of addresses of all symbols.

diff --git a/src/cmd/nm/nm.go b/src/cmd/nm/nm.go
index 65ef5b4295f9067140cc2b21d62df2b83c3d28c7..457239921bc34ff185f144467b7762bec1383f21 100644 (file)
--- a/src/cmd/nm/nm.go
+++ b/src/cmd/nm/nm.go
@@ -110,15 +110,19 @@ func nm(file string) {
 
        entries := f.Entries()
 
+       var found bool
+
        for _, e := range entries {
                syms, err := e.Symbols()
                if err != nil {
                        errorf("reading %s: %v", file, err)
                }
                if len(syms) == 0 {
-                       errorf("reading %s: no symbols", file)
+                       continue
                }
 
+               found = true
+
                switch *sortOrder {
                case "address":
                        sort.Slice(syms, func(i, j int) bool { return syms[i].Addr < syms[j].Addr })
@@ -155,5 +159,9 @@ func nm(file string) {
                }
        }
 
+       if !found {
+               errorf("reading %s: no symbols", file)
+       }
+
        w.Flush()
 }