4 files changed, 37 insertions, 37 deletions
diff --git a/devel/libfirm/Makefile b/devel/libfirm/Makefile
index a43efa815ed..de038bbc825 100644
--- a/devel/libfirm/Makefile
+++ b/devel/libfirm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2012/10/31 11:17:13 asau Exp $
+# $NetBSD: Makefile,v 1.5 2014/11/06 20:46:01 asau Exp $
 #
 
-DISTNAME=	libfirm-1.17.0
+DISTNAME=	libfirm-1.21.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libfirm/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/libfirm/PLIST b/devel/libfirm/PLIST
index 3cdfa105d6d..6f3a4e4a3e8 100644
--- a/devel/libfirm/PLIST
+++ b/devel/libfirm/PLIST
@@ -1,53 +1,37 @@
-@comment $NetBSD: PLIST,v 1.4 2009/08/18 18:57:23 hasso Exp $
-include/libfirm/absgraph.h
-include/libfirm/adt/align.h
+@comment $NetBSD: PLIST,v 1.5 2014/11/06 20:46:01 asau Exp $
 include/libfirm/adt/array.h
 include/libfirm/adt/bipartite.h
-include/libfirm/adt/cpset.h
-include/libfirm/adt/eset.h
-include/libfirm/adt/fourcc.h
 include/libfirm/adt/gaussjordan.h
 include/libfirm/adt/gaussseidel.h
 include/libfirm/adt/hashptr.h
-include/libfirm/adt/hashset.h
 include/libfirm/adt/hungarian.h
-include/libfirm/adt/impl.h
-include/libfirm/adt/iterator.h
 include/libfirm/adt/list.h
 include/libfirm/adt/obst.h
 include/libfirm/adt/obstack.h
-include/libfirm/adt/offset.h
 include/libfirm/adt/pdeq.h
 include/libfirm/adt/plist.h
 include/libfirm/adt/pmap.h
 include/libfirm/adt/pqueue.h
 include/libfirm/adt/pset.h
-include/libfirm/adt/pset_new.h
-include/libfirm/adt/raw_bitset.h
 include/libfirm/adt/set.h
 include/libfirm/adt/unionfind.h
-include/libfirm/adt/util.h
 include/libfirm/adt/xmalloc.h
 include/libfirm/analyze_irg_args.h
 include/libfirm/be.h
+include/libfirm/begin.h
 include/libfirm/callgraph.h
 include/libfirm/cdep.h
 include/libfirm/cgana.h
 include/libfirm/dbginfo.h
-include/libfirm/dfs.h
+include/libfirm/end.h
 include/libfirm/execfreq.h
-include/libfirm/execution_frequency.h
-include/libfirm/field_temperature.h
 include/libfirm/firm.h
 include/libfirm/firm_common.h
 include/libfirm/firm_types.h
-include/libfirm/firm_ycomp.h
 include/libfirm/firmstat.h
-include/libfirm/height.h
+include/libfirm/heights.h
 include/libfirm/ident.h
-include/libfirm/interval_analysis.h
 include/libfirm/irarch.h
-include/libfirm/ircgcons.h
 include/libfirm/ircgopt.h
 include/libfirm/ircons.h
 include/libfirm/irconsconfirm.h
@@ -55,7 +39,6 @@ include/libfirm/irdom.h
 include/libfirm/irdump.h
 include/libfirm/iredgekinds.h
 include/libfirm/iredges.h
-include/libfirm/irextbb.h
 include/libfirm/irflag.h
 include/libfirm/irgmod.h
 include/libfirm/irgopt.h
@@ -63,31 +46,27 @@ include/libfirm/irgraph.h
 include/libfirm/irgwalk.h
 include/libfirm/irhooks.h
 include/libfirm/irio.h
-include/libfirm/irlivechk.h
 include/libfirm/irloop.h
 include/libfirm/irmemory.h
 include/libfirm/irmode.h
 include/libfirm/irnode.h
 include/libfirm/irop.h
 include/libfirm/iropt.h
-include/libfirm/iropt_dbg.h
 include/libfirm/iroptimize.h
 include/libfirm/irouts.h
+include/libfirm/irpass.h
 include/libfirm/irprintf.h
 include/libfirm/irprog.h
-include/libfirm/irsimpletype.h
 include/libfirm/irtypeinfo.h
-include/libfirm/irvrfy.h
+include/libfirm/irverify.h
 include/libfirm/lowering.h
-include/libfirm/old_fctnames.h
-include/libfirm/phiclass.h
-include/libfirm/pseudo_irg.h
-include/libfirm/rta.h
-include/libfirm/seqnumbers.h
-include/libfirm/structure.h
+include/libfirm/nodeops.h
+include/libfirm/opcodes.h
+include/libfirm/statev.h
 include/libfirm/timing.h
 include/libfirm/trouts.h
 include/libfirm/tv.h
 include/libfirm/typerep.h
+include/libfirm/vrp.h
 lib/libfirm.la
 lib/pkgconfig/libfirm.pc
diff --git a/devel/libfirm/distinfo b/devel/libfirm/distinfo
index 5e680827d22..160a29cc76b 100644
--- a/devel/libfirm/distinfo
+++ b/devel/libfirm/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2009/08/18 18:57:23 hasso Exp $
+$NetBSD: distinfo,v 1.4 2014/11/06 20:46:01 asau Exp $
 
-SHA1 (libfirm-1.17.0.tar.bz2) = c86046a1d83d1a5561c51849b3fe499f1ab9addd
-RMD160 (libfirm-1.17.0.tar.bz2) = a9413e2fd646ad5afd34c88465993661dcb7dd6f
-Size (libfirm-1.17.0.tar.bz2) = 1565574 bytes
+SHA1 (libfirm-1.21.0.tar.bz2) = 92a46fcc284e6eef5c02c253362b864fb601830a
+RMD160 (libfirm-1.21.0.tar.bz2) = 953b3c1e6d182c04df1e1cead88e59b40c6e8d21
+Size (libfirm-1.21.0.tar.bz2) = 1457097 bytes
+SHA1 (patch-ir_adt_bitfiddle.h) = 069a96e05bacb7779d0f3efb1226a0508a5d7a99
diff --git a/devel/libfirm/patches/patch-ir_adt_bitfiddle.h b/devel/libfirm/patches/patch-ir_adt_bitfiddle.h
new file mode 100644
index 00000000000..7560d313100
--- /dev/null
+++ b/devel/libfirm/patches/patch-ir_adt_bitfiddle.h
@@ -0,0 +1,20 @@
+$NetBSD: patch-ir_adt_bitfiddle.h,v 1.1 2014/11/06 20:46:01 asau Exp $
+
+--- ir/adt/bitfiddle.h.orig	2012-11-16 15:49:24.000000000 +0000
++++ ir/adt/bitfiddle.h
+@@ -72,6 +72,7 @@ static inline int add_saturated(int x, i
+  * @param x A 32-bit word.
+  * @return The number of bits set in x.
+  */
++#if !defined(__NetBSD__)
+ static inline unsigned popcount(unsigned x)
+ {
+ #if defined(__GNUC__) && __GNUC__ >= 4
+@@ -85,6 +86,7 @@ static inline unsigned popcount(unsigned
+ 	return x & 0x3f;
+ #endif
+ }
++#endif
+ 
+ /**
+  * Compute the number of leading zeros in a word.