Merge pull request #97 from quarnster/pnacl

pnacl low hanging fruit. Fixes #96

Author: axw

cmd/llgo-dist/buildruntime.go

@@ -22,12 +22,26 @@ func buildRuntime() (reterr error) {
 		"os/user",     // Issue #72
 		"runtime/cgo", // Issue #73
 	}
+	if triple == "pnacl" {
+		badPackages = append(badPackages,
+			"crypto/md5",
+			"crypto/rc4",
+			"hash/crc32",
+			"mime",
+			"os/exec",
+			"os/signal",
+			"path/filepath",
+		)
+	}
 
 	output, err := command("go", "list", "std").CombinedOutput()
 	if err != nil {
 		return err
 	}
-	runtimePackages := strings.Split(strings.TrimSpace(string(output)), "\n")
+
+	// Always build runtime and syscall first
+	// TODO: Real import dependency discovery to build packages in the order they depend on each other
+	runtimePackages := append([]string{"runtime", "syscall"}, strings.Split(strings.TrimSpace(string(output)), "\n")...)
 outer:
 	for _, pkg := range runtimePackages {
 		// cmd's aren't packages

exports.go

@@ -44,7 +44,11 @@ func (c *compiler) packageExportsFile(path string) string {
 	} else {
 		gopath = filepath.SplitList(gopath)[0]
 	}
-	return filepath.Join(gopath, "pkg", "llgo", c.TargetTriple, path+".lgx")
+	target := c.TargetTriple
+	if c.pnacl {
+		target = "pnacl"
+	}
+	return filepath.Join(gopath, "pkg", "llgo", target, path+".lgx")
 }
 
 func (c *importer) Import(imports map[string]*types.Package, path string) (pkg *types.Package, err error) {

pkg/crypto/sha1/sha1block_libc.go pkg/crypto/sha1/sha1block.gopkg/crypto/sha1/sha1block_libc.go renamed to pkg/crypto/sha1/sha1block.go

@@ -0,0 +1,7 @@
+// Copyright 2013 The llgo Authors
+// Use of this source code is governed by an MIT-style
+// license that can be found in the LICENSE file.
+
+package sha1
+
+func block(dig *digest, p []byte)

pkg/crypto/sha1/sha1block_decl.go

@@ -431,3 +431,7 @@ func Chtimes(name string, atime time.Time, mtime time.Time) error {
 	}
 	return nil
 }
+
+func Pipe() (r *File, w *File, err error) {
+	return nil, nil, syscall.EPERM
+}

pkg/os/file_pnacl.go

@@ -21,7 +21,7 @@ func fileInfoFromStat(st *syscall.Stat_t, name string) FileInfo {
 	fs := &fileStat{
 		name:    basename(name),
 		size:    int64(st.Size),
-		modTime: timespecToTime(st.Mtim),
+		modTime: time.Unix(st.Mtime, st.Mtimensec),
 		sys:     st,
 	}
 	fs.mode = FileMode(st.Mode & 0777)
@@ -53,11 +53,8 @@ func fileInfoFromStat(st *syscall.Stat_t, name string) FileInfo {
 	return fs
 }
 
-func timespecToTime(ts syscall.Timespec) time.Time {
-	return time.Unix(int64(ts.Sec), int64(ts.Nsec))
-}
-
 // For testing.
 func atime(fi FileInfo) time.Time {
-	return timespecToTime(fi.Sys().(*syscall.Stat_t).Atim)
+	st := fi.Sys().(*syscall.Stat_t)
+	return time.Unix(st.Atime, st.Atimensec)
 }

pkg/os/stat_pnacl.go

@@ -7,17 +7,19 @@
 package syscall
 
 import (
-	"runtime"
-	"sync"
 	"unsafe"
 )
 
+const ImplementsGetwd = false
+
 var (
 	Stdin  = 0
 	Stdout = 1
 	Stderr = 2
 )
 
+type SysProcAttr struct{}
+
 func Syscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err Errno) {
 	return 0, 0, EPERM
 }
@@ -188,7 +190,7 @@ func Exit(status int) {
 	_exit(status)
 }
 
-func Fstat(path string, buf *Stat_t) (err error) {
+func Fstat(fd int, buf *Stat_t) (err error) {
 	return EPERM
 }
 
@@ -293,8 +295,8 @@ func CloseOnExec(fd int) {
 }
 
 func UtimesNano(path string, ts []Timespec) error {
-    // TODO
-    return EPERM
+	// TODO
+	return EPERM
 }
 
 var ioSync int64

pkg/syscall/syscall_pnacl.go

@@ -1,8 +1,9 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -nostdinc -D__native_client__ -isystem /home/andrew/prog/nacl_sdk/pepper_canary/toolchain/linux_x86_pnacl/newlib/usr/include -isystem /home/andrew/prog/nacl_sdk/pepper_canary/include -isystem /home/andrew/prog/nacl_sdk/pepper_canary/toolchain/linux_x86_pnacl/host_x86_64/lib/clang/3.3/include -isystem /home/andrew/prog/nacl_sdk/pepper_canary/toolchain/linux_x86_pnacl/newlib/sysroot/include /home/andrew/prog/go/me/src/github.com/axw/llgo/pkg/syscall/types_pnacl.go
 
 // +build pnacl
 
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -objdir /var/folders/n1/yjqlqd2s04x7th1152h48hsr0000gn/T/llgo_dist381379107 -- -nostdinc -D__native_client__ -isystem /Users/quarnster/Downloads/nacl_sdk/pepper_29/toolchain/mac_x86_pnacl/newlib/usr/include -isystem /Users/quarnster/Downloads/nacl_sdk/pepper_29/include -isystem /Users/quarnster/Downloads/nacl_sdk/pepper_29/toolchain/mac_x86_pnacl/host_x86_64/lib/clang/3.3/include -isystem /Users/quarnster/Downloads/nacl_sdk/pepper_29/toolchain/mac_x86_pnacl/newlib/sysroot/include /Users/quarnster/code/go/src/github.com/axw/llgo/pkg/syscall/types_pnacl.go
+
 package syscall
 
 const (