Skip to contentSkip to conversation

package/mesa3d: fix gallium nouveau driver with gcc 4.9

PATCH New Fabrice Fontaine 2 participants 2 messages Dec 29, 2019 – Jan 7, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/mesa3d: fix gallium nouveau driver with gcc 4.9

Fixes:
- http://autobuild.buildroot.org/results/599dc3478ed65d36fbf9f5e9625691dfa813b530

---
 ...ers-nouveau-codegen-nv50_ir_ra.cpp-p.patch | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 package/mesa3d/0005-src-gallium-drivers-nouveau-codegen-nv50_ir_ra.cpp-p.patch
package/mesa3d/0005-src-gallium-drivers-nouveau-codegen-nv50_ir_ra.cpp-p.patch new file +47 -0
new file mode 100644
index 0000000000..73e75993de
@@ -0,0 +1,47 @@
+From f2ce27b761eeca301a109856f20ed9a8eb06796d Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <[email protected]>
+Date: Sat, 28 Dec 2019 21:49:43 +0100
+Subject: [PATCH] src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp: prefix
+ isinf with std::
+
+Prefix isinf with std:: to fix the following build failure with gcc 4.9:
+
+../src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp: In member function 'bool nv50_ir::GCRA::simplify()':
+../src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp:1350:29: error: 'isinf' was not declared in this scope
+          if (isinf(bestScore)) {
+                             ^
+../src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp:1350:29: note: suggested alternative:
+In file included from /data/buildroot/buildroot-test/instance-0/output/host/opt/ext-toolchain/arm-buildroot-linux-uclibcgnueabi/include/c++/4.9.4/random:38:0,
+                 from /data/buildroot/buildroot-test/instance-0/output/host/opt/ext-toolchain/arm-buildroot-linux-uclibcgnueabi/include/c++/4.9.4/bits/stl_algo.h:66,
+                 from /data/buildroot/buildroot-test/instance-0/output/host/opt/ext-toolchain/arm-buildroot-linux-uclibcgnueabi/include/c++/4.9.4/algorithm:62,
+                 from ../src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp:26:
+/data/buildroot/buildroot-test/instance-0/output/host/opt/ext-toolchain/arm-buildroot-linux-uclibcgnueabi/include/c++/4.9.4/cmath:621:5: note:   'std::isinf'
+     isinf(_Tp __x)
+     ^
+
+Fixes:
+ - http://autobuild.buildroot.org/results/599dc3478ed65d36fbf9f5e9625691dfa813b530
+
+Signed-off-by: Fabrice Fontaine <[email protected]>
+[Upstream status:
+https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3227]
+---
+ src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp
+index 6df2664da22..e81fb117213 100644
+--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp
++++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp
+@@ -1345,7 +1345,7 @@ GCRA::simplify()
+                bestMaxReg = it->maxReg;
+             }
+          }
+-         if (isinf(bestScore)) {
++         if (std::isinf(bestScore)) {
+             ERROR("no viable spill candidates left\n");
+             return false;
+          }
+-- 
+2.24.0
+
Signature · 1 line
2.24.0
#1 lore raw

PATCH 1/1 package/mesa3d: fix gallium nouveau driver with gcc 4.9

Quoted 8 lines · On Sun, 29 Dec 2019 10:24:14 +0100 Fabrice Fontaine…

Fixes:
- http://autobuild.buildroot.org/results/599dc3478ed65d36fbf9f5e9625691dfa813b530

---
 ...ers-nouveau-codegen-nv50_ir_ra.cpp-p.patch | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 package/mesa3d/0005-src-gallium-drivers-nouveau-codegen-nv50_ir_ra.cpp-p.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com