Andrew Geissler | c926e17 | 2021-05-07 16:11:35 -0500 | [diff] [blame] | 1 | From 8154d38bac5cdb3675cfdaf562ab9da01988b263 Mon Sep 17 00:00:00 2001 |
| 2 | From: Yi Fan Yu <yifan.yu@windriver.com> |
| 3 | Date: Wed, 17 Mar 2021 12:16:31 -0400 |
| 4 | Subject: [PATCH 19/20] remove s390x_vec_op_t |
| 5 | |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 6 | s390x_vec_op_t is not needed anywhere, only elements of enum are accessed |
| 7 | removing it ensures that valgrind can be built with -fno-common option |
| 8 | |
| 9 | Fixes |
| 10 | ld: ../../VEX/libvex-amd64-linux.a(libvex_amd64_linux_a-guest_s390_helpers.o):/usr/src/debug/valgrind/3.15.0-r0/build/VEX/../../valgrind-3.15.0/VEX/priv/guest_s390_defs.h:289: multiple definition of `s390x_vec_op_t'; ../../VEX/libvexmultiarch-amd64-linux.a(libvexmultiarch_amd64_linux_a-multiarch_main_main.o):/usr/src/debug/valgrind/3.15.0-r0/build/VEX/../../valgrind-3.15.0/VEX/priv/guest_s390_defs.h:289: first defined here |
| 11 | |
| 12 | Upstream-Status: Pending |
| 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
Andrew Geissler | c926e17 | 2021-05-07 16:11:35 -0500 | [diff] [blame] | 14 | |
| 15 | Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> |
| 16 | --- |
| 17 | VEX/priv/guest_s390_defs.h | 2 +- |
| 18 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 19 | |
| 20 | diff --git a/VEX/priv/guest_s390_defs.h b/VEX/priv/guest_s390_defs.h |
| 21 | index 9054290..dab8002 100644 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 22 | --- a/VEX/priv/guest_s390_defs.h |
| 23 | +++ b/VEX/priv/guest_s390_defs.h |
Andrew Geissler | c926e17 | 2021-05-07 16:11:35 -0500 | [diff] [blame] | 24 | @@ -284,7 +284,7 @@ typedef enum { |
| 25 | S390_VEC_OP_VBPERM, |
| 26 | S390_VEC_OP_VMSL, |
| 27 | S390_VEC_OP_LAST // supposed to be the last element in enum |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 28 | -} s390x_vec_op_t; |
| 29 | +}; |
| 30 | |
| 31 | /* Arguments of s390x_dirtyhelper_vec_op(...) which are packed into one |
| 32 | ULong variable. |
Andrew Geissler | c926e17 | 2021-05-07 16:11:35 -0500 | [diff] [blame] | 33 | -- |
| 34 | 2.29.2 |
| 35 | |