aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-05 12:37:15 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-03-05 12:37:15 +0100
commit1567095acf03f712b511a5b6fc7f56e8b0044482 (patch)
tree8736e8e8f8bf1dfb9a64220d3ec0b36caeded600 /configure
parent1cb3ca2a67fefa097de12fa163a0be42018592af (diff)
parent2a7ab2dfaa7d5eeceb2d449230857bfcf6bfc9d6 (diff)
downloadffmpeg-1567095acf03f712b511a5b6fc7f56e8b0044482.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: configure: Use check_builtin() where appropriate Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure7
1 files changed, 3 insertions, 4 deletions
diff --git a/configure b/configure
index 0c751b949d..2e7344ccad 100755
--- a/configure
+++ b/configure
@@ -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