Merge remote-tracking branch 'upstream/staging-next' into staging

2019-11-25 15:59:05 -05:00
parent 64396d112a 06a054e6eb
commit f191360ad0
151 changed files with 1795 additions and 858 deletions
@@ -184,6 +184,7 @@ stdenv.mkDerivation {
      else if targetPlatform.isMsp430 then "msp430"
      else if targetPlatform.isAvr then "avr"
      else if targetPlatform.isAlpha then "alpha"
+      else if targetPlatform.isVc4 then "vc4"
      else throw "unknown emulation for platform: ${targetPlatform.config}";
    in if targetPlatform.useLLVM or false then ""
       else targetPlatform.platform.bfdEmulation or (fmt + sep + arch);