clang: 0001-mingw-w64-use-MSVC-style-ByteAlignment.patch: updated

msys2 · Oct 9, 2019 · ac2644e · ac2644e
1 parent 3cd372c
commit ac2644e
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/mingw-w64-clang/0001-mingw-w64-use-MSVC-style-ByteAlignment.patch b/mingw-w64-clang/0001-mingw-w64-use-MSVC-style-ByteAlignment.patch
@@ -13,21 +13,23 @@ diff --git a/lib/MC/MCWinCOFFStreamer.cpp b/lib/MC/MCWinCOFFStreamer.cpp
 index bf341bb1f45..3b3fecfc1d7 100644
 --- a/lib/MC/MCWinCOFFStreamer.cpp
 +++ b/lib/MC/MCWinCOFFStreamer.cpp
-@@ -222,7 +222,7 @@ void MCWinCOFFStreamer::EmitCommonSymbol(MCSymbol *S, uint64_t Size,
+@@ -255,7 +255,7 @@ void MCWinCOFFStreamer::EmitCommonSymbol(MCSymbol *S, uint64_t Size,
    auto *Symbol = cast<MCSymbolCOFF>(S);
 
    const Triple &T = getContext().getObjectFileInfo()->getTargetTriple();
--  if (T.isKnownWindowsMSVCEnvironment()) {
-+  if (T.getEnvironment() != Triple::Cygnus) {
+-  if (T.isWindowsMSVCEnvironment()) {
++  if (T.isWindowsMSVCEnvironment() || T.isWindowsGNUEnvironment()) {
      if (ByteAlignment > 32)
        report_fatal_error("alignment is limited to 32-bytes");
 
-@@ -234,7 +234,7 @@ void MCWinCOFFStreamer::EmitCommonSymbol(MCSymbol *S, uint64_t Size,
+@@ -267,7 +267,9 @@ void MCWinCOFFStreamer::EmitCommonSymbol(MCSymbol *S, uint64_t Size,
    Symbol->setExternal(true);
    Symbol->setCommon(Size, ByteAlignment);
 
--  if (!T.isKnownWindowsMSVCEnvironment() && ByteAlignment > 1) {
-+  if (T.getEnvironment() == Triple::Cygnus && ByteAlignment > 1) {
+-  if (!T.isWindowsMSVCEnvironment() && ByteAlignment > 1) {
++  if (!T.isWindowsMSVCEnvironment() && !T.isWindowsGNUEnvironment()
++       && ByteAlignment > 1)
++  {
      SmallString<128> Directive;
      raw_svector_ostream OS(Directive);
      const MCObjectFileInfo *MFI = getContext().getObjectFileInfo();