Merge "Refresh mclinker local patches"

7 files changed, 64 insertions, 14 deletions

diff --git a/build/tools/toolchain-patches/mclinker/0001-Revert-Fix-build-with-llvm-trunk.-to-build-with-llvm.patch b/build/tools/toolchain-patches/mclinker/0001-Revert-Fix-build-with-llvm-trunk.-to-build-with-llvm.patch
index da176a568..26c88d3de 100644
--- a/build/tools/toolchain-patches/mclinker/0001-Revert-Fix-build-with-llvm-trunk.-to-build-with-llvm.patch
+++ b/build/tools/toolchain-patches/mclinker/0001-Revert-Fix-build-with-llvm-trunk.-to-build-with-llvm.patch
@@ -1,7 +1,7 @@
 From 170a5342a6a8d799d8b0167295e12597a26a61a7 Mon Sep 17 00:00:00 2001
 From: Andrew Hsieh <andrewhsieh@google.com>
 Date: Thu, 16 Oct 2014 18:02:07 +0800
-Subject: [PATCH 1/6] Revert "Fix build with llvm trunk." to build with llvm
+Subject: [PATCH 1/7] Revert "Fix build with llvm trunk." to build with llvm
  3.5
 
 Also check llvm version 3.5
@@ -76,5 +76,5 @@ index 3347ca2..e1a96bc 100644
        m_bSetColor(false) {
  }
 -- 
-2.1.0.rc2.206.gedb03e5
+2.2.0.rc0.207.ga3a616c
 
diff --git a/build/tools/toolchain-patches/mclinker/0002-Fixed-darwin-ld.mcld-GNU-m-emulation-fail.patch b/build/tools/toolchain-patches/mclinker/0002-Fixed-darwin-ld.mcld-GNU-m-emulation-fail.patch
index 752fa67c7..4e23297d3 100644
--- a/build/tools/toolchain-patches/mclinker/0002-Fixed-darwin-ld.mcld-GNU-m-emulation-fail.patch
+++ b/build/tools/toolchain-patches/mclinker/0002-Fixed-darwin-ld.mcld-GNU-m-emulation-fail.patch
@@ -1,7 +1,7 @@
 From 7b2bc50282c75c028b674a55c12318d229e7c731 Mon Sep 17 00:00:00 2001
 From: Andrew Hsieh <andrewhsieh@google.com>
 Date: Thu, 16 Oct 2014 18:02:42 +0800
-Subject: [PATCH 2/6] Fixed darwin ld.mcld GNU -m emulation fail
+Subject: [PATCH 2/7] Fixed darwin ld.mcld GNU -m emulation fail
 
 Change-Id: I4190a509767f4c124b2b95d1ac9061aac06039ef
 ---
