Merge commit '5691c746cf62e69806aae1baf0a6e8252d519444'

* commit '5691c746cf62e69806aae1baf0a6e8252d519444':
  configure: Group toolchain parameter mangling functions together

Merged-by: James Almer <jamrial@gmail.com>

diff --cc configure
index 0da3b580c1b4176dbe8f8bdf19ccc7783889274b,f5f726f6b545fc91bb2f50133fc3c32bd86c8b29..c07ca5a5dfefec366262c87bfca2027d5deb8363
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -950,11 -769,10 +950,15 @@@ test_cmd()
      "$@" >> $logfile 2>&1
  }
  
 +test_stat(){
 +    log test_stat "$@"
 +    stat "$1" >> $logfile 2>&1
 +}
 +
+ cc_e(){
+     eval printf '%s\\n' $CC_E
+ }
+ 
  cc_o(){
      eval printf '%s\\n' $CC_O
  }
@@@ -1077,20 -877,14 +1089,16 @@@ check_x86asm()
      test_x86asm "$@" && enable $name
  }
  
- ld_o(){
-     eval printf '%s\\n' $LD_O
- }
- 
  test_ld(){
      log test_ld "$@"
 -    flags=$(filter_out '-l*' "$@")
 -    libs=$(filter '-l*' "$@")
 -    test_cc $($cflags_filter $flags) || return
 +    type=$1
 +    shift 1
 +    flags=$(filter_out '-l*|*.so' $@)
 +    libs=$(filter '-l*|*.so' $@)
 +    test_$type $($cflags_filter $flags) || return
      flags=$($ldflags_filter $flags)
      libs=$($ldflags_filter $libs)
 -    test_cmd $ld $LDFLAGS $flags $(ld_o $TMPE) $TMPO $libs $extralibs
 +    test_cmd $ld $LDFLAGS $LDEXEFLAGS $flags $(ld_o $TMPE) $TMPO $libs $extralibs
  }
  
  check_ld(){
@@@ -1510,17 -1198,9 +1518,9 @@@ require_cpp_condition()
  require_pkg_config(){
      log require_pkg_config "$@"
      pkg_version="$2"
 -    check_pkg_config "$@" || die "ERROR: $pkg_version not found"
 +    check_pkg_config "$@" || die "ERROR: $pkg_version not found using pkg-config$pkg_config_fail_message"
  }
  
- hostcc_e(){
-     eval printf '%s\\n' $HOSTCC_E
- }
- 
- hostcc_o(){
-     eval printf '%s\\n' $HOSTCC_O
- }
- 
  test_host_cc(){
      log test_host_cc "$@"
      cat > $TMPC