commit 1f7229232cc9f00a4c1f840ae2ea0f4cd20fcabd
parent f4345db91461707012297438a20f38172a3df319
Author: rminnich@gmail.com <none@none>
Date: Mon, 24 Jan 2011 09:01:22 -0800
merge and force all to 32 bit
Diffstat:
1 file changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/9vx/Makefrag b/src/9vx/Makefrag
@@ -100,10 +100,16 @@ ifeq ($(OS),darwin)
PLAN9_OBJS := $(PLAN9_OBJS) 9vx/osx/signal.o 9vx/osx/cmpswap.o
endif
+# While we could do an || here on the os, leave this: linux
+# or freebsd may later differ in what they do.
ifeq ($(OS),linux)
PLAN9_OBJS := $(PLAN9_OBJS) 9vx/gccmagic/cmpswap.o
endif
+ifeq ($(OS),freebsd)
+PLAN9_OBJS := $(PLAN9_OBJS) 9vx/gccmagic/cmpswap.o
+endif
+
PLAN9_A_OBJS = \
$(addprefix 9vx/a/, \
allocb.o \