diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-03-09 09:26:05 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-03-09 09:26:05 +0000 |
| commit | a3b6a257aaf8dc97997ab7a6963e4f98323f8f04 (patch) | |
| tree | 5aff4b8c013e437ef3b2a38568d0c8a65d1b8cfa /libgo/Makefile.am | |
| parent | 8711ce070c7fd7aaa19a6514032bd91ac9b9d6e3 (diff) | |
| download | gcc-a3b6a257aaf8dc97997ab7a6963e4f98323f8f04.tar.gz | |
2011-03-09 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 170812 using svnmerge
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@170814 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo/Makefile.am')
| -rw-r--r-- | libgo/Makefile.am | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/libgo/Makefile.am b/libgo/Makefile.am index 814d7ed6132..40786877982 100644 --- a/libgo/Makefile.am +++ b/libgo/Makefile.am @@ -1201,6 +1201,18 @@ else syscall_socket_epoll_file = endif +# Support for uname. +if LIBGO_IS_SOLARIS +if LIBGO_IS_386 +# 32-bit Solaris 2/x86 needs _nuname, handled in syscall_solaris_386.go. +syscall_uname_file = +else # !LIBGO_IS_386 && LIBGO_IS_SOLARIS +syscall_uname_file = syscalls/syscall_uname.go +endif +else # !LIBGO_IS_SOLARIS +syscall_uname_file = syscalls/syscall_uname.go +endif + syscall_arch.go: s-syscall_arch; @true s-syscall_arch: Makefile rm -f syscall_arch.go.tmp @@ -1222,6 +1234,7 @@ go_syscall_files = \ $(syscall_socket_os_file) \ $(syscall_socket_epoll_file) \ $(syscall_syscall_file) \ + $(syscall_uname_file) \ syscalls/syscall_unix.go \ syscalls/stringbyte.go \ syscalls/syscall_$(GOOS).go \ @@ -2939,13 +2952,13 @@ TEST_PACKAGES = \ fmt/check \ gob/check \ html/check \ - http/check \ + $(if $(GCCGO_RUN_ALL_TESTS),http/check) \ io/check \ json/check \ log/check \ math/check \ mime/check \ - net/check \ + $(if $(GCCGO_RUN_ALL_TESTS),net/check) \ netchan/check \ os/check \ patch/check \ @@ -2961,7 +2974,7 @@ TEST_PACKAGES = \ strconv/check \ strings/check \ sync/check \ - syslog/check \ + $(if $(GCCGO_RUN_ALL_TESTS),syslog/check) \ tabwriter/check \ template/check \ time/check \ |