socsvn commit: r271202 - in soc2014/dpl/netmap-ipfwjit: . sys/netpfil/ipfw

[dpl at FreeBSD.org]

Author: dpl
Date: Mon Jul 21 17:09:56 2014
New Revision: 271202
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=271202

Log:
  Fixed Makefile.
  

Modified:
  soc2014/dpl/netmap-ipfwjit/Makefile.kipfw
  soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw/jit.cc

Modified: soc2014/dpl/netmap-ipfwjit/Makefile.kipfw
==============================================================================
--- soc2014/dpl/netmap-ipfwjit/Makefile.kipfw	Mon Jul 21 16:38:05 2014	(r271201)
+++ soc2014/dpl/netmap-ipfwjit/Makefile.kipfw	Mon Jul 21 17:09:56 2014	(r271202)
@@ -93,7 +93,7 @@
 E_CFLAGS += -Dradix
 MOD := kipfw
 
-LIBS= -lpthread `llvm-config-devel --ldflags --libs jit support`
+LIBS= -lpthread `llvm-config-devel --ldflags --system-libs --libs all`
 CFLAGS = $(E_CFLAGS)
 
 IPFW_OBJS= $(IPFW_SRCS:%.c=%.o)
@@ -152,7 +152,7 @@
 
 #Generate the actual bytecode to be used
 ../ip_fw_rules.bc:
-	$(CC) $(CFLAGS) $(BCFLAGS) -o ../ip_fw_rules.bc ../sys/netpfil/ipfw/ip_fw_rules.h
+	@$(CC) $(CFLAGS) $(BCFLAGS) -o ../ip_fw_rules.bc ../sys/netpfil/ipfw/ip_fw_rules.h
 
 radix.o:#	CFLAGS += -U_KERNEL
 
@@ -161,7 +161,7 @@
 
 $(MOD): $(IPFW_OBJS) jit.o 
 	$(MSG) "   LD $@"
-	$(HIDE)$(CC) -o $@ $^ $(LIBS)
+	$(HIDE)clang++ -o $@ $^ $(LIBS)
 
 jit.o: jit.cc ../ip_fw_rules.bc
 	@clang++ $(CXXFLAGS) ../sys/netpfil/ipfw/jit.cc -o ./jit.o

Modified: soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw/jit.cc
==============================================================================
--- soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw/jit.cc	Mon Jul 21 16:38:05 2014	(r271201)
+++ soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw/jit.cc	Mon Jul 21 17:09:56 2014	(r271202)
@@ -15,7 +15,7 @@
 LLVMContext &c = con;
 OwningPtr<MemoryBuffer> buffer;
 
-static void
+extern "C" void
 ipfw_jit_init()
 {
 	/* We load the bc for JIT compilation */