cmd/5g etc: tweak import blocks

Remove blank lines and merge lone imports into blocks.

Change-Id: Ib46dad584456909969f1ba3a2c7f5667abf336ae
Reviewed-on: https://go-review.googlesource.com/6792
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Rob Pike <r@golang.org>

diff --git a/src/cmd/5g/cgen.go b/src/cmd/5g/cgen.go
index d9c827776d426178695b40e2f3d2b8426cdd6de3..a6cc54db6ff832800a023c0472a45a7417121309 100644 (file)
--- a/src/cmd/5g/cgen.go
+++ b/src/cmd/5g/cgen.go
@@ -5,11 +5,11 @@
 package main
 
 import (
+       "cmd/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/arm"
        "fmt"
 )
-import "cmd/internal/gc"
 
 /*
  * peep.c

diff --git a/src/cmd/5g/cgen64.go b/src/cmd/5g/cgen64.go
index 9a3e8ab7d636b02c535c83db54b7238e6a2a934a..8c2f360baf21f5b29ebd06d0381963f2ebde41fa 100644 (file)
--- a/src/cmd/5g/cgen64.go
+++ b/src/cmd/5g/cgen64.go
@@ -5,10 +5,10 @@
 package main
 
 import (
+       "cmd/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/arm"
 )
-import "cmd/internal/gc"
 
 /*
  * attempt to generate 64-bit

diff --git a/src/cmd/5g/galign.go b/src/cmd/5g/galign.go
index d2eeeab4560763e8d94893ca42a1679c6d0f2849..4b8b82c5612694fe71258a70d80f66775f043535 100644 (file)
--- a/src/cmd/5g/galign.go
+++ b/src/cmd/5g/galign.go
@@ -5,10 +5,10 @@
 package main
 
 import (
+       "cmd/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/arm"
 )
-import "cmd/internal/gc"
 
 var thechar int = '5'
 

diff --git a/src/cmd/5g/ggen.go b/src/cmd/5g/ggen.go
index 58b0c36b282ec71e29d6c5aea13214c4fde07496..cb8485dba53f6761593cd6c8cb2dec853d25a585 100644 (file)
--- a/src/cmd/5g/ggen.go
+++ b/src/cmd/5g/ggen.go
@@ -5,10 +5,10 @@
 package main
 
 import (
+       "cmd/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/arm"
 )
-import "cmd/internal/gc"
 
 func defframe(ptxt *obj.Prog) {
        var n *gc.Node

diff --git a/src/cmd/5g/gsubr.go b/src/cmd/5g/gsubr.go
index f2ba6e2bff0e3ace4fa5a3bf6253c72f7aff893d..36c1280d3d8c468db6804559b629441aeda9149e 100644 (file)
--- a/src/cmd/5g/gsubr.go
+++ b/src/cmd/5g/gsubr.go
@@ -31,11 +31,11 @@
 package main
 
 import (
+       "cmd/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/arm"
        "fmt"
 )
-import "cmd/internal/gc"
 
 // TODO(rsc): Can make this bigger if we move
 // the text segment up higher in 5l for all GOOS.

diff --git a/src/cmd/5g/peep.go b/src/cmd/5g/peep.go
index 0c304f8b5ec668005d410fcf1245b83004084fd0..4fd22253344f0e4b5d98ee1ac3ca4c3cdb826521 100644 (file)
--- a/src/cmd/5g/peep.go
+++ b/src/cmd/5g/peep.go
@@ -31,11 +31,11 @@
 package main
 
 import (
+       "cmd/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/arm"
        "fmt"
 )
-import "cmd/internal/gc"
 
 var gactive uint32
 

diff --git a/src/cmd/5g/prog.go b/src/cmd/5g/prog.go
index 8135b8c58aad423c42349ad60a94a0f716ee4e13..9deff0787f66f70b443ac3a1cada1d817a9ff5ed 100644 (file)
--- a/src/cmd/5g/prog.go
+++ b/src/cmd/5g/prog.go
@@ -5,10 +5,10 @@
 package main
 
 import (
+       "cmd/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/arm"
 )
-import "cmd/internal/gc"
 
 const (
        RightRdwr = gc.RightRead | gc.RightWrite

diff --git a/src/cmd/5l/asm.go b/src/cmd/5l/asm.go
index 0cebb6b6e75841c27bdeac541175cd942bfecb9b..3f9b7ada90e611242de384f15519d857b60c01d2 100644 (file)
--- a/src/cmd/5l/asm.go
+++ b/src/cmd/5l/asm.go
@@ -31,11 +31,11 @@
 package main
 
 import (
+       "cmd/internal/ld"
        "cmd/internal/obj"
        "fmt"
        "log"
 )
-import "cmd/internal/ld"
 
 func needlib(name string) int {
        if name[0] == '\x00' {

diff --git a/src/cmd/5l/obj.go b/src/cmd/5l/obj.go
index 7eb3b0e1e6150e53b5f418532e63119095a42538..49ce10718b00e6fffc458bf221056af8870ba139 100644 (file)
--- a/src/cmd/5l/obj.go
+++ b/src/cmd/5l/obj.go
@@ -31,11 +31,11 @@
 package main
 
 import (
+       "cmd/internal/ld"
        "cmd/internal/obj"
        "fmt"
        "log"
 )
-import "cmd/internal/ld"
 
 // Reading object files.
 

diff --git a/src/cmd/6g/cgen.go b/src/cmd/6g/cgen.go
index 0b0d6b32494a343ded4db410f8e325dfcd0f041e..fba794ae20c0fc0af4ee9d6b9f40029ce645202b 100644 (file)
--- a/src/cmd/6g/cgen.go
+++ b/src/cmd/6g/cgen.go
@@ -5,11 +5,10 @@
 package main
 
 import (
+       "cmd/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/x86"
        "fmt"
-
-       "cmd/internal/gc"
 )
 
 /*

diff --git a/src/cmd/6g/galign.go b/src/cmd/6g/galign.go
index bdd8a3c2264517221fe725286f125db7beb041a1..6a2bac84d8280ca360b0e4addae551c37893ec06 100644 (file)
--- a/src/cmd/6g/galign.go
+++ b/src/cmd/6g/galign.go
@@ -5,10 +5,10 @@
 package main
 
 import (
+       "cmd/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/x86"
 )
-import "cmd/internal/gc"
 
 var thechar int = '6'
 

diff --git a/src/cmd/6g/ggen.go b/src/cmd/6g/ggen.go
index 45242b34a0a57c5ec6ab2deeec98e52451f058f4..3e74ce3757f08570b5e0b9818a48a4f7e7827b52 100644 (file)
--- a/src/cmd/6g/ggen.go
+++ b/src/cmd/6g/ggen.go
@@ -5,10 +5,10 @@
 package main
 
 import (
+       "cmd/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/x86"
 )
-import "cmd/internal/gc"
 
 func defframe(ptxt *obj.Prog) {
        var n *gc.Node

diff --git a/src/cmd/6g/gsubr.go b/src/cmd/6g/gsubr.go
index 719a1fee92a736d95523bef8166fc9b5bf8db41e..9df1d097c434929eef75a64ab8ab8e30155e368d 100644 (file)
--- a/src/cmd/6g/gsubr.go
+++ b/src/cmd/6g/gsubr.go
@@ -31,11 +31,11 @@
 package main
 
 import (
+       "cmd/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/x86"
        "fmt"
 )
-import "cmd/internal/gc"
 
 // TODO(rsc): Can make this bigger if we move
 // the text segment up higher in 6l for all GOOS.

diff --git a/src/cmd/6g/peep.go b/src/cmd/6g/peep.go
index a967bba22313f02b73c9336c54c94475996ebb47..11779dee2805db56732f5fbc369f5f66e9648c74 100644 (file)
--- a/src/cmd/6g/peep.go
+++ b/src/cmd/6g/peep.go
@@ -31,11 +31,11 @@
 package main
 
 import (
+       "cmd/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/x86"
        "fmt"
 )
-import "cmd/internal/gc"
 
 var gactive uint32
 

diff --git a/src/cmd/6g/prog.go b/src/cmd/6g/prog.go
index a1895a7017042514a8a8372c7b17a0e9bbed99ab..0bc703fa3c4b1a98a7c2e51acb2689d50c61ceb3 100644 (file)
--- a/src/cmd/6g/prog.go
+++ b/src/cmd/6g/prog.go
@@ -5,10 +5,10 @@
 package main
 
 import (
+       "cmd/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/x86"
 )
-import "cmd/internal/gc"
 
 var (
        AX               = RtoB(x86.REG_AX)

diff --git a/src/cmd/6g/reg.go b/src/cmd/6g/reg.go
index 3c5a69945f917a8e9905d6e279dab417e780c11e..0f32df53c06f84699e678e58e653739d353631dc 100644 (file)
--- a/src/cmd/6g/reg.go
+++ b/src/cmd/6g/reg.go
@@ -31,10 +31,10 @@
 package main
 
 import (
+       "cmd/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/x86"
 )
-import "cmd/internal/gc"
 
 const (
        NREGVAR = 32

diff --git a/src/cmd/6l/asm.go b/src/cmd/6l/asm.go
index bc95d81540841e1cc63841e83dc24f0a8f5a8dcf..828aafc648643058182193b6de8a88d716d60dad 100644 (file)
--- a/src/cmd/6l/asm.go
+++ b/src/cmd/6l/asm.go
@@ -31,11 +31,11 @@
 package main
 
 import (
+       "cmd/internal/ld"
        "cmd/internal/obj"
        "fmt"
        "log"
 )
-import "cmd/internal/ld"
 
 func PADDR(x uint32) uint32 {
        return x &^ 0x80000000

diff --git a/src/cmd/6l/obj.go b/src/cmd/6l/obj.go
index a34e30d447238933b1de7ec5005099b4e39ecd1e..e8c93c90fbc3fcb363c449136cc2e1232428a433 100644 (file)
--- a/src/cmd/6l/obj.go
+++ b/src/cmd/6l/obj.go
@@ -31,11 +31,11 @@
 package main
 
 import (
+       "cmd/internal/ld"
        "cmd/internal/obj"
        "fmt"
        "log"
 )
-import "cmd/internal/ld"
 
 // Reading object files.
 

diff --git a/src/cmd/8g/cgen.go b/src/cmd/8g/cgen.go
index ec8532d6fc8dbdb184e1b1c83355d03f19583bbe..6e6a28141dcc90699871b4a1465203236ab5a8ba 100644 (file)
--- a/src/cmd/8g/cgen.go
+++ b/src/cmd/8g/cgen.go
@@ -5,11 +5,11 @@
 package main
 
 import (
+       "cmd/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/i386"
        "fmt"
 )
-import "cmd/internal/gc"
 
 /*
  * reg.c

diff --git a/src/cmd/8g/cgen64.go b/src/cmd/8g/cgen64.go
index 523527033fbc1a1bbc4aaf4542d593776bc9f634..1d1ad9129863fdf0718bbf6fffc0f544e05a755c 100644 (file)
--- a/src/cmd/8g/cgen64.go
+++ b/src/cmd/8g/cgen64.go
@@ -5,10 +5,10 @@
 package main
 
 import (
+       "cmd/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/i386"
 )
-import "cmd/internal/gc"
 
 /*
  * attempt to generate 64-bit

diff --git a/src/cmd/8g/galign.go b/src/cmd/8g/galign.go
index 45ef1302f35aa07117582c9c4e4ac1c707105201..86024a82869affe72333eeaf16abbb76b82f5fed 100644 (file)
--- a/src/cmd/8g/galign.go
+++ b/src/cmd/8g/galign.go
@@ -5,10 +5,10 @@
 package main
 
 import (
+       "cmd/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/i386"
 )
-import "cmd/internal/gc"
 
 var thechar int = '8'
 

diff --git a/src/cmd/8g/ggen.go b/src/cmd/8g/ggen.go
index 1cc9a2bd02b94a1e5c8b9eac9dfbb0bf93729fa1..eb5eae2bba913537cd0ae37cd6cf4911c9e63b7e 100644 (file)
--- a/src/cmd/8g/ggen.go
+++ b/src/cmd/8g/ggen.go
@@ -5,10 +5,10 @@
 package main
 
 import (
+       "cmd/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/i386"
 )
-import "cmd/internal/gc"
 
 func defframe(ptxt *obj.Prog) {
        var n *gc.Node

diff --git a/src/cmd/8g/gsubr.go b/src/cmd/8g/gsubr.go
index 95ec01aaf67c706a3aacf049f2bb66c59b0af338..e3a8e7f2eea25ed3a37e63cc2e599e939082f636 100644 (file)
--- a/src/cmd/8g/gsubr.go
+++ b/src/cmd/8g/gsubr.go
@@ -31,11 +31,11 @@
 package main
 
 import (
+       "cmd/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/i386"
        "fmt"
 )
-import "cmd/internal/gc"
 
 // TODO(rsc): Can make this bigger if we move
 // the text segment up higher in 8l for all GOOS.

diff --git a/src/cmd/8g/peep.go b/src/cmd/8g/peep.go
index abb89fdc511e837247941c3c32eb6198a134b4f6..51e0d2eb88522ccf4050c4a5c37683d65148ddd9 100644 (file)
--- a/src/cmd/8g/peep.go
+++ b/src/cmd/8g/peep.go
@@ -31,11 +31,11 @@
 package main
 
 import (
+       "cmd/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/i386"
        "fmt"
 )
-import "cmd/internal/gc"
 
 const (
        REGEXT      = 0

diff --git a/src/cmd/8g/prog.go b/src/cmd/8g/prog.go
index f5c4ab69913349f4cb59bb6c4728a32c15215fa6..4a14b01ee3af1ef0ad97f5f0933cb28e93ab0810 100644 (file)
--- a/src/cmd/8g/prog.go
+++ b/src/cmd/8g/prog.go
@@ -5,10 +5,10 @@
 package main
 
 import (
+       "cmd/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/i386"
 )
-import "cmd/internal/gc"
 
 var (
        AX               = RtoB(i386.REG_AX)

diff --git a/src/cmd/8l/asm.go b/src/cmd/8l/asm.go
index d040c03326d091a58b88d90cea98453f90757c6d..b580ad5bc7afb4bad1628daf984467607fff16f1 100644 (file)
--- a/src/cmd/8l/asm.go
+++ b/src/cmd/8l/asm.go
@@ -31,11 +31,11 @@
 package main
 
 import (
+       "cmd/internal/ld"
        "cmd/internal/obj"
        "fmt"
        "log"
 )
-import "cmd/internal/ld"
 
 func needlib(name string) int {
        if name[0] == '\x00' {

diff --git a/src/cmd/8l/obj.go b/src/cmd/8l/obj.go
index 5d4472107405c1eb8f30a93a28d75bbbd9da0572..01a278cc4047e40bc995f7fa09948e1ce89d8c7c 100644 (file)
--- a/src/cmd/8l/obj.go
+++ b/src/cmd/8l/obj.go
@@ -31,11 +31,11 @@
 package main
 
 import (
+       "cmd/internal/ld"
        "cmd/internal/obj"
        "fmt"
        "log"
 )
-import "cmd/internal/ld"
 
 // Reading object files.
 

diff --git a/src/cmd/9g/cgen.go b/src/cmd/9g/cgen.go
index 424825bc034d86208e87f263f631bb14c3322fb0..4ab5215e552dcf9b0ddc4193434d710af8d9d8b3 100644 (file)
--- a/src/cmd/9g/cgen.go
+++ b/src/cmd/9g/cgen.go
@@ -5,11 +5,11 @@
 package main
 
 import (
+       "cmd/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/ppc64"
        "fmt"
 )
-import "cmd/internal/gc"
 
 /*
  * peep.c

diff --git a/src/cmd/9g/galign.go b/src/cmd/9g/galign.go
index 99425c3929d43ea630f566cf2b7cfac605eaa928..b39149a95217577a593a04f5f32efb906d1c58e3 100644 (file)
--- a/src/cmd/9g/galign.go
+++ b/src/cmd/9g/galign.go
@@ -5,10 +5,10 @@
 package main
 
 import (
+       "cmd/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/ppc64"
 )
-import "cmd/internal/gc"
 
 var thechar int = '9'
 

diff --git a/src/cmd/9g/ggen.go b/src/cmd/9g/ggen.go
index d9bcfb70287994e30b12a2a16f6106666e4f0976..3cca4a57512f487ec55c6e3238c11329bd599758 100644 (file)
--- a/src/cmd/9g/ggen.go
+++ b/src/cmd/9g/ggen.go
@@ -5,11 +5,11 @@
 package main
 
 import (
+       "cmd/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/ppc64"
        "fmt"
 )
-import "cmd/internal/gc"
 
 func defframe(ptxt *obj.Prog) {
        var n *gc.Node

diff --git a/src/cmd/9g/gsubr.go b/src/cmd/9g/gsubr.go
index 1f1a43edb3791342f54efd7b3031b3a79b04fcf2..5db301a28220fed06171c110c0ec9531ee933939 100644 (file)
--- a/src/cmd/9g/gsubr.go
+++ b/src/cmd/9g/gsubr.go
@@ -31,11 +31,11 @@
 package main
 
 import (
+       "cmd/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/ppc64"
        "fmt"
 )
-import "cmd/internal/gc"
 
 // TODO(rsc): Can make this bigger if we move
 // the text segment up higher in 6l for all GOOS.

diff --git a/src/cmd/9g/peep.go b/src/cmd/9g/peep.go
index 03581b1a82840f835aad3fb5892b2f359f6bbce3..af2e68ce2d8d58dc0384f1b93e26acfc43063369 100644 (file)
--- a/src/cmd/9g/peep.go
+++ b/src/cmd/9g/peep.go
@@ -31,11 +31,11 @@
 package main
 
 import (
+       "cmd/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/ppc64"
        "fmt"
 )
-import "cmd/internal/gc"
 
 var gactive uint32
 

diff --git a/src/cmd/9g/prog.go b/src/cmd/9g/prog.go
index 24de65f05b418f4d0b488a980ae031d110a63933..d5d534695aa2a38c19bd72635a9271a396fd7d66 100644 (file)
--- a/src/cmd/9g/prog.go
+++ b/src/cmd/9g/prog.go
@@ -5,10 +5,10 @@
 package main
 
 import (
+       "cmd/internal/gc"
        "cmd/internal/obj"
        "cmd/internal/obj/ppc64"
 )
-import "cmd/internal/gc"
 
 const (
        LeftRdwr  uint32 = gc.LeftRead | gc.LeftWrite

diff --git a/src/cmd/9l/asm.go b/src/cmd/9l/asm.go
index f0f5b56f619d63817001347afc0d31c5204a5280..2b6cdad2082e19ad008219089e709a9eb9e3d023 100644 (file)
--- a/src/cmd/9l/asm.go
+++ b/src/cmd/9l/asm.go
@@ -31,12 +31,12 @@
 package main
 
 import (
+       "cmd/internal/ld"
        "cmd/internal/obj"
        "encoding/binary"
        "fmt"
        "log"
 )
-import "cmd/internal/ld"
 
 func needlib(name string) int {
        if name[0] == '\x00' {

diff --git a/src/cmd/9l/obj.go b/src/cmd/9l/obj.go
index 8bba6be70d56d04c616c82e5e5b4680604a231d1..29b384a1a6d446e475b82aadf2a2872c486798df 100644 (file)
--- a/src/cmd/9l/obj.go
+++ b/src/cmd/9l/obj.go
@@ -31,11 +31,11 @@
 package main
 
 import (
+       "cmd/internal/ld"
        "cmd/internal/obj"
        "fmt"
        "log"
 )
-import "cmd/internal/ld"
 
 // Reading object files.