[netfilter-cvslog] r4210 - in trunk/nfsim: . netfilter

rusty at netfilter.org rusty at netfilter.org
Wed Aug 3 07:24:46 CEST 2005


Author: rusty at netfilter.org
Date: 2005-08-03 07:24:32 +0200 (Wed, 03 Aug 2005)
New Revision: 4210

Modified:
   trunk/nfsim/configure
   trunk/nfsim/netfilter/Makefile.kbuild
Log:
Fix gcov + modules support: requires recent gcc w/ GCC PR19985

Modified: trunk/nfsim/configure
===================================================================
--- trunk/nfsim/configure	2005-08-02 13:21:25 UTC (rev 4209)
+++ trunk/nfsim/configure	2005-08-03 05:24:32 UTC (rev 4210)
@@ -24,7 +24,7 @@
 for arg; do
     case "$arg" in
 	--kerneldir=*) KERNELDIR=$(echo "$arg" | cut -d= -f2-);;
-	--gcov) GCOVFLAGS='-fprofile-arcs -ftest-coverage'; MODULES=n;;
+	--gcov) GCOVFLAGS='-fprofile-arcs -ftest-coverage';;
 	--prefix=*) PREFIX=$(echo "$arg" | cut -d= -f2-);;
 	--bindir=*) BINDIR=$(echo "$arg" | cut -d= -f2-)/;;
 	--libdir=*) LIBDIR=$(echo "$arg" | cut -d= -f2-)/;;

Modified: trunk/nfsim/netfilter/Makefile.kbuild
===================================================================
--- trunk/nfsim/netfilter/Makefile.kbuild	2005-08-02 13:21:25 UTC (rev 4209)
+++ trunk/nfsim/netfilter/Makefile.kbuild	2005-08-03 05:24:32 UTC (rev 4210)
@@ -18,10 +18,10 @@
 	$(LD) $(LDFLAGS) -g -r -o $(@) $($(@:.o=-objs))
 
 %.so:%.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) $(GCOVFLAGS) -fPIC -shared -DMODULE -DKBUILD_MODNAME=$(@:.so=) $(OUTPUT_OPTION) $<
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) $(GCOVFLAGS) -fPIC -shared -DMODULE -DKBUILD_MODNAME=$(@:.so=) $(OUTPUT_OPTION) -lgcov $<
 
 %.so:
 	$(MAKE) CFLAGS="$(CFLAGS) -fPIC $(GCOVFLAGS) -DMODULE -DKBUILD_MODNAME=$(@:.so=)" $($(@:.so=-objs))
-	$(LD) $(LDFLAGS) -shared -o $(@) $($(@:.so=-objs))
+	$(CC) -shared -o $(@) $($(@:.so=-objs)) -lgcov
 
 




More information about the netfilter-cvslog mailing list