From: Mark Wielaard <mark@klomp.org>
Date: Thu, 23 Jan 2020 20:30:59 +0000 (+0100)
Subject: Fix GCC10 issue in guest_s390_defs.h typedef enum type s390x_vec_op_t.
X-Git-Tag: VALGRIND_3_16_0~118
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee18ab11ddf41a7a484fea01e8738c32bae630d9;p=thirdparty%2Fvalgrind.git

Fix GCC10 issue in guest_s390_defs.h typedef enum type s390x_vec_op_t.

GCC10 defaults to -fno-common which produces this error:

  guest_s390_defs.h:291: multiple definition of `s390x_vec_op_t

This is because GCC10 detects there are multiple definitions of the
variable s390x_vec_op_t. We don't want to define a variable though.
We had wanted to define a type (one that currently isn't used).
Fix this by making it a typedef enum.

https://bugzilla.redhat.com/show_bug.cgi?id=1794482
---

diff --git a/VEX/priv/guest_s390_defs.h b/VEX/priv/guest_s390_defs.h
index b9f038aaab..9f93cff193 100644
--- a/VEX/priv/guest_s390_defs.h
+++ b/VEX/priv/guest_s390_defs.h
@@ -261,7 +261,7 @@ extern ULong last_execute_target;
 /* Vector operatons passed to s390x_dirtyhelper_vec_op(...) helper.
    Please don't change ordering of elements and append new items
    before  S390_VEC_OP_LAST. */
-enum {
+typedef enum {
    S390_VEC_OP_INVALID = 0,
    S390_VEC_OP_VPKS = 1,
    S390_VEC_OP_VPKLS = 2,