From cc0a005c9d68c314fbf7eab92f0c04623df8a770 Mon Sep 17 00:00:00 2001 From: Dmitriy Vyukov Date: Fri, 9 Aug 2013 22:17:12 +0400 Subject: [PATCH] runtime: fix netbsd build I've placed net.runtime_Semacquire into netpoll.goc, but netbsd does not yet use netpoll.goc. R=golang-dev, bradfitz, iant CC=golang-dev https://golang.org/cl/12699045 --- src/pkg/runtime/netpoll.goc | 8 -------- src/pkg/runtime/sema.goc | 11 +++++++++++ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/pkg/runtime/netpoll.goc b/src/pkg/runtime/netpoll.goc index ec6a4113fb..ebe6defa00 100644 --- a/src/pkg/runtime/netpoll.goc +++ b/src/pkg/runtime/netpoll.goc @@ -206,14 +206,6 @@ func runtime_pollUnblock(pd *PollDesc) { runtime·ready(wg); } -func runtime_Semacquire(addr *uint32) { - runtime·semacquire(addr, true); -} - -func runtime_Semrelease(addr *uint32) { - runtime·semrelease(addr); -} - uintptr runtime·netpollfd(PollDesc *pd) { diff --git a/src/pkg/runtime/sema.goc b/src/pkg/runtime/sema.goc index 05222e2df7..08b4779864 100644 --- a/src/pkg/runtime/sema.goc +++ b/src/pkg/runtime/sema.goc @@ -182,6 +182,17 @@ runtime·semrelease(uint32 volatile *addr) } } +// TODO(dvyukov): move to netpoll.goc once it's used by all OSes. +void net·runtime_Semacquire(uint32 *addr) +{ + runtime·semacquire(addr, true); +} + +void net·runtime_Semrelease(uint32 *addr) +{ + runtime·semrelease(addr); +} + func runtime_Semacquire(addr *uint32) { runtime·semacquire(addr, true); } -- 2.48.1