Import of pkgsrc-2014Q1
This commit is contained in:
@@ -1,10 +1,8 @@
|
||||
# $NetBSD: Makefile,v 1.2 2013/06/19 14:03:41 gdt Exp $
|
||||
#
|
||||
# $NetBSD: Makefile,v 1.6 2014/02/22 01:22:49 prlw1 Exp $
|
||||
|
||||
VERSION= 4.2.2
|
||||
VERSION= 4.2.4
|
||||
DISTNAME= xen-${VERSION}
|
||||
PKGNAME= xenkernel42-${VERSION}
|
||||
PKREVISION= 1
|
||||
CATEGORIES= sysutils
|
||||
MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/
|
||||
|
||||
@@ -21,6 +19,7 @@ NO_CONFIGURE= yes
|
||||
USE_TOOLS+= gmake
|
||||
|
||||
PYTHON_FOR_BUILD_ONLY= YES
|
||||
PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 4.2.3
|
||||
|
||||
MAKE_ENV+= OCAML_TOOLS=no
|
||||
|
||||
@@ -32,7 +31,8 @@ MESSAGE_SUBST+= XENKERNELDIR=${XENKERNELDIR}
|
||||
.include "../../mk/compiler.mk"
|
||||
.if !empty(PKGSRC_COMPILER:Mclang)
|
||||
EXTRA_CFLAGS+= -Qunused-arguments -no-integrated-as -Wno-error=format \
|
||||
-Wno-error=parentheses-equality -Wno-error=enum-conversion
|
||||
-Wno-error=parentheses-equality -Wno-error=enum-conversion \
|
||||
-Wno-error=unused-function -Wno-error=unused-const-variable
|
||||
.endif
|
||||
|
||||
MAKE_ENV+= EXTRA_CFLAGS=${EXTRA_CFLAGS:Q}
|
||||
|
||||
@@ -1,10 +1,9 @@
|
||||
$NetBSD: distinfo,v 1.2 2013/06/13 21:49:59 joerg Exp $
|
||||
$NetBSD: distinfo,v 1.5 2014/02/22 01:22:49 prlw1 Exp $
|
||||
|
||||
SHA1 (xen-4.2.2.tar.gz) = b48cc7f375e9a5d65ff2d680f1b512dbea5a3b7c
|
||||
RMD160 (xen-4.2.2.tar.gz) = 925cb2abdd080254a5457d1b304f811036261ab6
|
||||
Size (xen-4.2.2.tar.gz) = 15602746 bytes
|
||||
SHA1 (xen-4.2.4.tar.gz) = ab661bf0f64a18155f971343a9c07b7e7d1410f1
|
||||
RMD160 (xen-4.2.4.tar.gz) = b2210d3ff6a9fdf9cae1a5a38b829667dfd6fd2f
|
||||
Size (xen-4.2.4.tar.gz) = 15663999 bytes
|
||||
SHA1 (patch-Config.mk) = a43ed1b3304d6383dc093acd128a7f373d0ca266
|
||||
SHA1 (patch-xen_Makefile) = e0d1b74518b9675ddc64295d1523ded9a8757c0a
|
||||
SHA1 (patch-xen_arch_x86_Rules.mk) = 6b9b4bfa28924f7d3f6c793a389f1a7ac9d228e2
|
||||
SHA1 (patch-xen_arch_x86_time.c) = e5ce7e83d1dcbcc1cdffd6921f25fce4d7389ac8
|
||||
SHA1 (patch-xen_include_xen_lib.h) = 36dcaf3874a1b1214babc45d7e19fe3b556c1044
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
$NetBSD: patch-xen_arch_x86_time.c,v 1.1 2013/06/13 21:49:59 joerg Exp $
|
||||
|
||||
--- xen/arch/x86/time.c.orig 2013-04-23 16:42:55.000000000 +0000
|
||||
+++ xen/arch/x86/time.c
|
||||
@@ -107,7 +107,7 @@ static inline u32 mul_frac(u32 multiplic
|
||||
{
|
||||
u32 product_int, product_frac;
|
||||
asm (
|
||||
- "mul %3"
|
||||
+ "mull %3"
|
||||
: "=a" (product_frac), "=d" (product_int)
|
||||
: "0" (multiplicand), "r" (multiplier) );
|
||||
return product_int;
|
||||
@@ -131,10 +131,10 @@ static inline u64 scale_delta(u64 delta,
|
||||
|
||||
#ifdef CONFIG_X86_32
|
||||
asm (
|
||||
- "mul %5 ; "
|
||||
+ "mull %5 ; "
|
||||
"mov %4,%%eax ; "
|
||||
"mov %%edx,%4 ; "
|
||||
- "mul %5 ; "
|
||||
+ "mull %5 ; "
|
||||
"xor %5,%5 ; "
|
||||
"add %4,%%eax ; "
|
||||
"adc %5,%%edx ; "
|
||||
@@ -142,7 +142,7 @@ static inline u64 scale_delta(u64 delta,
|
||||
: "a" ((u32)delta), "1" ((u32)(delta >> 32)), "2" (scale->mul_frac) );
|
||||
#else
|
||||
asm (
|
||||
- "mul %2 ; shrd $32,%1,%0"
|
||||
+ "mulq %2 ; shrd $32,%1,%0"
|
||||
: "=a" (product), "=d" (delta)
|
||||
: "rm" (delta), "0" ((u64)scale->mul_frac) );
|
||||
#endif
|
||||
Reference in New Issue
Block a user