Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 4A49E7A266 for ; Sun, 7 May 2017 21:21:03 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id EC17F84D84; Sun, 7 May 2017 21:21:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7C2A184D84 for ; Sun, 7 May 2017 21:21:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id TBmjlPTytn2Z for ; Sun, 7 May 2017 21:21:01 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 7415684D83 for ; Sun, 7 May 2017 21:21:01 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 6DB71FBE4; Sun, 7 May 2017 21:21:01 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1494192061290080" MIME-Version: 1.0 Date: Sun, 7 May 2017 21:21:01 +0000 From: "Joerg Sonnenberger" Subject: CVS commit: pkgsrc/sysutils To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org X-Mailer: log_accum Message-Id: <20170507212101.6DB71FBE4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1494192061290080 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: joerg Date: Sun May 7 21:21:01 UTC 2017 Modified Files: pkgsrc/sysutils/xenkernel45: distinfo pkgsrc/sysutils/xenkernel46: distinfo Added Files: pkgsrc/sysutils/xenkernel45/patches: patch-xen_arch_arm_xen.lds.S patch-xen_arch_x86_alternative.c patch-xen_common_efi_boot.c patch-xen_include_xen_init.h pkgsrc/sysutils/xenkernel46/patches: patch-xen_arch_arm_xen.lds.S patch-xen_arch_x86_alternative.c patch-xen_common_efi_boot.c patch-xen_include_xen_init.h Log Message: Merge upstream patches for fixing the build with clang. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 pkgsrc/sysutils/xenkernel45/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/sysutils/xenkernel45/patches/patch-xen_arch_arm_xen.lds.S \ pkgsrc/sysutils/xenkernel45/patches/patch-xen_arch_x86_alternative.c \ pkgsrc/sysutils/xenkernel45/patches/patch-xen_common_efi_boot.c \ pkgsrc/sysutils/xenkernel45/patches/patch-xen_include_xen_init.h cvs rdiff -u -r1.8 -r1.9 pkgsrc/sysutils/xenkernel46/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/sysutils/xenkernel46/patches/patch-xen_arch_arm_xen.lds.S \ pkgsrc/sysutils/xenkernel46/patches/patch-xen_arch_x86_alternative.c \ pkgsrc/sysutils/xenkernel46/patches/patch-xen_common_efi_boot.c \ pkgsrc/sysutils/xenkernel46/patches/patch-xen_include_xen_init.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1494192061290080 Content-Disposition: inline Content-Length: 14944 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/xenkernel45/distinfo diff -u pkgsrc/sysutils/xenkernel45/distinfo:1.23 pkgsrc/sysutils/xenkernel45/distinfo:1.24 --- pkgsrc/sysutils/xenkernel45/distinfo:1.23 Sat Apr 8 11:47:33 2017 +++ pkgsrc/sysutils/xenkernel45/distinfo Sun May 7 21:21:01 2017 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.23 2017/04/08 11:47:33 spz Exp $ +$NetBSD: distinfo,v 1.24 2017/05/07 21:21:01 joerg Exp $ SHA1 (xen-4.5.5.tar.gz) = 4073d411c72d3298baacfc15577b92b9ae577073 RMD160 (xen-4.5.5.tar.gz) = 34132ab04752dc594fbdc1404c95f402b7bbbe39 @@ -17,8 +17,12 @@ SHA1 (patch-XSA-204) = 4d5616f418e3ea010 SHA1 (patch-XSA-207) = e567afa1999bdb12800e7df43d5fdf8564d67fb1 SHA1 (patch-XSA-212) = 4637d51bcbb3b11fb0e22940f824ebacdaa15b4f SHA1 (patch-xen_Makefile) = 750d0c8d4fea14d3ef3f872de5242a1f5104cbbe +SHA1 (patch-xen_arch_arm_xen.lds.S) = fb15462a6f8f1d556f0a76062bce0768f11dcac2 SHA1 (patch-xen_arch_x86_Rules.mk) = 7b0894ba7311edb02118a021671f304cf3872154 +SHA1 (patch-xen_arch_x86_alternative.c) = d1ba40e0cbc5eff45030900790965460bc918ad4 +SHA1 (patch-xen_common_efi_boot.c) = 6bf417cf79339f8a0e557423ce45077c4cdb20b4 SHA1 (patch-xen_common_page__alloc.c) = c4d606de1cada8cf89b5abd16efada3d58c68a03 SHA1 (patch-xen_drivers_passthrough_vtd_x86_ats.c) = f72fd4bb2aeeaeb0b167031dfd5498e73666aa4e SHA1 (patch-xen_include_asm-x86_current.h) = 8a21577be06383c0c7f53c15ba828f77fb6314ad +SHA1 (patch-xen_include_xen_init.h) = 36fb182cde92e8767a9b73b301858911314cca73 SHA1 (patch-xen_include_xen_lib.h) = 82a219b7d9c5deaa2b8e0adc774f60395adc4815 Index: pkgsrc/sysutils/xenkernel46/distinfo diff -u pkgsrc/sysutils/xenkernel46/distinfo:1.8 pkgsrc/sysutils/xenkernel46/distinfo:1.9 --- pkgsrc/sysutils/xenkernel46/distinfo:1.8 Sat Apr 8 12:17:58 2017 +++ pkgsrc/sysutils/xenkernel46/distinfo Sun May 7 21:21:01 2017 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2017/04/08 12:17:58 spz Exp $ +$NetBSD: distinfo,v 1.9 2017/05/07 21:21:01 joerg Exp $ SHA1 (xen-4.6.5.tar.gz) = af371af662211ee1480167b6c9e35142156f3a8d RMD160 (xen-4.6.5.tar.gz) = 3f2468d7d3715d14842ac57b2180118ef48e93fa @@ -8,11 +8,15 @@ SHA1 (patch-Config.mk) = a2a104d023cea4e SHA1 (patch-XSA-212) = 4637d51bcbb3b11fb0e22940f824ebacdaa15b4f SHA1 (patch-tools_xentrace_xenalyze.c) = ab973cb7090dc90867dcddf9ab8965f8f2f36c46 SHA1 (patch-xen_Makefile) = be3f4577a205b23187b91319f91c50720919f70b +SHA1 (patch-xen_arch_arm_xen.lds.S) = df0e4a13b9b3ae863448172bea28b1b92296327b SHA1 (patch-xen_arch_x86_Rules.mk) = 7b0894ba7311edb02118a021671f304cf3872154 +SHA1 (patch-xen_arch_x86_alternative.c) = d86b414989b794202adf91735536cde96673439e SHA1 (patch-xen_arch_x86_mm.c) = 3c1435fa5db6a0f542e5efe726997f262fa04041 SHA1 (patch-xen_arch_x86_xen.lds.S) = 58a890c404ca4f86ccfb58cf5a83b07e235034fc +SHA1 (patch-xen_common_efi_boot.c) = 38e959b686c1d8c2b2dc173edda1a6d40607c63e SHA1 (patch-xen_common_page__alloc.c) = c4d606de1cada8cf89b5abd16efada3d58c68a03 SHA1 (patch-xen_drivers_passthrough_vtd_x86_ats.c) = f72fd4bb2aeeaeb0b167031dfd5498e73666aa4e SHA1 (patch-xen_include_asm-x86_current.h) = 8a21577be06383c0c7f53c15ba828f77fb6314ad SHA1 (patch-xen_include_asm-x86_spinlock.h) = a78fe84c87632f0524af255f173676732418a75e +SHA1 (patch-xen_include_xen_init.h) = 40d28d422687eac0c8224508619985f7337edddd SHA1 (patch-xen_include_xen_lib.h) = 82a219b7d9c5deaa2b8e0adc774f60395adc4815 Added files: Index: pkgsrc/sysutils/xenkernel45/patches/patch-xen_arch_arm_xen.lds.S diff -u /dev/null pkgsrc/sysutils/xenkernel45/patches/patch-xen_arch_arm_xen.lds.S:1.1 --- /dev/null Sun May 7 21:21:01 2017 +++ pkgsrc/sysutils/xenkernel45/patches/patch-xen_arch_arm_xen.lds.S Sun May 7 21:21:01 2017 @@ -0,0 +1,12 @@ +$NetBSD: patch-xen_arch_arm_xen.lds.S,v 1.1 2017/05/07 21:21:01 joerg Exp $ + +--- xen/arch/arm/xen.lds.S.orig 2016-09-20 05:59:24.000000000 +0000 ++++ xen/arch/arm/xen.lds.S +@@ -110,6 +110,7 @@ SECTIONS + . = ALIGN(PAGE_SIZE); + .init.data : { + *(.init.rodata) ++ *(.init.rodata.rel) + *(.init.rodata.str*) + *(.init.data) + *(.init.data.rel) Index: pkgsrc/sysutils/xenkernel45/patches/patch-xen_arch_x86_alternative.c diff -u /dev/null pkgsrc/sysutils/xenkernel45/patches/patch-xen_arch_x86_alternative.c:1.1 --- /dev/null Sun May 7 21:21:01 2017 +++ pkgsrc/sysutils/xenkernel45/patches/patch-xen_arch_x86_alternative.c Sun May 7 21:21:01 2017 @@ -0,0 +1,22 @@ +$NetBSD: patch-xen_arch_x86_alternative.c,v 1.1 2017/05/07 21:21:01 joerg Exp $ + +--- xen/arch/x86/alternative.c.orig 2016-09-20 05:59:24.000000000 +0000 ++++ xen/arch/x86/alternative.c +@@ -39,7 +39,7 @@ static const unsigned char k8nops[] __in + K8_NOP7, + K8_NOP8 + }; +-static const unsigned char * const k8_nops[ASM_NOP_MAX+1] = { ++static const unsigned char * const k8_nops[ASM_NOP_MAX+1] __initconstrel = { + NULL, + k8nops, + k8nops + 1, +@@ -63,7 +63,7 @@ static const unsigned char p6nops[] __in + P6_NOP7, + P6_NOP8 + }; +-static const unsigned char * const p6_nops[ASM_NOP_MAX+1] = { ++static const unsigned char * const p6_nops[ASM_NOP_MAX+1] __initconstrel = { + NULL, + p6nops, + p6nops + 1, Index: pkgsrc/sysutils/xenkernel45/patches/patch-xen_common_efi_boot.c diff -u /dev/null pkgsrc/sysutils/xenkernel45/patches/patch-xen_common_efi_boot.c:1.1 --- /dev/null Sun May 7 21:21:01 2017 +++ pkgsrc/sysutils/xenkernel45/patches/patch-xen_common_efi_boot.c Sun May 7 21:21:01 2017 @@ -0,0 +1,77 @@ +$NetBSD: patch-xen_common_efi_boot.c,v 1.1 2017/05/07 21:21:01 joerg Exp $ + +--- xen/common/efi/boot.c.orig 2016-09-20 05:59:24.000000000 +0000 ++++ xen/common/efi/boot.c +@@ -239,53 +239,33 @@ static void __init noreturn blexit(const + /* generic routine for printing error messages */ + static void __init PrintErrMesg(const CHAR16 *mesg, EFI_STATUS ErrCode) + { ++ static const CHAR16* const ErrCodeToStr[] __initconstrel = { ++ [~EFI_ERROR_MASK & EFI_NOT_FOUND] = L"Not found", ++ [~EFI_ERROR_MASK & EFI_NO_MEDIA] = L"The device has no media", ++ [~EFI_ERROR_MASK & EFI_MEDIA_CHANGED] = L"Media changed", ++ [~EFI_ERROR_MASK & EFI_DEVICE_ERROR] = L"Device error", ++ [~EFI_ERROR_MASK & EFI_VOLUME_CORRUPTED] = L"Volume corrupted", ++ [~EFI_ERROR_MASK & EFI_ACCESS_DENIED] = L"Access denied", ++ [~EFI_ERROR_MASK & EFI_OUT_OF_RESOURCES] = L"Out of resources", ++ [~EFI_ERROR_MASK & EFI_VOLUME_FULL] = L"Volume is full", ++ [~EFI_ERROR_MASK & EFI_SECURITY_VIOLATION] = L"Security violation", ++ [~EFI_ERROR_MASK & EFI_CRC_ERROR] = L"CRC error", ++ [~EFI_ERROR_MASK & EFI_COMPROMISED_DATA] = L"Compromised data", ++ [~EFI_ERROR_MASK & EFI_BUFFER_TOO_SMALL] = L"Buffer too small", ++ }; ++ EFI_STATUS ErrIdx = ErrCode & ~EFI_ERROR_MASK; ++ + StdOut = StdErr; + PrintErr((CHAR16 *)mesg); + PrintErr(L": "); + +- switch (ErrCode) ++ if( (ErrIdx < ARRAY_SIZE(ErrCodeToStr)) && ErrCodeToStr[ErrIdx] ) ++ mesg = ErrCodeToStr[ErrIdx]; ++ else + { +- case EFI_NOT_FOUND: +- mesg = L"Not found"; +- break; +- case EFI_NO_MEDIA: +- mesg = L"The device has no media"; +- break; +- case EFI_MEDIA_CHANGED: +- mesg = L"Media changed"; +- break; +- case EFI_DEVICE_ERROR: +- mesg = L"Device error"; +- break; +- case EFI_VOLUME_CORRUPTED: +- mesg = L"Volume corrupted"; +- break; +- case EFI_ACCESS_DENIED: +- mesg = L"Access denied"; +- break; +- case EFI_OUT_OF_RESOURCES: +- mesg = L"Out of resources"; +- break; +- case EFI_VOLUME_FULL: +- mesg = L"Volume is full"; +- break; +- case EFI_SECURITY_VIOLATION: +- mesg = L"Security violation"; +- break; +- case EFI_CRC_ERROR: +- mesg = L"CRC error"; +- break; +- case EFI_COMPROMISED_DATA: +- mesg = L"Compromised data"; +- break; +- case EFI_BUFFER_TOO_SMALL: +- mesg = L"Buffer too small"; +- break; +- default: + PrintErr(L"ErrCode: "); + DisplayUint(ErrCode, 0); + mesg = NULL; +- break; + } + blexit(mesg); + } Index: pkgsrc/sysutils/xenkernel45/patches/patch-xen_include_xen_init.h diff -u /dev/null pkgsrc/sysutils/xenkernel45/patches/patch-xen_include_xen_init.h:1.1 --- /dev/null Sun May 7 21:21:01 2017 +++ pkgsrc/sysutils/xenkernel45/patches/patch-xen_include_xen_init.h Sun May 7 21:21:01 2017 @@ -0,0 +1,12 @@ +$NetBSD: patch-xen_include_xen_init.h,v 1.1 2017/05/07 21:21:01 joerg Exp $ + +--- xen/include/xen/init.h.orig 2016-09-20 05:59:24.000000000 +0000 ++++ xen/include/xen/init.h +@@ -11,6 +11,7 @@ + #define __exit __text_section(".exit.text") + #define __initdata __section(".init.data") + #define __initconst __section(".init.rodata") ++#define __initconstrel __section(".init.rodata.rel") + #define __exitdata __used_section(".exit.data") + #define __initsetup __used_section(".init.setup") + #define __init_call(lvl) __used_section(".initcall" lvl ".init") Index: pkgsrc/sysutils/xenkernel46/patches/patch-xen_arch_arm_xen.lds.S diff -u /dev/null pkgsrc/sysutils/xenkernel46/patches/patch-xen_arch_arm_xen.lds.S:1.1 --- /dev/null Sun May 7 21:21:01 2017 +++ pkgsrc/sysutils/xenkernel46/patches/patch-xen_arch_arm_xen.lds.S Sun May 7 21:21:01 2017 @@ -0,0 +1,12 @@ +$NetBSD: patch-xen_arch_arm_xen.lds.S,v 1.1 2017/05/07 21:21:01 joerg Exp $ + +--- xen/arch/arm/xen.lds.S.orig 2016-06-20 12:08:22.000000000 +0000 ++++ xen/arch/arm/xen.lds.S +@@ -110,6 +110,7 @@ SECTIONS + . = ALIGN(PAGE_SIZE); + .init.data : { + *(.init.rodata) ++ *(.init.rodata.rel) + *(.init.rodata.str*) + *(.init.data) + *(.init.data.rel) Index: pkgsrc/sysutils/xenkernel46/patches/patch-xen_arch_x86_alternative.c diff -u /dev/null pkgsrc/sysutils/xenkernel46/patches/patch-xen_arch_x86_alternative.c:1.1 --- /dev/null Sun May 7 21:21:01 2017 +++ pkgsrc/sysutils/xenkernel46/patches/patch-xen_arch_x86_alternative.c Sun May 7 21:21:01 2017 @@ -0,0 +1,22 @@ +$NetBSD: patch-xen_arch_x86_alternative.c,v 1.1 2017/05/07 21:21:01 joerg Exp $ + +--- xen/arch/x86/alternative.c.orig 2016-06-20 12:08:22.000000000 +0000 ++++ xen/arch/x86/alternative.c +@@ -38,7 +38,7 @@ static const unsigned char k8nops[] __in + K8_NOP7, + K8_NOP8 + }; +-static const unsigned char * const k8_nops[ASM_NOP_MAX+1] = { ++static const unsigned char * const k8_nops[ASM_NOP_MAX+1] __initconstrel = { + NULL, + k8nops, + k8nops + 1, +@@ -62,7 +62,7 @@ static const unsigned char p6nops[] __in + P6_NOP7, + P6_NOP8 + }; +-static const unsigned char * const p6_nops[ASM_NOP_MAX+1] = { ++static const unsigned char * const p6_nops[ASM_NOP_MAX+1] __initconstrel = { + NULL, + p6nops, + p6nops + 1, Index: pkgsrc/sysutils/xenkernel46/patches/patch-xen_common_efi_boot.c diff -u /dev/null pkgsrc/sysutils/xenkernel46/patches/patch-xen_common_efi_boot.c:1.1 --- /dev/null Sun May 7 21:21:01 2017 +++ pkgsrc/sysutils/xenkernel46/patches/patch-xen_common_efi_boot.c Sun May 7 21:21:01 2017 @@ -0,0 +1,77 @@ +$NetBSD: patch-xen_common_efi_boot.c,v 1.1 2017/05/07 21:21:01 joerg Exp $ + +--- xen/common/efi/boot.c.orig 2016-06-20 12:08:22.000000000 +0000 ++++ xen/common/efi/boot.c +@@ -241,53 +241,33 @@ static void __init noreturn blexit(const + /* generic routine for printing error messages */ + static void __init PrintErrMesg(const CHAR16 *mesg, EFI_STATUS ErrCode) + { ++ static const CHAR16* const ErrCodeToStr[] __initconstrel = { ++ [~EFI_ERROR_MASK & EFI_NOT_FOUND] = L"Not found", ++ [~EFI_ERROR_MASK & EFI_NO_MEDIA] = L"The device has no media", ++ [~EFI_ERROR_MASK & EFI_MEDIA_CHANGED] = L"Media changed", ++ [~EFI_ERROR_MASK & EFI_DEVICE_ERROR] = L"Device error", ++ [~EFI_ERROR_MASK & EFI_VOLUME_CORRUPTED] = L"Volume corrupted", ++ [~EFI_ERROR_MASK & EFI_ACCESS_DENIED] = L"Access denied", ++ [~EFI_ERROR_MASK & EFI_OUT_OF_RESOURCES] = L"Out of resources", ++ [~EFI_ERROR_MASK & EFI_VOLUME_FULL] = L"Volume is full", ++ [~EFI_ERROR_MASK & EFI_SECURITY_VIOLATION] = L"Security violation", ++ [~EFI_ERROR_MASK & EFI_CRC_ERROR] = L"CRC error", ++ [~EFI_ERROR_MASK & EFI_COMPROMISED_DATA] = L"Compromised data", ++ [~EFI_ERROR_MASK & EFI_BUFFER_TOO_SMALL] = L"Buffer too small", ++ }; ++ EFI_STATUS ErrIdx = ErrCode & ~EFI_ERROR_MASK; ++ + StdOut = StdErr; + PrintErr((CHAR16 *)mesg); + PrintErr(L": "); + +- switch (ErrCode) ++ if( (ErrIdx < ARRAY_SIZE(ErrCodeToStr)) && ErrCodeToStr[ErrIdx] ) ++ mesg = ErrCodeToStr[ErrIdx]; ++ else + { +- case EFI_NOT_FOUND: +- mesg = L"Not found"; +- break; +- case EFI_NO_MEDIA: +- mesg = L"The device has no media"; +- break; +- case EFI_MEDIA_CHANGED: +- mesg = L"Media changed"; +- break; +- case EFI_DEVICE_ERROR: +- mesg = L"Device error"; +- break; +- case EFI_VOLUME_CORRUPTED: +- mesg = L"Volume corrupted"; +- break; +- case EFI_ACCESS_DENIED: +- mesg = L"Access denied"; +- break; +- case EFI_OUT_OF_RESOURCES: +- mesg = L"Out of resources"; +- break; +- case EFI_VOLUME_FULL: +- mesg = L"Volume is full"; +- break; +- case EFI_SECURITY_VIOLATION: +- mesg = L"Security violation"; +- break; +- case EFI_CRC_ERROR: +- mesg = L"CRC error"; +- break; +- case EFI_COMPROMISED_DATA: +- mesg = L"Compromised data"; +- break; +- case EFI_BUFFER_TOO_SMALL: +- mesg = L"Buffer too small"; +- break; +- default: + PrintErr(L"ErrCode: "); + DisplayUint(ErrCode, 0); + mesg = NULL; +- break; + } + blexit(mesg); + } Index: pkgsrc/sysutils/xenkernel46/patches/patch-xen_include_xen_init.h diff -u /dev/null pkgsrc/sysutils/xenkernel46/patches/patch-xen_include_xen_init.h:1.1 --- /dev/null Sun May 7 21:21:01 2017 +++ pkgsrc/sysutils/xenkernel46/patches/patch-xen_include_xen_init.h Sun May 7 21:21:01 2017 @@ -0,0 +1,12 @@ +$NetBSD: patch-xen_include_xen_init.h,v 1.1 2017/05/07 21:21:01 joerg Exp $ + +--- xen/include/xen/init.h.orig 2016-06-20 12:08:22.000000000 +0000 ++++ xen/include/xen/init.h +@@ -11,6 +11,7 @@ + #define __exit __text_section(".exit.text") + #define __initdata __section(".init.data") + #define __initconst __section(".init.rodata") ++#define __initconstrel __section(".init.rodata.rel") + #define __exitdata __used_section(".exit.data") + #define __initsetup __used_section(".init.setup") + #define __init_call(lvl) __used_section(".initcall" lvl ".init") --_----------=_1494192061290080--