Skip to content
This repository was archived by the owner on Dec 14, 2023. It is now read-only.

Commit 353a1c6

Browse files
axwaxw
committed
Update import paths
1 parent 3f684a8 commit 353a1c6

35 files changed

+58
-53
lines changed

‎README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[![Build Status](https://drone.io/github.com/axw/llgo/status.png)](https://drone.io/github.com/axw/llgo/latest)
1+
[![Build Status](https://drone.io/github.com/go-llvm/llgo/status.png)](https://drone.io/github.com/go-llvm/llgo/latest)
22
# llgo
33

44
llgo is a [Go](http://golang.org) frontend for [LLVM](http://llvm.org), written in Go.
@@ -9,7 +9,7 @@ llgo is under active development, but is still considered experimental. It is no
99

1010
To install llgo, use llgo-dist:
1111

12-
go get github.com/axw/llgo/cmd/llgo-dist
12+
go get github.com/go-llvm/llgo/cmd/llgo-dist
1313
llgo-dist
1414

1515
You should have the latest version of LLVM in your $PATH (3.3 has been confirmed to be compatible). If LLVM is not in $PATH, llgo-dist also has a flag that can specified to point at the LLVM installation: `-llvm-config=<path/to/llvm-config>`.
@@ -30,8 +30,8 @@ The `llgo-build` tool accepts either Go filenames, or package names, just like `
3030

3131
First install llgo using `llgo-dist`, as described above. Then you can run the functional tests like so:
3232

33-
go test -v github.com/axw/llgo/llgo
33+
go test -v github.com/go-llvm/llgo/llgo
3434

3535
You can also run the compiler tests from gc's source tree ($GOROOT/test) by specifying the build tag `go_test`:
3636

37-
go test -v -tags go_test github.com/axw/llgo/llgo -run StandardTests
37+
go test -v -tags go_test github.com/go-llvm/llgo/llgo -run StandardTests

‎alg.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package llgo
77
import (
88
"code.google.com/p/go.tools/go/types"
99

10-
"github.com/axw/gollvm/llvm"
10+
"github.com/go-llvm/llvm"
1111
)
1212

1313
type AlgorithmKind int

‎attribute.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package llgo
77
import (
88
"code.google.com/p/go.tools/go/types"
99
"fmt"
10-
"github.com/axw/gollvm/llvm"
10+
"github.com/go-llvm/llvm"
1111
"go/ast"
1212
"strings"
1313
)

‎build/build_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ package build_test
22

33
import (
44
"bytes"
5-
"github.com/axw/llgo/build"
65
"io/ioutil"
76
"strings"
87
"testing"
98
"testing/iotest"
9+
10+
"github.com/go-llvm/llgo/build"
1011
)
1112

1213
func TestLLVMIRReadCloser(t *testing.T) {

‎builtins.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package llgo
66

77
import (
88
"code.google.com/p/go.tools/go/types"
9-
"github.com/axw/gollvm/llvm"
9+
"github.com/go-llvm/llvm"
1010
)
1111

1212
func (c *compiler) callCap(arg *LLVMValue) *LLVMValue {

‎call.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package llgo
66

77
import (
88
"code.google.com/p/go.tools/go/types"
9-
"github.com/axw/gollvm/llvm"
9+
"github.com/go-llvm/llvm"
1010
)
1111

1212
// createCall emits the code for a function call,

‎channels.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package llgo
66

77
import (
88
"code.google.com/p/go.tools/go/types"
9-
"github.com/axw/gollvm/llvm"
9+
"github.com/go-llvm/llvm"
1010
)
1111

1212
// makeChan implements make(chantype[, size])

‎closures.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package llgo
66

77
import (
8-
"github.com/axw/gollvm/llvm"
8+
"github.com/go-llvm/llvm"
99
)
1010

1111
// makeClosure creates a closure from a function pointer and

‎cmd/llgo-build/build.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ import (
1717
"regexp"
1818
"strings"
1919

20-
llgobuild "github.com/axw/llgo/build"
20+
llgobuild "github.com/go-llvm/llgo/build"
2121
)
2222

23-
const llgoPkgPrefix = "github.com/axw/llgo/pkg/"
23+
const llgoPkgPrefix = "github.com/go-llvm/llgo/pkg/"
2424

2525
type renamedFileInfo struct {
2626
os.FileInfo

‎cmd/llgo-build/main.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@ package main
77
import (
88
"flag"
99
"fmt"
10-
llgobuild "github.com/axw/llgo/build"
1110
"go/build"
1211
"io/ioutil"
1312
"log"
1413
"os"
1514
"path/filepath"
1615
"runtime"
16+
17+
llgobuild "github.com/go-llvm/llgo/build"
1718
)
1819

1920
var (

‎cmd/llgo-dist/buildllgo.go

+7-6
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,16 @@ package main
66

77
import (
88
"fmt"
9-
"github.com/axw/llgo/build"
109
gobuild "go/build"
1110
"log"
1211
"os"
1312
"strings"
13+
14+
"github.com/go-llvm/llgo/build"
1415
)
1516

16-
const gollvmpkgpath = "github.com/axw/gollvm/llvm"
17-
const llgopkgpath = "github.com/axw/llgo/llgo"
17+
const llvmpkgpath = "github.com/go-llvm/llvm"
18+
const llgopkgpath = "github.com/go-llvm/llgo/llgo"
1819

1920
var (
2021
// llgobin is the path to the llgo command.
@@ -24,19 +25,19 @@ var (
2425
func buildLlgo() error {
2526
log.Println("Building llgo")
2627

27-
cmd := command("go", "get", "-d", gollvmpkgpath)
28+
cmd := command("go", "get", "-d", llvmpkgpath)
2829
output, err := cmd.CombinedOutput()
2930
if err != nil {
3031
fmt.Fprintf(os.Stderr, "%s\n", string(output))
3132
return err
3233
}
33-
pkg, err := gobuild.Import(gollvmpkgpath, "", gobuild.FindOnly)
34+
pkg, err := gobuild.Import(llvmpkgpath, "", gobuild.FindOnly)
3435
if err != nil {
3536
return err
3637
}
3738
if alwaysbuild {
3839
if _, err := os.Stat(pkg.PkgObj); err == nil {
39-
log.Println("- Rebuilding gollvm")
40+
log.Println("- Rebuilding go-llvm/llvm")
4041
os.Remove(pkg.PkgObj)
4142
}
4243
}

‎cmd/llgo-dist/buildruntime.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"strings"
1515
)
1616

17-
const llgoPkgRuntime = "github.com/axw/llgo/pkg/runtime"
17+
const llgoPkgRuntime = "github.com/go-llvm/llgo/pkg/runtime"
1818

1919
func buildRuntimeCgo() error {
2020
log.Println(" - generating platform-specific code")

‎cmd/llgo-dist/buildtools.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"strings"
1212
)
1313

14-
const llgoBuildPath = "github.com/axw/llgo/cmd/llgo-build"
14+
const llgoBuildPath = "github.com/go-llvm/llgo/cmd/llgo-build"
1515

1616
var llgobuildbin string
1717

‎cmd/llgo-dist/nativeclient.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"strings"
1515
)
1616

17-
const llgoPkgSyscall = "github.com/axw/llgo/pkg/syscall"
17+
const llgoPkgSyscall = "github.com/go-llvm/llgo/pkg/syscall"
1818

1919
// pnaclClang is the path to the pnacl-clang script.
2020
var pnaclClang string

‎coerce.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package llgo
66

77
import (
8-
"github.com/axw/gollvm/llvm"
8+
"github.com/go-llvm/llvm"
99
)
1010

1111
// coerce yields a value of the the type specified, initialised

‎compiler.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import (
1212
"runtime"
1313
"strings"
1414

15-
"github.com/axw/gollvm/llvm"
16-
llgobuild "github.com/axw/llgo/build"
17-
llgoimporter "github.com/axw/llgo/importer"
15+
llgobuild "github.com/go-llvm/llgo/build"
16+
llgoimporter "github.com/go-llvm/llgo/importer"
17+
"github.com/go-llvm/llvm"
1818

1919
"code.google.com/p/go.tools/go/loader"
2020
"code.google.com/p/go.tools/go/ssa"

‎convert.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package llgo
66

77
import (
88
"code.google.com/p/go.tools/go/types"
9-
"github.com/axw/gollvm/llvm"
9+
"github.com/go-llvm/llvm"
1010
)
1111

1212
// convertE2V converts (type asserts) an interface value to a concrete type.

‎debug.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"code.google.com/p/go.tools/go/ssa"
1212
"code.google.com/p/go.tools/go/types"
1313

14-
"github.com/axw/gollvm/llvm"
15-
"github.com/axw/llgo/debug"
14+
"github.com/go-llvm/llgo/debug"
15+
"github.com/go-llvm/llvm"
1616
)
1717

1818
const (

‎debug/descriptors.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"fmt"
1010
"path"
1111

12-
"github.com/axw/gollvm/llvm"
12+
"github.com/go-llvm/llvm"
1313
)
1414

1515
type DebugInfo struct {

‎importer/importer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"path/filepath"
1212
"runtime"
1313

14-
"github.com/axw/llgo/build"
14+
"github.com/go-llvm/llgo/build"
1515

1616
"code.google.com/p/go.tools/go/gcimporter"
1717
"code.google.com/p/go.tools/go/importer"

‎indirect.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package llgo
66

77
import (
88
"code.google.com/p/go.tools/go/types"
9-
"github.com/axw/gollvm/llvm"
9+
"github.com/go-llvm/llvm"
1010
)
1111

1212
// indirectFunction creates an indirect function from a

‎interfaces.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package llgo
66

77
import (
88
"code.google.com/p/go.tools/go/types"
9-
"github.com/axw/gollvm/llvm"
9+
"github.com/go-llvm/llvm"
1010
)
1111

1212
// interfaceMethod returns a function pointer for the specified

‎llgo/llgo.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@ import (
1313
"errors"
1414
"flag"
1515
"fmt"
16-
"github.com/axw/gollvm/llvm"
17-
"github.com/axw/llgo"
1816
"go/scanner"
1917
"log"
2018
"os"
2119
"runtime"
2220
"sort"
21+
22+
"github.com/go-llvm/llgo"
23+
"github.com/go-llvm/llvm"
2324
)
2425

2526
var dump = flag.Bool(

‎llgo/testdata/programs/nacl/example.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package main
66

77
import (
8-
"github.com/axw/llgo/pkg/nacl/ppapi"
8+
"github.com/go-llvm/llgo/pkg/nacl/ppapi"
99
)
1010

1111
var module *ppapi.Module

‎llgo/utils_test.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ package main
22

33
import (
44
"fmt"
5-
"github.com/axw/gollvm/llvm"
6-
"github.com/axw/llgo"
75
"go/build"
86
"io/ioutil"
97
"os"
@@ -16,6 +14,9 @@ import (
1614
"sort"
1715
"strings"
1816
"testing"
17+
18+
"github.com/go-llvm/llgo"
19+
"github.com/go-llvm/llvm"
1920
)
2021

2122
var (
@@ -69,7 +70,7 @@ func init() {
6970

7071
func getRuntimeFiles() (gofiles []string, llfiles []string, cfiles []string, err error) {
7172
var pkg *build.Package
72-
pkgpath := "github.com/axw/llgo/pkg/runtime"
73+
pkgpath := "github.com/go-llvm/llgo/pkg/runtime"
7374
pkg, err = build.Import(pkgpath, "", 0)
7475
if err != nil {
7576
return

‎maps.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package llgo
66

77
import (
88
"code.google.com/p/go.tools/go/types"
9-
"github.com/axw/gollvm/llvm"
9+
"github.com/go-llvm/llvm"
1010
)
1111

1212
// makeMap implements make(maptype[, initial space])

‎pkg/runtime/zctypes.cgo1_linux_amd64.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
// Created by cgo - DO NOT EDIT
77

8-
//line /media/msata/code/src/github.com/axw/llgo/pkg/runtime/ctypes.go:9
8+
//line /media/msata/code/src/github.com/go-llvm/llgo/pkg/runtime/ctypes.go:9
99
package runtime
10-
//line /media/msata/code/src/github.com/axw/llgo/pkg/runtime/ctypes.go:16
10+
//line /media/msata/code/src/github.com/go-llvm/llgo/pkg/runtime/ctypes.go:16
1111

12-
//line /media/msata/code/src/github.com/axw/llgo/pkg/runtime/ctypes.go:15
12+
//line /media/msata/code/src/github.com/go-llvm/llgo/pkg/runtime/ctypes.go:15
1313
type jmp_buf _Ctype_jmp_buf

‎println.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
"code.google.com/p/go.tools/go/exact"
1111
"code.google.com/p/go.tools/go/types"
12-
"github.com/axw/gollvm/llvm"
12+
"github.com/go-llvm/llvm"
1313
)
1414

1515
func getPrintf(module llvm.Module) llvm.Value {

‎runtime.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313

1414
"code.google.com/p/go.tools/go/types"
1515

16-
"github.com/axw/gollvm/llvm"
16+
"github.com/go-llvm/llvm"
1717
)
1818

1919
type FuncResolver interface {
@@ -211,7 +211,7 @@ func newRuntimeInterface(pkg *types.Package, module llvm.Module, tm *llvmTypeMap
211211
// importRuntime locates the the runtime package and parses its files
212212
// to *ast.Files. This is used to generate runtime type structures.
213213
func parseRuntime(buildctx *build.Context, fset *token.FileSet) ([]*ast.File, error) {
214-
buildpkg, err := buildctx.Import("github.com/axw/llgo/pkg/runtime", "", 0)
214+
buildpkg, err := buildctx.Import("github.com/go-llvm/llgo/pkg/runtime", "", 0)
215215
if err != nil {
216216
return nil, err
217217
}

‎slice.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package llgo
66

77
import (
88
"code.google.com/p/go.tools/go/types"
9-
"github.com/axw/gollvm/llvm"
9+
"github.com/go-llvm/llvm"
1010
)
1111

1212
// makeLiteralSlice allocates a new slice, storing in it the provided elements.

‎ssa.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"code.google.com/p/go.tools/go/ssa"
1313
"code.google.com/p/go.tools/go/ssa/ssautil"
1414
"code.google.com/p/go.tools/go/types"
15-
"github.com/axw/gollvm/llvm"
15+
"github.com/go-llvm/llvm"
1616
)
1717

1818
type unit struct {

0 commit comments

Comments
 (0)