Mon Nov 10 18:09:11 2014 UTC ()
Use __builtin_unreachable on Clang instead of the broken C11 hack.


(joerg)
diff -r1.6 -r1.7 pkgsrc/devel/libev/distinfo
diff -r0 -r1.1 pkgsrc/devel/libev/patches/patch-ev.c
diff -r1.7 -r1.8 pkgsrc/devel/p5-Coro/distinfo
diff -r0 -r1.1 pkgsrc/devel/p5-Coro/patches/patch-Coro_ecb.h
diff -r1.9 -r1.10 pkgsrc/devel/p5-EV/distinfo
diff -r0 -r1.1 pkgsrc/devel/p5-EV/patches/patch-libev_ev.c
diff -r1.4 -r1.5 pkgsrc/devel/p5-IO-AIO/distinfo
diff -r0 -r1.1 pkgsrc/devel/p5-IO-AIO/patches/patch-libeio_ecb.h
diff -r1.24 -r1.25 pkgsrc/mail/milter-manager/distinfo
diff -r0 -r1.1 pkgsrc/mail/milter-manager/patches/patch-libev-4.15_ev.c
diff -r1.1 -r1.2 pkgsrc/net/py-gevent/distinfo
diff -r0 -r1.1 pkgsrc/net/py-gevent/patches/patch-libev_ev.c
cvs diff -r1.6 -r1.7 pkgsrc/devel/libev/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/libev/distinfo 2013/08/28 12:34:59 1.6
+++ pkgsrc/devel/libev/distinfo 2014/11/10 18:09:10 1.7
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.6 2013/08/28 12:34:59 fhajny Exp $ 1$NetBSD: distinfo,v 1.7 2014/11/10 18:09:10 joerg Exp $
2 2
3SHA1 (libev-4.15.tar.gz) = 88655b1e2c0b328c9f90a6df7e72361a97fa8dc3 3SHA1 (libev-4.15.tar.gz) = 88655b1e2c0b328c9f90a6df7e72361a97fa8dc3
4RMD160 (libev-4.15.tar.gz) = 100812a3d24b9968a670c9cd4f16c9de172a0994 4RMD160 (libev-4.15.tar.gz) = 100812a3d24b9968a670c9cd4f16c9de172a0994
5Size (libev-4.15.tar.gz) = 513919 bytes 5Size (libev-4.15.tar.gz) = 513919 bytes
 6SHA1 (patch-ev.c) = abfc6630d0989e6d0d6d6474b19adff0e465ffb5
File Added: pkgsrc/devel/libev/patches/Attic/patch-ev.c
$NetBSD: patch-ev.c,v 1.1 2014/11/10 18:09:10 joerg Exp $

--- ev.c.orig	2014-11-09 20:47:55.000000000 +0000
+++ ev.c
@@ -963,7 +963,7 @@ ecb_inline uint64_t ecb_rotr64 (uint64_t
   }
 #endif
 
-#if ECB_GCC_VERSION(4,5)
+#if ECB_GCC_VERSION(4,5) || defined(__clang__)
   #define ecb_unreachable() __builtin_unreachable ()
 #else
   /* this seems to work fine, but gcc always emits a warning for it :/ */
cvs diff -r1.7 -r1.8 pkgsrc/devel/p5-Coro/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/p5-Coro/distinfo 2014/06/25 22:30:54 1.7
+++ pkgsrc/devel/p5-Coro/distinfo 2014/11/10 18:09:10 1.8
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.7 2014/06/25 22:30:54 schmonz Exp $ 1$NetBSD: distinfo,v 1.8 2014/11/10 18:09:10 joerg Exp $
2 2
3SHA1 (Coro-6.39.tar.gz) = 1f0b8dc9d0e58d43271d303fa8c78695f7ab66e1 3SHA1 (Coro-6.39.tar.gz) = 1f0b8dc9d0e58d43271d303fa8c78695f7ab66e1
4RMD160 (Coro-6.39.tar.gz) = 2e0fbfc224f7dcd43545ff298c8003de291dda1f 4RMD160 (Coro-6.39.tar.gz) = 2e0fbfc224f7dcd43545ff298c8003de291dda1f
5Size (Coro-6.39.tar.gz) = 188865 bytes 5Size (Coro-6.39.tar.gz) = 188865 bytes
 6SHA1 (patch-Coro_ecb.h) = 5e4917bdfc35a87e11f67b66dd8861c0b104753f
