remove support for m68k in patches that add it; patches where the m68k bits

are in context (but not the actual patch) were left out.
This commit is contained in:
jasper 2014-03-19 13:48:40 +00:00
parent 3ea3febc52
commit 603c9a7657
3 changed files with 9 additions and 15 deletions

View File

@ -1,12 +1,10 @@
$OpenBSD: patch-libev_ev_c,v 1.1 2013/09/30 05:43:39 dcoppa Exp $
--- libev/ev.c.orig Mon Sep 30 07:36:41 2013
+++ libev/ev.c Mon Sep 30 07:36:52 2013
@@ -637,6 +637,12 @@ struct signalfd_siginfo
$OpenBSD: patch-libev_ev_c,v 1.2 2014/03/19 13:48:40 jasper Exp $
--- libev/ev.c.orig Fri Mar 1 12:10:48 2013
+++ libev/ev.c Wed Mar 19 14:45:12 2014
@@ -637,6 +637,10 @@ struct signalfd_siginfo
#define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
#elif defined __ia64__
#define ECB_MEMORY_FENCE __asm__ __volatile__ ("mf" : : : "memory")
+ #elif defined __m68k__
+ #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
+ #elif defined __m88k__
+ #define ECB_MEMORY_FENCE __asm__ __volatile__ ("tb1 0,%%r0,128" : : : "memory")
+ #elif defined __sh__
@ -14,11 +12,10 @@ $OpenBSD: patch-libev_ev_c,v 1.1 2013/09/30 05:43:39 dcoppa Exp $
#endif
#endif
#endif
@@ -1053,6 +1059,9 @@ ecb_inline ecb_bool ecb_little_endian (void) { return
@@ -1053,6 +1057,8 @@ ecb_inline ecb_bool ecb_little_endian (void) { return
|| defined __alpha__ \
|| defined __hppa__ \
|| defined __ia64__ \
+ || defined __m68k__ \
+ || defined __m88k__ \
+ || defined __sh__ \
|| defined _M_IX86 || defined _M_AMD64 || defined _M_IA64

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.10 2013/03/11 11:35:58 espie Exp $
# $OpenBSD: Makefile,v 1.11 2014/03/19 13:48:40 jasper Exp $
COMMENT = No News is Good News (Fast CLI Point & Read Newsreader)
DISTNAME = nn-6.7.3
@ -27,8 +27,6 @@ MAKE_ENV = CC="${CC}"
MFILE = m-alpha.h
.elif "${MACHINE_ARCH}" == "hppa"
MFILE = m-hp9000.h
.elif "${MACHINE_ARCH}" == "m68k"
MFILE = m-m680x0.h
.elif "${MACHINE_ARCH}" == "m88k"
MFILE = m-m88000.h
.elif "${MACHINE_ARCH}" == "powerpc"

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-host_defs,v 1.6 2012/06/21 14:22:51 jasper Exp $
$OpenBSD: patch-host_defs,v 1.7 2014/03/19 13:48:40 jasper Exp $
http://bugs.gw.com/view.php?id=181 (committed)
--- host.defs.orig Wed Jan 11 21:20:15 2012
+++ host.defs Sat May 26 12:52:56 2012
@@ -564,6 +564,38 @@ machtype: defined(vax) : "vax"
+++ host.defs Wed Mar 19 14:42:56 2014
@@ -564,6 +564,37 @@ machtype: defined(vax) : "vax"
machtype: defined(x86_64) : "x86_64"
enddef :
@ -15,7 +15,6 @@ http://bugs.gw.com/view.php?id=181 (committed)
+vendor : defined(__arm__) : "arm"
+vendor : defined(__hppa__) || defined(__hppa64__) : "hp"
+vendor : defined(M_intel) : "intel"
+vendor : defined(__m68k__) : "motorola"
+vendor : defined(__m88k__) : "motorola"
+vendor : defined(__mips__) && defined(__sgi__) : "sgi"
+vendor : defined(__powerpc__) : "motorola"