Fix armhf build for GCC-11 (#627)

infinity0 · web-flow · commit b2f6b146b752 · 2021-10-14T09:23:48.000-05:00
GCC 11 changed the default flag to put the FP option in the -march flag (arm7-a+fp) rather than a specific FPU flag. Therefore it needs to be given separately now. See https://bugs.launchpad.net/ubuntu/+source/gcc-defaults/+bug/1939379 for some more details.
diff --git a/src/lib.rs b/src/lib.rs
@@ -1638,6 +1638,11 @@ impl Build {
                     && (target.contains("-linux-") || target.contains("-kmc-solid_"))
                 {
                     cmd.args.push("-march=armv7-a".into());
+
+                    if target.ends_with("eabihf") {
+                        // lowest common denominator FPU
+                        cmd.args.push("-mfpu=vfpv3-d16".into());
+                    }
                 }
 
                 // (x86 Android doesn't say "eabi")

Original file line number	Diff line number	Diff line change
`@@ -1638,6 +1638,11 @@ impl Build {`
`1638`	`1638`	`&& (target.contains("-linux-") \|\| target.contains("-kmc-solid_"))`
`1639`	`1639`	`{`
`1640`	`1640`	`cmd.args.push("-march=armv7-a".into());`
	`1641`	`+`
	`1642`	`+ if target.ends_with("eabihf") {`
	`1643`	`+ // lowest common denominator FPU`
	`1644`	`+ cmd.args.push("-mfpu=vfpv3-d16".into());`
	`1645`	`+ }`
`1641`	`1646`	`}`
`1642`	`1647`
`1643`	`1648`	`// (x86 Android doesn't say "eabi")`