6SHA1 (patch-aa) = 4116ed31979879c16ebee194eb32a4c4c2c4438d 7SHA1 (patch-aa) = 4116ed31979879c16ebee194eb32a4c4c2c4438d
File Added: pkgsrc/devel/p5-Coro/patches/Attic/patch-Coro_ecb.h
$NetBSD: patch-Coro_ecb.h,v 1.1 2014/11/10 18:09:10 joerg Exp $

--- Coro/ecb.h.orig	2014-11-10 12:35:13.000000000 +0000
+++ Coro/ecb.h
@@ -523,7 +523,7 @@ ecb_inline uint64_t ecb_rotr64 (uint64_t
   }
 #endif
 
-#if ECB_GCC_VERSION(4,5)
+#if ECB_GCC_VERSION(4,5) || defined(__clang__)
   #define ecb_unreachable() __builtin_unreachable ()
 #else
   /* this seems to work fine, but gcc always emits a warning for it :/ */
cvs diff -r1.9 -r1.10 pkgsrc/devel/p5-EV/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/p5-EV/distinfo 2013/09/02 12:23:43 1.9
+++ pkgsrc/devel/p5-EV/distinfo 2014/11/10 18:09:10 1.10
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.9 2013/09/02 12:23:43 obache Exp $ 1$NetBSD: distinfo,v 1.10 2014/11/10 18:09:10 joerg Exp $
2 2
3SHA1 (EV-4.15.tar.gz) = 87783633d9d93a44ec752ed90490c653a21b4a06 3SHA1 (EV-4.15.tar.gz) = 87783633d9d93a44ec752ed90490c653a21b4a06
4RMD160 (EV-4.15.tar.gz) = 25a7ea50986bed0e31b29fa0e757ecbf29af5733 4RMD160 (EV-4.15.tar.gz) = 25a7ea50986bed0e31b29fa0e757ecbf29af5733
5Size (EV-4.15.tar.gz) = 189514 bytes 5Size (EV-4.15.tar.gz) = 189514 bytes
 6SHA1 (patch-libev_ev.c) = 726cf6454516f23a1a38ce3e3f1296c87ed03329
6SHA1 (patch-libev_ev.h) = 349c203b23013e9e836810aadcd5e4df8add032b 7SHA1 (patch-libev_ev.h) = 349c203b23013e9e836810aadcd5e4df8add032b
File Added: pkgsrc/devel/p5-EV/patches/Attic/patch-libev_ev.c
$NetBSD: patch-libev_ev.c,v 1.1 2014/11/10 18:09:10 joerg Exp $

--- libev/ev.c.orig	2014-11-09 20:59:37.000000000 +0000
+++ libev/ev.c
@@ -963,7 +963,7 @@ ecb_inline uint64_t ecb_rotr64 (uint64_t
   }
 #endif
 
-#if ECB_GCC_VERSION(4,5)
+#if ECB_GCC_VERSION(4,5) || defined(__clang__)
   #define ecb_unreachable() __builtin_unreachable ()
 #else
   /* this seems to work fine, but gcc always emits a warning for it :/ */
cvs diff -r1.4 -r1.5 pkgsrc/devel/p5-IO-AIO/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/p5-IO-AIO/distinfo 2013/09/02 13:03:17 1.4
+++ pkgsrc/devel/p5-IO-AIO/distinfo 2014/11/10 18:09:10 1.5
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.4 2013/09/02 13:03:17 obache Exp $ 1$NetBSD: distinfo,v 1.5 2014/11/10 18:09:10 joerg Exp $
2 2
3SHA1 (IO-AIO-4.18.tar.gz) = 158c76d718a4474607532fdd943ce199ee65213c 3SHA1 (IO-AIO-4.18.tar.gz) = 158c76d718a4474607532fdd943ce199ee65213c
4RMD160 (IO-AIO-4.18.tar.gz) = 6017fd9ec5b2a292a1f8bb743a7c0193e0523201 4RMD160 (IO-AIO-4.18.tar.gz) = 6017fd9ec5b2a292a1f8bb743a7c0193e0523201
5Size (IO-AIO-4.18.tar.gz) = 146624 bytes 5Size (IO-AIO-4.18.tar.gz) = 146624 bytes
 6SHA1 (patch-libeio_ecb.h) = 928d08c52fdce6dfbf346fbaa78b53411a92289c
File Added: pkgsrc/devel/p5-IO-AIO/patches/Attic/patch-libeio_ecb.h
$NetBSD: patch-libeio_ecb.h,v 1.1 2014/11/10 18:09:10 joerg Exp $

--- libeio/ecb.h.orig	2014-11-09 21:03:05.000000000 +0000
+++ libeio/ecb.h
@@ -468,7 +468,7 @@ ecb_inline uint64_t ecb_rotr64 (uint64_t
   }
 #endif
 