@@ -31,5 +31,5 @@ index c64e2bb..27a828d 100644
  
    if (triple.getArch() == llvm::Triple::UnknownArch &&
 -- 
-2.1.0.rc2.206.gedb03e5
+2.2.0.rc0.207.ga3a616c
 
diff --git a/build/tools/toolchain-patches/mclinker/0003-Allow-multiple-of-the-same-options.patch b/build/tools/toolchain-patches/mclinker/0003-Allow-multiple-of-the-same-options.patch
index 330445883..2203fb743 100644
--- a/build/tools/toolchain-patches/mclinker/0003-Allow-multiple-of-the-same-options.patch
+++ b/build/tools/toolchain-patches/mclinker/0003-Allow-multiple-of-the-same-options.patch
@@ -1,7 +1,7 @@
 From 077432301ff38f492d311683581badabc7f17889 Mon Sep 17 00:00:00 2001
 From: Andrew Hsieh <andrewhsieh@google.com>
 Date: Thu, 16 Oct 2014 18:03:20 +0800
-Subject: [PATCH 3/6] Allow multiple of the same options
+Subject: [PATCH 3/7] Allow multiple of the same options
 
 Change-Id: I8fa12e2401b0b828546a07ebe36a1acaf1f54caf
 ---
@@ -34,5 +34,5 @@ index 58ef3a0..88ad045 100644
  
  llvm::cl::opt<bool> ArgSVR4Compatibility(
 -- 
-2.1.0.rc2.206.gedb03e5
+2.2.0.rc0.207.ga3a616c
 
diff --git a/build/tools/toolchain-patches/mclinker/0004-Fix-build-FileSystem.cpp.patch b/build/tools/toolchain-patches/mclinker/0004-Fix-build-FileSystem.cpp.patch
index 87919611f..7ec2a4eb0 100644
--- a/build/tools/toolchain-patches/mclinker/0004-Fix-build-FileSystem.cpp.patch
+++ b/build/tools/toolchain-patches/mclinker/0004-Fix-build-FileSystem.cpp.patch
@@ -1,7 +1,7 @@
 From 8672a5ccfaabd2e4743c098b6439f5b2c7242941 Mon Sep 17 00:00:00 2001
 From: Andrew Hsieh <andrewhsieh@google.com>
 Date: Thu, 16 Oct 2014 18:04:10 +0800
-Subject: [PATCH 4/6] Fix build FileSystem.cpp
+Subject: [PATCH 4/7] Fix build FileSystem.cpp
 
 Change-Id: I4b3106c4fceefbfb83ae135be8ee69fb6b64cafd
 ---
@@ -21,5 +21,5 @@ index c8587b5..f615f4b 100644
  #include <mcld/Support/Path.h>
  
 -- 
-2.1.0.rc2.206.gedb03e5
+2.2.0.rc0.207.ga3a616c
 
diff --git a/build/tools/toolchain-patches/mclinker/0005-Add-crc32-for-mingw.patch b/build/tools/toolchain-patches/mclinker/0005-Add-crc32-for-mingw.patch
index 0e67a8424..351a393bf 100644
--- a/build/tools/toolchain-patches/mclinker/0005-Add-crc32-for-mingw.patch
+++ b/build/tools/toolchain-patches/mclinker/0005-Add-crc32-for-mingw.patch
@@ -1,7 +1,7 @@
 From a14939c891eb9c92d2a3c970806b3817ec5def49 Mon Sep 17 00:00:00 2001
 From: Andrew Hsieh <andrewhsieh@google.com>
 Date: Thu, 16 Oct 2014 18:04:41 +0800
-Subject: [PATCH 5/6] Add crc32 for mingw
+Subject: [PATCH 5/7] Add crc32 for mingw
 
 Change-Id: Iba3ef73f472b430dfca3b54390a9ffc36593c24e
 ---
@@ -89,5 +89,5 @@ index 6d75d55..b7311b8 100644
 -}  // namespace mcld
 +} // namespace mcld
 -- 
-2.1.0.rc2.206.gedb03e5
+2.2.0.rc0.207.ga3a616c
 
diff --git a/build/tools/toolchain-patches/mclinker/0006-Fix-mingw-and-darwin-builds.patch b/build/tools/toolchain-patches/mclinker/0006-Fix-mingw-and-darwin-builds.patch
index 0db050a00..03d3c3474 100644
--- a/build/tools/toolchain-patches/mclinker/0006-Fix-mingw-and-darwin-builds.patch
+++ b/build/tools/toolchain-patches/mclinker/0006-Fix-mingw-and-darwin-builds.patch
@@ -1,13 +1,14 @@
-From becefa15166b192c1682f2eb44bd57522e0e2341 Mon Sep 17 00:00:00 2001
+From cff9dd78fda9efc705724d8f1f9d9dca3f5aa776 Mon Sep 17 00:00:00 2001
 From: Andrew Hsieh <andrewhsieh@google.com>
 Date: Thu, 16 Oct 2014 18:05:47 +0800
