[llvm] r326460 - [WebAssembly] Fix broken gcc build after rL326454

[Sam Clegg via llvm-commits]

Author: sbc
Date: Thu Mar  1 10:48:08 2018
New Revision: 326460

URL: http://llvm.org/viewvc/llvm-project?rev=326460&view=rev
Log:
[WebAssembly] Fix broken gcc build after rL326454

The gcc builders were broken by rL326454
See: https://reviews.llvm.org/D43921

Modified:
    llvm/trunk/include/llvm/BinaryFormat/Wasm.h
    llvm/trunk/include/llvm/ObjectYAML/WasmYAML.h
    llvm/trunk/lib/Target/WebAssembly/WebAssemblyMCInstLower.cpp

Modified: llvm/trunk/include/llvm/BinaryFormat/Wasm.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/BinaryFormat/Wasm.h?rev=326460&r1=326459&r2=326460&view=diff
==============================================================================
--- llvm/trunk/include/llvm/BinaryFormat/Wasm.h (original)
+++ llvm/trunk/include/llvm/BinaryFormat/Wasm.h Thu Mar  1 10:48:08 2018
@@ -178,7 +178,7 @@ enum : unsigned {
 };
 
 // Type immediate encodings used in various contexts.
-enum : uint8_t {
+enum : unsigned {
   WASM_TYPE_I32 = 0x7F,
   WASM_TYPE_I64 = 0x7E,
   WASM_TYPE_F32 = 0x7D,
@@ -189,7 +189,7 @@ enum : uint8_t {
 };
 
 // Kinds of externals (for imports and exports).
-enum : uint8_t {
+enum : unsigned {
   WASM_EXTERNAL_FUNCTION = 0x0,
   WASM_EXTERNAL_TABLE = 0x1,
   WASM_EXTERNAL_MEMORY = 0x2,
@@ -239,7 +239,7 @@ enum : unsigned {
 };
 
 // Kind codes used in the custom "linking" section in the WASM_SYMBOL_TABLE
-enum WasmSymbolType : uint8_t {
+enum WasmSymbolType : unsigned {
   WASM_SYMBOL_TYPE_FUNCTION = 0x0,
   WASM_SYMBOL_TYPE_DATA     = 0x1,
   WASM_SYMBOL_TYPE_GLOBAL   = 0x2,
@@ -257,7 +257,7 @@ const unsigned WASM_SYMBOL_UNDEFINED
 
 #define WASM_RELOC(name, value) name = value,
 
-enum : uint8_t {
+enum : unsigned {
 #include "WasmRelocs.def"
 };
 

Modified: llvm/trunk/include/llvm/ObjectYAML/WasmYAML.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ObjectYAML/WasmYAML.h?rev=326460&r1=326459&r2=326460&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ObjectYAML/WasmYAML.h (original)
+++ llvm/trunk/include/llvm/ObjectYAML/WasmYAML.h Thu Mar  1 10:48:08 2018
@@ -28,17 +28,17 @@ namespace llvm {
 namespace WasmYAML {
 
 LLVM_YAML_STRONG_TYPEDEF(uint32_t, SectionType)
-LLVM_YAML_STRONG_TYPEDEF(uint8_t, ValueType)
-LLVM_YAML_STRONG_TYPEDEF(uint8_t, TableType)
-LLVM_YAML_STRONG_TYPEDEF(uint8_t, SignatureForm)
-LLVM_YAML_STRONG_TYPEDEF(uint8_t, ExportKind)
+LLVM_YAML_STRONG_TYPEDEF(uint32_t, ValueType)
+LLVM_YAML_STRONG_TYPEDEF(uint32_t, TableType)
+LLVM_YAML_STRONG_TYPEDEF(uint32_t, SignatureForm)
+LLVM_YAML_STRONG_TYPEDEF(uint32_t, ExportKind)
 LLVM_YAML_STRONG_TYPEDEF(uint32_t, Opcode)
-LLVM_YAML_STRONG_TYPEDEF(uint8_t, RelocType)
+LLVM_YAML_STRONG_TYPEDEF(uint32_t, RelocType)
 LLVM_YAML_STRONG_TYPEDEF(uint32_t, SymbolFlags)
-LLVM_YAML_STRONG_TYPEDEF(uint8_t, SymbolKind)
+LLVM_YAML_STRONG_TYPEDEF(uint32_t, SymbolKind)
 LLVM_YAML_STRONG_TYPEDEF(uint32_t, SegmentFlags)
-LLVM_YAML_STRONG_TYPEDEF(uint8_t, LimitFlags)
-LLVM_YAML_STRONG_TYPEDEF(uint8_t, ComdatKind)
+LLVM_YAML_STRONG_TYPEDEF(uint32_t, LimitFlags)
+LLVM_YAML_STRONG_TYPEDEF(uint32_t, ComdatKind)
 
 struct FileHeader {
   yaml::Hex32 Version;

Modified: llvm/trunk/lib/Target/WebAssembly/WebAssemblyMCInstLower.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/WebAssembly/WebAssemblyMCInstLower.cpp?rev=326460&r1=326459&r2=326460&view=diff
==============================================================================
--- llvm/trunk/lib/Target/WebAssembly/WebAssemblyMCInstLower.cpp (original)
+++ llvm/trunk/lib/Target/WebAssembly/WebAssemblyMCInstLower.cpp Thu Mar  1 10:48:08 2018
@@ -97,7 +97,8 @@ MCSymbol *WebAssemblyMCInstLower::GetExt
   if (strcmp(Name, "__stack_pointer") == 0) {
     WasmSym->setType(wasm::WASM_SYMBOL_TYPE_GLOBAL);
     WasmSym->setGlobalType(wasm::WasmGlobalType{
-        Subtarget.hasAddr64() ? wasm::WASM_TYPE_I64 : wasm::WASM_TYPE_I32,
+        uint8_t(Subtarget.hasAddr64() ? wasm::WASM_TYPE_I64
+                                      : wasm::WASM_TYPE_I32),
         true});
     return WasmSym;
   }