From owner-svn-soc-all@FreeBSD.ORG  Mon Jul 21 17:09:57 2014
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CCCCD961
 for <svn-soc-all@FreeBSD.org>; Mon, 21 Jul 2014 17:09:57 +0000 (UTC)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B954E2D79
 for <svn-soc-all@FreeBSD.org>; Mon, 21 Jul 2014 17:09:57 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6LH9vYn097981
 for <svn-soc-all@FreeBSD.org>; Mon, 21 Jul 2014 17:09:57 GMT
 (envelope-from dpl@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.8/8.14.8/Submit) id s6LH9vVQ097976
 for svn-soc-all@FreeBSD.org; Mon, 21 Jul 2014 17:09:57 GMT
 (envelope-from dpl@FreeBSD.org)
Date: Mon, 21 Jul 2014 17:09:57 GMT
Message-Id: <201407211709.s6LH9vVQ097976@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 dpl@FreeBSD.org using -f
From: dpl@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r271202 - in soc2014/dpl/netmap-ipfwjit: .
 sys/netpfil/ipfw
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Jul 2014 17:09:57 -0000

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 */