mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-03-28 12:32:17 +02:00
Merge commit '18dc1ff0fb4572b1d50a44905aa1e76bc3bbb0ad'
* commit '18dc1ff0fb4572b1d50a44905aa1e76bc3bbb0ad': configure: Add check_ld() helper function to simplify some expressions Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
commit
c00b218a8f
15
configure
vendored
15
configure
vendored
@ -1035,6 +1035,15 @@ test_ld(){
|
||||
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(){
|
||||
hdr=$1
|
||||
test "${hdr%.h}" = "${hdr}" &&
|
||||
@ -5468,8 +5477,8 @@ EOF
|
||||
:
|
||||
elif ! test_cpp_condition stddef.h "defined __ARM_PCS || defined __SOFTFP__" && [ $target_os != darwin ]; then
|
||||
case "${cross_prefix:-$cc}" in
|
||||
*hardfloat*) enable vfp_args; fpabi=vfp ;;
|
||||
*) test_ld "cc" <<EOF && enable vfp_args && fpabi=vfp || fpabi=soft ;;
|
||||
*hardfloat*) enable vfp_args; fpabi=vfp ;;
|
||||
*) check_ld "cc" vfp_args <<EOF && fpabi=vfp || fpabi=soft ;;
|
||||
__asm__ (".eabi_attribute 28, 1");
|
||||
int main(void) { return 0; }
|
||||
EOF
|
||||
@ -6406,7 +6415,7 @@ enabled xmm_clobber_test &&
|
||||
-Wl,--wrap,sws_scale ||
|
||||
disable xmm_clobber_test
|
||||
|
||||
test_ld "cc" <<EOF && enable proper_dce
|
||||
check_ld "cc" proper_dce <<EOF
|
||||
extern const int array[512];
|
||||
static inline int func(void) { return array[0]; }
|
||||
int main(void) { return 0; }
|
||||
|
Loading…
x
Reference in New Issue
Block a user