Force hard-float ABI for 32-bit platforms (#99)

Author: giordano

src/Platforms.jl

@@ -100,13 +100,13 @@ const ARCHITECTURE_FLAGS = Dict(
         ),
         "armv6l" => Dict(
             # This is the only known armv6l chip that runs Julia, so it's the only one we care about.
-            "arm1176jzfs" => ["-mcpu=arm1176jzf-s", "-mfpu=vfp"],
+            "arm1176jzfs" => ["-mcpu=arm1176jzf-s", "-mfpu=vfp", "-mfloat-abi=hard"],
         ),
         "armv7l" => Dict(
             # Base armv7l architecture, with the most basic of FPU's
-            "armv7l"   => ["-march=armv7-a", "-mtune=generic-armv7-a", "-mfpu=vfpv3"],
+            "armv7l"   => ["-march=armv7-a", "-mtune=generic-armv7-a", "-mfpu=vfpv3", "-mfloat-abi=hard"],
             # armv7l plus NEON and vfpv4, (Raspberry Pi 2B+, RK3328, most boards Elliot has access to)
-            "neonvfpv4" => ["-march=armv7-a", "-mtune=cortex-a53", "-mfpu=neon-vfpv4"],
+            "neonvfpv4" => ["-march=armv7-a", "-mtune=cortex-a53", "-mfpu=neon-vfpv4", "-mfloat-abi=hard"],
         ),
         "aarch64" => Dict(
             # Base armv8.0-a architecture, tune for generic cortex-a57
@@ -139,4 +139,4 @@ const ARCHITECTURE_FLAGS = Dict(
         ),
     ),
 )
-march(p::AbstractPlatform; default=nothing) = get(tags(p), "march", default)
+march(p::AbstractPlatform; default=nothing) = get(tags(p), "march", default)

src/Runner.jl

@@ -83,6 +83,7 @@ function generate_compiler_wrappers!(platform::AbstractPlatform; bin_path::Abstr
                      # Flags that are postpended if we think we're linking (e.g. no `-c`)
                      link_only_flags::Vector = String[],
                      allow_ccache::Bool = true,
+                     no_soft_float::Bool = false,
                      hash_args::Bool = false,
                      extra_cmds::String = "",
                      env::Dict{String,String} = Dict{String,String}(),
@@ -161,6 +162,16 @@ function generate_compiler_wrappers!(platform::AbstractPlatform; bin_path::Abstr
             println(io)
         end
 
+        if no_soft_float
+            write(io, raw"""
+                      if [[ " ${ARGS[@]} " == *"-mfloat-abi=soft"* ]]; then
+                          echo "${target} platform does not support soft-float ABI" >&2
+                          exit 1
+                      fi
+                      """)
+            println(io)
+        end
+
         if length(unsafe_flags) >= 1
             write(io, """
             if [[ "\${ARGS[@]}" =~ \"$(join(unsafe_flags, "\"|\""))\" ]]; then
@@ -351,6 +362,7 @@ function generate_compiler_wrappers!(platform::AbstractPlatform; bin_path::Abstr
             unsafe_flags=gcc_unsafe_flags!(p),
             hash_args = true,
             allow_ccache,
+            no_soft_float=arch(p) in ("armv6l", "armv7l"),
         )
     end
 
@@ -362,6 +374,7 @@ function generate_compiler_wrappers!(platform::AbstractPlatform; bin_path::Abstr
             flags=flags,
             compile_only_flags=clang_compile_flags!(p),
             link_only_flags=clang_link_flags!(p),
+            no_soft_float=arch(p) in ("armv6l", "armv7l"),
         )
     end