RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master' 

* qatar/master:
  configure: Use check_builtin() where appropriate

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-03-05 12:37:15 +01:00
parent 1cb3ca2a67 2a7ab2dfaa
commit 1567095acf
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure vendored
View File

@ -1041,7 +1041,7 @@ check_builtin(){
builtin=$3
shift 3
disable "$name"
check_code ld "$headers" "$builtin" "$@" && enable "$name"
check_code ld "$headers" "$builtin" "cc" "$@" && enable "$name"
}
require(){
@ -3654,9 +3654,8 @@ elif enabled sparc; then
elif enabled x86; then
check_code ld intrin.h "__rdtsc()" "cc" && enable rdtsc
check_code ld mmintrin.h "_mm_empty()" "cc" && enable mm_empty
check_builtin rdtsc intrin.h "__rdtsc()"
check_builtin mm_empty mmintrin.h "_mm_empty()"
enable local_aligned_8 local_aligned_16