diff --git a/src/cmd/internal/goobj2/objfile.go b/src/cmd/internal/goobj2/objfile.go
index e10ce43833..4c364b0c54 100644
--- a/src/cmd/internal/goobj2/objfile.go
+++ b/src/cmd/internal/goobj2/objfile.go
@@ -33,7 +33,7 @@ import (
 //    Autolib  [...]stringOff // imported packages (for file loading) // TODO: add fingerprints
 //    PkgIndex [...]stringOff // referenced packages by index
 //
-//    DwarfFiles [...]stringOff // XXX as a separate block for now
+//    DwarfFiles [...]stringOff
 //
 //    SymbolDefs [...]struct {
 //       Name stringOff
diff --git a/src/cmd/internal/obj/sizeof_test.go b/src/cmd/internal/obj/sizeof_test.go
index ac65143b6b..b5e170c694 100644
--- a/src/cmd/internal/obj/sizeof_test.go
+++ b/src/cmd/internal/obj/sizeof_test.go
@@ -21,7 +21,7 @@ func TestSizeof(t *testing.T) {
 		_64bit uintptr     // size on 64bit platforms
 	}{
 		{Addr{}, 32, 48},
-		//{LSym{}, 56, 104}, // TODO: re-enable
+		{LSym{}, 76, 128},
 		{Prog{}, 132, 200},
 	}
 
diff --git a/test/linkx.go b/test/linkx.go
index 2b5b6edd47..4f85b241a9 100644
--- a/test/linkx.go
+++ b/test/linkx.go
@@ -32,8 +32,6 @@ func main() {
 
 	// Check non-string symbols are not overwritten.
 	// This also make them used.
-	// TODO: decide if we need to issue an error if -X
-	// is applied to a non-string unreachable symbol.
 	if b || x != 0 {
 		panic("b or x overwritten")
 	}