-Subject: [PATCH 6/6] Fix mingw and darwin builds
+Subject: [PATCH 6/7] Fix mingw and darwin builds
 
 Change-Id: I99cdaad48b89a8022a67920f1f282a684442de7e
 ---
  lib/Support/Unix/FileSystem.inc    | 3 +++
  lib/Support/Windows/FileSystem.inc | 2 +-
- 2 files changed, 4 insertions(+), 1 deletion(-)
+ lib/Support/Windows/PathV3.inc     | 2 +-
+ 3 files changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/lib/Support/Unix/FileSystem.inc b/lib/Support/Unix/FileSystem.inc
 index dae5685..de52e8c 100644
@@ -36,6 +37,19 @@ index faa22ba..622e031 100644
  }
  
  void close_dir(Directory& pDir) {
+diff --git a/lib/Support/Windows/PathV3.inc b/lib/Support/Windows/PathV3.inc
+index 4d7089f..1b26f4e 100644
+--- a/lib/Support/Windows/PathV3.inc
++++ b/lib/Support/Windows/PathV3.inc
+@@ -170,7 +170,7 @@ mcld::sys::fs::PathCache::entry_type* bring_one_into_cache(DirIterator& pIter) {
+     path += std::string(FindFileData.cFileName);
+     entry = pIter.m_pParent->m_Cache.insert(path, exist);
+     if (!exist)
+-      entry->setValue(path);
++      entry->setValue(sys::fs::Path(path));
+   } else if (ERROR_NO_MORE_FILES == GetLastError()) {
+     // meet real end
+     pIter.m_pParent->m_CacheFull = true;
 -- 
-2.1.0.rc2.206.gedb03e5
+2.2.0.rc0.207.ga3a616c
 
diff --git a/build/tools/toolchain-patches/mclinker/0007-Add-fix-cortex-a53-835769.patch b/build/tools/toolchain-patches/mclinker/0007-Add-fix-cortex-a53-835769.patch
new file mode 100644
index 000000000..e783dd258
--- /dev/null
+++ b/build/tools/toolchain-patches/mclinker/0007-Add-fix-cortex-a53-835769.patch
@@ -0,0 +1,36 @@
+From 09fa56b93667a0784f41d3664f8aa7a790114341 Mon Sep 17 00:00:00 2001
+From: Andrew Hsieh <andrewhsieh@google.com>
+Date: Tue, 4 Nov 2014 10:58:11 +0800
+Subject: [PATCH 7/7] Add fix-cortex-a53-835769
+
+--fix-cortex-a53-835769 is passed from gcc4.9 by default unless
+user specify -mno-fix-cortex-a53-835769.
+
+Add but ignore it for now, otherwise lots of existing testing
+not affected by A53 errata 835769 break
+
+Change-Id: Ie96e5b4bf4a64d0811c67949b67f7c06ec559da1
+---
+ tools/mcld/lib/OutputFormatOptions.cpp | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/tools/mcld/lib/OutputFormatOptions.cpp b/tools/mcld/lib/OutputFormatOptions.cpp
+index 821a808..a77b4a8 100644
+--- a/tools/mcld/lib/OutputFormatOptions.cpp
++++ b/tools/mcld/lib/OutputFormatOptions.cpp
+@@ -175,6 +175,12 @@ llvm::cl::opt<bool> ArgNoWarnMismatch(
+     llvm::cl::ZeroOrMore,
+     llvm::cl::init(false));
+ 
++llvm::cl::opt<bool> ArgFixCortexA53Errata835769(
++    "fix-cortex-a53-835769",
++    llvm::cl::desc("Fix AArch64 A53 Errata 835769."),
++    llvm::cl::ZeroOrMore,
++    llvm::cl::init(false));
++
+ // Not supported yet {
+ llvm::cl::opt<bool> ArgExportDynamic(
+     "export-dynamic",
+-- 
+2.2.0.rc0.207.ga3a616c
+