-#if ECB_GCC_VERSION(4,5)
+#if ECB_GCC_VERSION(4,5) || defined(__clang__)
   #define ecb_unreachable() __builtin_unreachable ()
 #else
   /* this seems to work fine, but gcc always emits a warning for it :/ */
cvs diff -r1.24 -r1.25 pkgsrc/mail/milter-manager/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/milter-manager/distinfo 2014/06/28 06:42:12 1.24
+++ pkgsrc/mail/milter-manager/distinfo 2014/11/10 18:09:10 1.25
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.24 2014/06/28 06:42:12 obache Exp $ 1$NetBSD: distinfo,v 1.25 2014/11/10 18:09:10 joerg Exp $
2 2
3SHA1 (milter-manager-2.0.4.tar.gz) = 531613b8640e98f64fd086c98be6b3c5f521fd8c 3SHA1 (milter-manager-2.0.4.tar.gz) = 531613b8640e98f64fd086c98be6b3c5f521fd8c
4RMD160 (milter-manager-2.0.4.tar.gz) = 0dea0146b00db3f06126d0cf70c6c6c5624a0556 4RMD160 (milter-manager-2.0.4.tar.gz) = 0dea0146b00db3f06126d0cf70c6c6c5624a0556
5Size (milter-manager-2.0.4.tar.gz) = 6628656 bytes 5Size (milter-manager-2.0.4.tar.gz) = 6628656 bytes
6SHA1 (patch-configure) = ee1f31e83354c4c6b38ae1c0d4fda40f28ad92b6 6SHA1 (patch-configure) = ee1f31e83354c4c6b38ae1c0d4fda40f28ad92b6
 7SHA1 (patch-libev-4.15_ev.c) = 8393cc727fda6a812931e42507e5db2fdf370c33
File Added: pkgsrc/mail/milter-manager/patches/Attic/patch-libev-4.15_ev.c
$NetBSD: patch-libev-4.15_ev.c,v 1.1 2014/11/10 18:09:11 joerg Exp $

--- libev-4.15/ev.c.orig	2014-11-10 11:47:48.000000000 +0000
+++ libev-4.15/ev.c
@@ -963,7 +963,7 @@ ecb_inline uint64_t ecb_rotr64 (uint64_t
   }
 #endif
 
-#if ECB_GCC_VERSION(4,5)
+#if ECB_GCC_VERSION(4,5) || defined(__clang__)
   #define ecb_unreachable() __builtin_unreachable ()
 #else
   /* this seems to work fine, but gcc always emits a warning for it :/ */
cvs diff -r1.1 -r1.2 pkgsrc/net/py-gevent/distinfo (expand / switch to unified diff)

--- pkgsrc/net/py-gevent/distinfo 2014/06/08 22:36:22 1.1
+++ pkgsrc/net/py-gevent/distinfo 2014/11/10 18:09:11 1.2
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.1 2014/06/08 22:36:22 rodent Exp $ 1$NetBSD: distinfo,v 1.2 2014/11/10 18:09:11 joerg Exp $
2 2
3SHA1 (gevent-1.0.1.tar.gz) = 2cc1b6e1fa29b30ea881fa6a195e57faaf089ae8 3SHA1 (gevent-1.0.1.tar.gz) = 2cc1b6e1fa29b30ea881fa6a195e57faaf089ae8
4RMD160 (gevent-1.0.1.tar.gz) = 430fb627b4f7350969e2e0bfc45eedaf18aa6325 4RMD160 (gevent-1.0.1.tar.gz) = 430fb627b4f7350969e2e0bfc45eedaf18aa6325
5Size (gevent-1.0.1.tar.gz) = 1455636 bytes 5Size (gevent-1.0.1.tar.gz) = 1455636 bytes
 6SHA1 (patch-libev_ev.c) = c62c0babc31c89ec8e2fd945ec0042e65c8e016e
File Added: pkgsrc/net/py-gevent/patches/Attic/patch-libev_ev.c
$NetBSD: patch-libev_ev.c,v 1.1 2014/11/10 18:09:11 joerg Exp $

--- libev/ev.c.orig	2014-11-10 12:40:39.000000000 +0000
+++ libev/ev.c
@@ -963,7 +963,7 @@ ecb_inline uint64_t ecb_rotr64 (uint64_t
   }
 #endif
 
-#if ECB_GCC_VERSION(4,5)
+#if ECB_GCC_VERSION(4,5) || defined(__clang__)
   #define ecb_unreachable() __builtin_unreachable ()
 #else
   /* this seems to work fine, but gcc always emits a warning for it :/ */