From 1805a94f1f1c78f183080671911c722962e0caae Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Sep 18 2016 23:34:43 +0000
Subject: llvm: fix docs even more


---

diff --git a/0001-fix-code-2.patch b/0001-fix-code-2.patch
deleted file mode 100644
index 988cb64..0000000
--- a/0001-fix-code-2.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From de4fbfe93560c78f29c8b92cafab0793f5d26bc6 Mon Sep 17 00:00:00 2001
-From: Aaron Ballman <aaron@aaronballman.com>
-Date: Tue, 19 Jul 2016 20:20:03 +0000
-Subject: [PATCH] This code block breaks the docs build
- (http://lab.llvm.org:8011/builders/llvm-sphinx-docs/builds/11921/steps/docs-llvm-html/logs/stdio).
- Setting the code highlighting to none instead of llvm to hopefully get the
- bot stumbling back towards green.
-
-git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@276018 91177308-0d34-0410-b5e6-96231b3b80d8
----
- docs/BitCodeFormat.rst | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/docs/BitCodeFormat.rst b/docs/BitCodeFormat.rst
-index ffa2176..89c7c1b 100644
---- a/docs/BitCodeFormat.rst
-+++ b/docs/BitCodeFormat.rst
-@@ -596,7 +596,7 @@ will be encoded as 1.
- 
- For example, instead of
- 
--.. code-block:: llvm
-+.. code-block:: none
- 
-   #n = load #n-1
-   #n+1 = icmp eq #n, #const0
-@@ -604,7 +604,7 @@ For example, instead of
- 
- version 1 will encode the instructions as
- 
--.. code-block:: llvm
-+.. code-block:: none
- 
-   #n = load #1
-   #n+1 = icmp eq #1, (#n+1)-#const0
--- 
-2.5.5
-
diff --git a/0001-fix-docs-2.patch b/0001-fix-docs-2.patch
new file mode 100644
index 0000000..988cb64
--- /dev/null
+++ b/0001-fix-docs-2.patch
@@ -0,0 +1,38 @@
+From de4fbfe93560c78f29c8b92cafab0793f5d26bc6 Mon Sep 17 00:00:00 2001
+From: Aaron Ballman <aaron@aaronballman.com>
+Date: Tue, 19 Jul 2016 20:20:03 +0000
+Subject: [PATCH] This code block breaks the docs build
+ (http://lab.llvm.org:8011/builders/llvm-sphinx-docs/builds/11921/steps/docs-llvm-html/logs/stdio).
+ Setting the code highlighting to none instead of llvm to hopefully get the
+ bot stumbling back towards green.
+
+git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@276018 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ docs/BitCodeFormat.rst | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/docs/BitCodeFormat.rst b/docs/BitCodeFormat.rst
+index ffa2176..89c7c1b 100644
+--- a/docs/BitCodeFormat.rst
++++ b/docs/BitCodeFormat.rst
+@@ -596,7 +596,7 @@ will be encoded as 1.
+ 
+ For example, instead of
+ 
+-.. code-block:: llvm
++.. code-block:: none
+ 
+   #n = load #n-1
+   #n+1 = icmp eq #n, #const0
+@@ -604,7 +604,7 @@ For example, instead of
+ 
+ version 1 will encode the instructions as
+ 
+-.. code-block:: llvm
++.. code-block:: none
+ 
+   #n = load #1
+   #n+1 = icmp eq #1, (#n+1)-#const0
+-- 
+2.5.5
+
diff --git a/0001-fix-docs-3.patch b/0001-fix-docs-3.patch
new file mode 100644
index 0000000..f46b57f
--- /dev/null
+++ b/0001-fix-docs-3.patch
@@ -0,0 +1,46 @@
+From 9871423412faa2ed8380445a26ed1b0991a18502 Mon Sep 17 00:00:00 2001
+From: Aaron Ballman <aaron@aaronballman.com>
+Date: Tue, 19 Jul 2016 23:50:11 +0000
+Subject: [PATCH] This code block breaks the docs build
+ (http://lab.llvm.org:8011/builders/llvm-sphinx-docs/builds/11925/steps/docs-llvm-html/logs/stdio).
+ Setting the code highlighting to none instead of llvm.
+
+git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@276060 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ docs/BranchWeightMetadata.rst | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/docs/BranchWeightMetadata.rst b/docs/BranchWeightMetadata.rst
+index 6cbcb0f..9e61d23 100644
+--- a/docs/BranchWeightMetadata.rst
++++ b/docs/BranchWeightMetadata.rst
+@@ -29,7 +29,7 @@ Supported Instructions
+ Metadata is only assigned to the conditional branches. There are two extra
+ operands for the true and the false branch.
+ 
+-.. code-block:: llvm
++.. code-block:: none
+ 
+   !0 = metadata !{
+     metadata !"branch_weights",
+@@ -43,7 +43,7 @@ operands for the true and the false branch.
+ Branch weights are assigned to every case (including the ``default`` case which
+ is always case #0).
+ 
+-.. code-block:: llvm
++.. code-block:: none
+ 
+   !0 = metadata !{
+     metadata !"branch_weights",
+@@ -56,7 +56,7 @@ is always case #0).
+ 
+ Branch weights are assigned to every destination.
+ 
+-.. code-block:: llvm
++.. code-block:: none
+ 
+   !0 = metadata !{
+     metadata !"branch_weights",
+-- 
+2.5.5
+
diff --git a/llvm.spec b/llvm.spec
index 322b157..19890db 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -20,7 +20,8 @@ Source100:	llvm-config.h
 Patch0:		llvm-3.7.1-cmake-s390.patch
 
 Patch1:		0001-This-code-block-breaks-the-docs-build-http-lab.llvm..patch
-Patch2:		0001-fix-code-2.patch
+Patch2:		0001-fix-docs-2.patch
+Patch3:		0001-fix-docs-3.patch
 
 BuildRequires:	cmake
 BuildRequires:	zlib-devel
@@ -75,6 +76,7 @@ Static libraries for the LLVM compiler infrastructure.
 %patch0 -p1 -b .s390
 %patch1 -p1 -b .sphinx
 %patch2 -p1 -b .docs2
+%patch3 -p1 -b .docs3
 
 %build
 mkdir -p _build