[Xen-changelog] [xen staging] tools/ocaml: abi check: #include on x86 only. Spotted by Gitlab CI

[patchbot@xxxxxxx]

commit 4e4a850aa42f9d1573978703e69f6177190dc9f7
Author:     Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
AuthorDate: Tue Sep 10 16:16:51 2019 +0100
Commit:     Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
CommitDate: Tue Sep 10 16:26:39 2019 +0100

    tools/ocaml: abi check: #include on x86 only.  Spotted by Gitlab CI
    
    Reported-by: Andrew Cooper <Andrew.Cooper3@xxxxxxxxxx>
    Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
    Acked-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
 tools/ocaml/libs/xc/xenctrl_stubs.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c 
b/tools/ocaml/libs/xc/xenctrl_stubs.c
index d7bc2cf40d..0cdd873599 100644
--- a/tools/ocaml/libs/xc/xenctrl_stubs.c
+++ b/tools/ocaml/libs/xc/xenctrl_stubs.c
@@ -135,7 +135,20 @@ static value c_bitmap_to_ocaml_list
        CAMLparam0();
        CAMLlocal2(list, tmp);
 
+#if defined(__i386__) || defined(__x86_64__)
+/*
+ * This check file contains a mixture of stuff, because it is
+ * generated from the whole of this xenctrl_stubs.c file (without
+ * regard to arch ifdefs) and the whole of xenctrl.ml (which does not
+ * have any arch ifdeffery).  Currently, there is only x86 and
+ * arch-independent stuff, and there is no facility in the abi-check
+ * script for arch conditionals.  So for now we make the checks
+ * effective on x86 only; this will suffice to defend even ARM
+ * because breaking changes to common code will break the build
+ * on x86 and not make it to master.  This is a bit of a bodge.
+ */
 #include "xenctrl_abi_check.h"
+#endif
 
        list = tmp = Val_emptylist;
 
--
generated by git-patchbot for /home/xen/git/xen.git#staging

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog