diff options
| author | joerg <joerg> | 2015-02-04 20:52:16 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2015-02-04 20:52:16 +0000 |
| commit | 554f72a7382508fb6bb5c28f579db33151c1a1c5 (patch) | |
| tree | f5c30c77953677e908b14c45cf220b127cc743f0 /sysutils | |
| parent | dfd903524b356c4f2835b8353dabd07a0119ce3b (diff) | |
| download | pkgsrc-554f72a7382508fb6bb5c28f579db33151c1a1c5.tar.gz | |
Fix build with clang.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/xenkernel45/Makefile | 5 | ||||
| -rw-r--r-- | sysutils/xenkernel45/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/xenkernel45/patches/patch-xen_include_asm-x86_current.h | 13 |
3 files changed, 18 insertions, 3 deletions
diff --git a/sysutils/xenkernel45/Makefile b/sysutils/xenkernel45/Makefile index 1aed156efea..bebce9a8d0e 100644 --- a/sysutils/xenkernel45/Makefile +++ b/sysutils/xenkernel45/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2015/01/27 14:52:56 prlw1 Exp $ +# $NetBSD: Makefile,v 1.3 2015/02/04 20:52:16 joerg Exp $ VERSION= 4.5.0 DISTNAME= xen-${VERSION} @@ -33,7 +33,8 @@ MESSAGE_SUBST+= XENKERNELDIR=${XENKERNELDIR} .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=unused-function -Wno-error=unused-const-variable + -Wno-error=unused-function -Wno-error=unused-const-variable \ + -Wno-error=ignored-attributes -Wno-error=initializer-overrides .endif MAKE_ENV+= EXTRA_CFLAGS=${EXTRA_CFLAGS:Q} diff --git a/sysutils/xenkernel45/distinfo b/sysutils/xenkernel45/distinfo index 260b4e82374..4ba8d053c05 100644 --- a/sysutils/xenkernel45/distinfo +++ b/sysutils/xenkernel45/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1 2015/01/20 16:42:13 bouyer Exp $ +$NetBSD: distinfo,v 1.2 2015/02/04 20:52:16 joerg Exp $ SHA1 (xen-4.5.0.tar.gz) = c4aab5fb366496ad1edc7fe0a935a0d604335637 RMD160 (xen-4.5.0.tar.gz) = e35ba0cb484492c1a289218eb9bf53b57dbd3a45 @@ -6,4 +6,5 @@ Size (xen-4.5.0.tar.gz) = 18404933 bytes SHA1 (patch-Config.mk) = a2a104d023cea4e551a3ad40927d4884d6c610bf SHA1 (patch-xen_Makefile) = 750d0c8d4fea14d3ef3f872de5242a1f5104cbbe SHA1 (patch-xen_arch_x86_Rules.mk) = 7b0894ba7311edb02118a021671f304cf3872154 +SHA1 (patch-xen_include_asm-x86_current.h) = 8a21577be06383c0c7f53c15ba828f77fb6314ad SHA1 (patch-xen_include_xen_lib.h) = b9f5dff5b4cf11333d95d9835941c6bc19b776ad diff --git a/sysutils/xenkernel45/patches/patch-xen_include_asm-x86_current.h b/sysutils/xenkernel45/patches/patch-xen_include_asm-x86_current.h new file mode 100644 index 00000000000..ca1db6f8a71 --- /dev/null +++ b/sysutils/xenkernel45/patches/patch-xen_include_asm-x86_current.h @@ -0,0 +1,13 @@ +$NetBSD: patch-xen_include_asm-x86_current.h,v 1.1 2015/02/04 20:52:16 joerg Exp $ + +--- xen/include/asm-x86/current.h.orig 2015-01-30 12:45:05.000000000 +0000 ++++ xen/include/asm-x86/current.h +@@ -25,7 +25,7 @@ struct cpu_info { + + static inline struct cpu_info *get_cpu_info(void) + { +- register unsigned long sp asm("rsp"); ++ unsigned long sp = (unsigned long)__builtin_frame_address(0); + + return (struct cpu_info *)((sp & ~(STACK_SIZE-1)) + STACK_SIZE) - 1; + } |