har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '18dc1ff0fb4572b1d50a44905aa1e76bc3bbb0ad'

Browse Source 
* commit '18dc1ff0fb4572b1d50a44905aa1e76bc3bbb0ad':
  configure: Add check_ld() helper function to simplify some expressions

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2018-03-28 15:19:35 -03:00
commit c00b218a8f
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure vendored
View File

@ -1035,6 +1035,15 @@ test_ld(){
test_cmd $ld $LDFLAGS $LDEXEFLAGS $flags $(ld_o $TMPE) $TMPO $libs $extralibs test_cmd $ld $LDFLAGS $LDEXEFLAGS $flags $(ld_o $TMPE) $TMPO $libs $extralibs
} }
check_ld(){
log check_ld "$@"
type=$1
name=$2
shift 2
disable $name
test_ld $type $@ && enable $name
}
print_include(){ print_include(){
hdr=$1 hdr=$1
test "${hdr%.h}" = "${hdr}" && test "${hdr%.h}" = "${hdr}" &&
@ -5469,7 +5478,7 @@ EOF
elif ! test_cpp_condition stddef.h "defined __ARM_PCS || defined __SOFTFP__" && [ $target_os != darwin ]; then elif ! test_cpp_condition stddef.h "defined __ARM_PCS || defined __SOFTFP__" && [ $target_os != darwin ]; then
case "${cross_prefix:-$cc}" in case "${cross_prefix:-$cc}" in
*hardfloat*) enable vfp_args; fpabi=vfp ;; *hardfloat*) enable vfp_args; fpabi=vfp ;;
*) test_ld "cc" <<EOF && enable vfp_args && fpabi=vfp || fpabi=soft ;; *) check_ld "cc" vfp_args <<EOF && fpabi=vfp || fpabi=soft ;;
__asm__ (".eabi_attribute 28, 1"); __asm__ (".eabi_attribute 28, 1");
int main(void) { return 0; } int main(void) { return 0; }
EOF EOF
@ -6406,7 +6415,7 @@ enabled xmm_clobber_test &&
-Wl,--wrap,sws_scale || -Wl,--wrap,sws_scale ||
disable xmm_clobber_test disable xmm_clobber_test
test_ld "cc" <<EOF && enable proper_dce check_ld "cc" proper_dce <<EOF
extern const int array[512]; extern const int array[512];
static inline int func(void) { return array[0]; } static inline int func(void) { return array[0]; }
int main(void) { return 0; } int main(void) { return 0; }