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

configure: improve GNU as checking

Browse Source 
Check for GNU assembler only when asm is enabled.  Show a warning for
ppc/altivec only, and fail on ARM.

Originally committed as revision 23964 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2010-07-02 02:03:20 +00:00
parent cb9b39fba9
commit 301ab19dd9
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure vendored
View File

@ -1411,6 +1411,7 @@ objformat="elf"
ranlib="ranlib" ranlib="ranlib"
strip_default="strip" strip_default="strip"
yasmexe="yasm" yasmexe="yasm"
nogas=":"
nm_opts='-g' nm_opts='-g'
@ -2117,7 +2118,7 @@ case $target_os in
;; ;;
darwin) darwin)
enable malloc_aligned enable malloc_aligned
as="gas-preprocessor.pl $cc" gas="gas-preprocessor.pl $cc"
enabled ppc && add_asflags -force_cpusubtype_ALL enabled ppc && add_asflags -force_cpusubtype_ALL
SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(SHLIBDIR)/$(SLIBNAME),-current_version,$(LIBVERSION),-compatibility_version,$(LIBMAJOR) -Wl,-read_only_relocs,suppress' SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(SHLIBDIR)/$(SLIBNAME),-current_version,$(LIBVERSION),-compatibility_version,$(LIBMAJOR) -Wl,-read_only_relocs,suppress'
strip="${strip} -x" strip="${strip} -x"
@ -2309,9 +2310,6 @@ unsigned int endian = 'B' << 24 | 'I' << 16 | 'G' << 8 | 'E';
EOF EOF
od -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian od -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian
check_asm gnu_as '".macro m n\n\\n:.int 0\n.endm\nm x"' ||
warn "GNU assembler not found, install gas-preprocessor"
if enabled alpha; then if enabled alpha; then
check_cflags -mieee check_cflags -mieee
@ -2319,6 +2317,7 @@ if enabled alpha; then
elif enabled arm; then elif enabled arm; then
check_cflags -marm check_cflags -marm
nogas=die
check_ld <<EOF && enable vfp_args check_ld <<EOF && enable vfp_args
__asm__ (".eabi_attribute 28, 1"); __asm__ (".eabi_attribute 28, 1");
@ -2353,6 +2352,7 @@ elif enabled ppc; then
# AltiVec flags: The FSF version of GCC differs from the Apple version # AltiVec flags: The FSF version of GCC differs from the Apple version
if enabled altivec; then if enabled altivec; then
nogas=warn
check_cflags -maltivec -mabi=altivec && check_cflags -maltivec -mabi=altivec &&
{ check_header altivec.h && inc_altivec_h="#include <altivec.h>" ; } || { check_header altivec.h && inc_altivec_h="#include <altivec.h>" ; } ||
check_cflags -faltivec check_cflags -faltivec
@ -2437,6 +2437,12 @@ EOF
fi fi
if enabled asm; then
as=${gas:=$as}
check_asm gnu_as '".macro m n\n\\n:.int 0\n.endm\nm x"' ||
$nogas "GNU assembler not found, install gas-preprocessor"
fi
if check_func dlopen; then if check_func dlopen; then
ldl= ldl=
elif check_func dlopen -ldl; then elif check_func dlopen -ldl; then