virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

build: Explicitly set 32-bit/64-bit object formats for nasm/yasm

Browse Source 
Consistently use object format names with "32" suffix and set object format
to "win64" on Windows x86_64, which fixes assembling with nasm.
This commit is contained in:
Diego Biurrun
2017-03-01 19:42:21 +01:00
parent 6eef263aca
commit 808ef43597
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
configure vendored
View File

@@ -2563,7 +2563,6 @@ cc_default="gcc"
host_cc_default="gcc" host_cc_default="gcc"
ln_s="ln -s -f" ln_s="ln -s -f"
nm_default="nm -g" nm_default="nm -g"
objformat="elf"
pkg_config_default=pkg-config pkg_config_default=pkg-config
ranlib="ranlib" ranlib="ranlib"
strip="strip" strip="strip"
@@ -3883,6 +3882,8 @@ esac
enable $subarch enable $subarch
enabled spic && enable_weak pic enabled spic && enable_weak pic
enabled x86_64 && objformat=elf64 || objformat="elf32"
# OS specific # OS specific
case $target_os in case $target_os in
aix) aix)
@@ -3947,8 +3948,7 @@ case $target_os in
SLIBSUF=".dylib" SLIBSUF=".dylib"
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME).$(LIBVERSION)$(SLIBSUF)' SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME).$(LIBVERSION)$(SLIBSUF)'
SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME).$(LIBMAJOR)$(SLIBSUF)' SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME).$(LIBMAJOR)$(SLIBSUF)'
objformat="macho" enabled x86_64 && objformat="macho64" || objformat="macho32"
enabled x86_64 && objformat="macho64"
enabled_any pic shared || enabled_any pic shared ||
{ check_cflags -mdynamic-no-pic && add_asflags -mdynamic-no-pic; } { check_cflags -mdynamic-no-pic && add_asflags -mdynamic-no-pic; }
check_header dispatch/dispatch.h && check_header dispatch/dispatch.h &&
@@ -3982,7 +3982,7 @@ case $target_os in
SLIB_INSTALL_EXTRA_SHLIB='$(SLIBNAME:$(SLIBSUF)=.lib)' SLIB_INSTALL_EXTRA_SHLIB='$(SLIBNAME:$(SLIBSUF)=.lib)'
SLIB_INSTALL_EXTRA_LIB='lib$(SLIBNAME:$(SLIBSUF)=.dll.a) $(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.def)' SLIB_INSTALL_EXTRA_LIB='lib$(SLIBNAME:$(SLIBSUF)=.dll.a) $(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.def)'
SHFLAGS='-shared -Wl,--output-def,$$(@:$(SLIBSUF)=.orig.def) -Wl,--out-implib,$(SUBDIR)lib$(SLIBNAME:$(SLIBSUF)=.dll.a) -Wl,--enable-runtime-pseudo-reloc -Wl,--enable-auto-image-base' SHFLAGS='-shared -Wl,--output-def,$$(@:$(SLIBSUF)=.orig.def) -Wl,--out-implib,$(SUBDIR)lib$(SLIBNAME:$(SLIBSUF)=.dll.a) -Wl,--enable-runtime-pseudo-reloc -Wl,--enable-auto-image-base'
objformat="win32" enabled x86_64 && objformat="win64" || objformat="win32"
dlltool="${cross_prefix}dlltool" dlltool="${cross_prefix}dlltool"
ranlib=: ranlib=:
enable dos_paths enable dos_paths
@@ -4007,7 +4007,7 @@ case $target_os in
SLIB_INSTALL_EXTRA_SHLIB='$(SLIBNAME:$(SLIBSUF)=.lib)' SLIB_INSTALL_EXTRA_SHLIB='$(SLIBNAME:$(SLIBSUF)=.lib)'
SLIB_INSTALL_EXTRA_LIB='$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.def)' SLIB_INSTALL_EXTRA_LIB='$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.def)'
SHFLAGS='-dll -def:$$(@:$(SLIBSUF)=.def) -implib:$(SUBDIR)$(SLIBNAME:$(SLIBSUF)=.lib)' SHFLAGS='-dll -def:$$(@:$(SLIBSUF)=.def) -implib:$(SUBDIR)$(SLIBNAME:$(SLIBSUF)=.lib)'
objformat="win32" enabled x86_64 && objformat="win64" || objformat="win32"
ranlib=: ranlib=:
enable dos_paths enable dos_paths
;; ;;
@@ -4022,7 +4022,7 @@ case $target_os in
SLIB_INSTALL_LINKS= SLIB_INSTALL_LINKS=
SLIB_INSTALL_EXTRA_LIB='lib$(NAME).dll.a' SLIB_INSTALL_EXTRA_LIB='lib$(NAME).dll.a'
SHFLAGS='-shared -Wl,--out-implib,$(SUBDIR)lib$(NAME).dll.a' SHFLAGS='-shared -Wl,--out-implib,$(SUBDIR)lib$(NAME).dll.a'
objformat="win32" enabled x86_64 && objformat="win64" || objformat="win32"
enable dos_paths enable dos_paths
;; ;;
*-dos|freedos|opendos) *-dos|freedos|opendos)
@@ -4376,7 +4376,8 @@ EOF
EOF EOF
# llvm's integrated assembler supports .object_arch from llvm 3.5 # llvm's integrated assembler supports .object_arch from llvm 3.5
[ "$objformat" = elf ] && check_as <<EOF && enable as_object_arch [ "$objformat" = elf32 ] || [ "$objformat" = elf64 ] &&
check_as <<EOF && enable as_object_arch
.object_arch armv4 .object_arch armv4
EOF EOF
@@ -4475,17 +4476,15 @@ EOF
if ! disabled_any asm mmx x86asm; then if ! disabled_any asm mmx x86asm; then
if check_cmd $x86asmexe --version; then if check_cmd $x86asmexe --version; then
enabled x86_64 && x86asm_extra="-m amd64"
x86asm_debug="-g dwarf2" x86asm_debug="-g dwarf2"
X86ASMDEP='$(DEPX86ASM) $(X86ASMFLAGS) -M $(X86ASM_O) $< > $(@:.o=.d)' X86ASMDEP='$(DEPX86ASM) $(X86ASMFLAGS) -M $(X86ASM_O) $< > $(@:.o=.d)'
elif check_cmd nasm -v; then elif check_cmd nasm -v; then
x86asmexe=nasm x86asmexe=nasm
x86asm_debug="-g -F dwarf" x86asm_debug="-g -F dwarf"
X86ASM_DEPFLAGS='-MD $(@:.o=.d)' X86ASM_DEPFLAGS='-MD $(@:.o=.d)'
enabled x86_64 && test "$objformat" = elf && objformat=elf64
fi fi
X86ASMFLAGS="-f $objformat $x86asm_extra" X86ASMFLAGS="-f $objformat"
enabled pic && append X86ASMFLAGS "-DPIC" enabled pic && append X86ASMFLAGS "-DPIC"
test -n "$extern_prefix" && append X86ASMFLAGS "-DPREFIX" test -n "$extern_prefix" && append X86ASMFLAGS "-DPREFIX"
case "$objformat" in case "$objformat" in