update liboil to 0.3.16, from benoit@. Tested by myself and kili@.

This commit is contained in:
sthen 2009-07-18 08:25:06 +00:00
parent 5804a50c53
commit df986b2c92
5 changed files with 10 additions and 157 deletions

View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.13 2008/08/22 11:53:32 brad Exp $
# $OpenBSD: Makefile,v 1.14 2009/07/18 08:25:06 sthen Exp $
COMMENT= library of optimized inner loops
DISTNAME= liboil-0.3.14
PKGNAME= ${DISTNAME}p0
SHARED_LIBS += oil-0.3 3.0 # .2.0
DISTNAME= liboil-0.3.16
SHARED_LIBS+= oil-0.3 4.0 # .3.0
CATEGORIES= devel
MASTER_SITES= ${HOMEPAGE}/download/

View File

@ -1,5 +1,5 @@
MD5 (liboil-0.3.14.tar.gz) = ep9xnlBla3lcBsAWcBKoTw==
RMD160 (liboil-0.3.14.tar.gz) = kc56h8kOAJL9lMTQdeP+CfaQOiE=
SHA1 (liboil-0.3.14.tar.gz) = XeTu3w9Gc7bETkYtTRyus08hJrY=
SHA256 (liboil-0.3.14.tar.gz) = pAwJ227iTgOqgfWDKaV+ReVUYqLg9hmzeW1L+ULCPy8=
SIZE (liboil-0.3.14.tar.gz) = 819559
MD5 (liboil-0.3.16.tar.gz) = /rsdn5vExED89iLckPi2tw==
RMD160 (liboil-0.3.16.tar.gz) = Wt0AFR4k7ozFqN+0AiOTaldsv/0=
SHA1 (liboil-0.3.16.tar.gz) = DWUwzLItgFxSCaGFqUtXURHsNPM=
SHA256 (liboil-0.3.16.tar.gz) = AJEVsPyIjf4okD/s/oBnB8VEzK1lVOur3rOh2I7B6dE=
SIZE (liboil-0.3.16.tar.gz) = 855765

View File

@ -1,66 +0,0 @@
$OpenBSD: patch-configure,v 1.3 2008/03/20 18:21:39 jasper Exp $
--- configure.orig Wed Mar 19 16:25:47 2008
+++ configure Wed Mar 19 16:30:06 2008
@@ -16264,7 +16264,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- flag_ok=yes
+ flag_ok=no
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16324,7 +16324,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- flag_ok=yes
+ flag_ok=no
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16384,7 +16384,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- flag_ok=yes
+ flag_ok=no
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16444,7 +16444,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- flag_ok=yes
+ flag_ok=no
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16504,7 +16504,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- flag_ok=yes
+ flag_ok=no
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16564,7 +16564,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- flag_ok=yes
+ flag_ok=no
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16625,6 +16625,8 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
flag_ok=yes
+ save_CFLAGS="$save_CFLAGS -maltivec"
+ CCASFLAGS="$CCASSFLAGS -maltivec"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5

View File

@ -1,80 +0,0 @@
$OpenBSD: patch-liboil_liboilcpu-powerpc_c,v 1.1 2008/08/22 11:53:32 brad Exp $
--- liboil/liboilcpu-powerpc.c.orig Thu Mar 13 03:22:52 2008
+++ liboil/liboilcpu-powerpc.c Tue Aug 12 21:04:23 2008
@@ -54,6 +54,11 @@
#include <sys/sysctl.h>
#endif
+#if defined(__OpenBSD__)
+#include <sys/param.h>
+#include <sys/sysctl.h>
+#include <machine/cpu.h>
+#endif
/***** powerpc *****/
@@ -65,11 +70,13 @@ oil_profile_stamp_tb(void)
return ts;
}
+#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(__OpenBSD__) && !defined(__APPLE__) && !defined(__linux__)
static void
test_altivec (void * ignored)
{
asm volatile ("vor v0, v0, v0\n");
}
+#endif
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
static void
@@ -86,6 +93,24 @@ oil_check_altivec_sysctl_freebsd (void)
}
#endif
+#if defined(__OpenBSD__)
+static void
+oil_check_altivec_sysctl_openbsd (void)
+{
+ int mib[2], av, ret;
+ size_t len;
+
+ mib[0] = CTL_MACHDEP;
+ mib[1] = CPU_ALTIVEC;
+
+ len = sizeof(av);
+ ret = sysctl(mib, 2, &av, &len, NULL, 0);
+ if (!ret && av) {
+ oil_cpu_flags |= OIL_IMPL_FLAG_ALTIVEC;
+ }
+}
+#endif
+
#if defined(__APPLE__)
static void
oil_check_altivec_sysctl_darwin (void)
@@ -151,7 +176,8 @@ out:
}
#endif
-void
+#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(__OpenBSD__) && !defined(__APPLE__) && !defined(__linux__)
+static void
oil_check_altivec_fault (void)
{
oil_fault_check_enable ();
@@ -161,12 +187,15 @@ oil_check_altivec_fault (void)
}
oil_fault_check_disable ();
}
+#endif
void
oil_cpu_detect_arch(void)
{
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
oil_check_altivec_sysctl_freebsd();
+#elif defined(__OpenBSD__)
+ oil_check_altivec_sysctl_openbsd();
#elif defined(__APPLE__)
oil_check_altivec_sysctl_darwin();
#elif defined(__linux__)

View File

@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST,v 1.4 2008/03/20 18:21:39 jasper Exp $
@comment $OpenBSD: PLIST,v 1.5 2009/07/18 08:25:06 sthen Exp $
%%SHARED%%
bin/oil-bugreport
@bin bin/oil-bugreport
include/liboil-0.3/
include/liboil-0.3/liboil/
include/liboil-0.3/liboil/liboil-stdint.h