From patchwork Tue Jun 20 22:49:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 4066 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.22.4 with SMTP id 4csp1618652vsw; Tue, 20 Jun 2017 15:51:17 -0700 (PDT) X-Received: by 10.223.172.231 with SMTP id o94mr21914169wrc.201.1497999077589; Tue, 20 Jun 2017 15:51:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497999077; cv=none; d=google.com; s=arc-20160816; b=zYxF3VXU7wz7Tp5eg1mqjeOjinjEyeswUJKmzCEvVM3AgzJv0/kNIEzPsUxAMUiDNM QtnFBaFAJ1VebFVRggeODAkqrhLOpll36t3XXJVYvrF3DJnn/1Q947DYR5IS6w+GlLhl PcPr+YdjbZJLz4iZT0fgpqeLH5vZkwUfJy1kdy+bAjseZW89qIQtUT257FV3ZkTAUxXU dmZ7sTwwLDq13+1e9E3+QKVi3hVY4DIbM6FEL3SFPi86XW3t8x5p3fupHOnpHWbepPvY ybYRWGNIlOIEoIQ9reL2IFxL2550CoIHgqfCSu3bRh19JAy75VIy+c0odeiR5F5r1NQx eWnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=kSWf3cLoWf5M3+FXRWkg33zjXG+scAgmlnuAVpE2lcI=; b=J1SajAtw+TbmTOppzksGcXCBuxnrPoScAQFcdFtRbKSHCsyQfb9OHAf5evQdUkL+kT xrbHj8njHno0HRQd9YceC/sgV8nGW6Wxc8GLw7UOXFiFRmS9SuwBbHle3Hm2iwwvVH95 0QhAgTBSXtpMJuDKk9TWAf/GKOP7i83yZWxTfJqXvgO6i9Z8BVe3QueZyUFyTditpNHp 44xujTqZwsSSThTJvKUIWNWW5SMFzUottwXB78u/ArKGmWKH2R5lzbdEd2uPe6N/AKPf muBnX6DByzLLn49IrlcZix+V7BfLUyIsrIEVgYDOF3jb60zgsYH+yss/OuY2xYc4QXpI t0vQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=uYtEZ0G9; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y123si10661789wmd.16.2017.06.20.15.51.17; Tue, 20 Jun 2017 15:51:17 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=uYtEZ0G9; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F2E0968A355; Wed, 21 Jun 2017 01:50:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f196.google.com (mail-qt0-f196.google.com [209.85.216.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2AF4268A326 for ; Wed, 21 Jun 2017 01:50:38 +0300 (EEST) Received: by mail-qt0-f196.google.com with SMTP id c20so1085630qte.0 for ; Tue, 20 Jun 2017 15:50:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=S+/3n51uK6YVqfg0uJYNp1ryhvOV0tRq3GTQB+10QDE=; b=uYtEZ0G9ajaJFipktCxH+HW65xyyBY27KVJf1a+/uW2VLuNYjmJ19FiU0D+r+h3oVD NYwK7hC0oAwWsk1BePh678ksNh77+VSI5L5QxLFB6d8Kph/Mbjf4D3qcPfqSMoHGHqxp ZCKxAewgdZ6lbqgnvzPYwa9frDNr1aqGQU8FfKUdowiClsyw8X0DulZT5W61hQWspHyC FMcadHD3y/eJpbcSvxXzmweVCaBDrot9i4ZMVzZBXo1eKVwrEcB1JnfnsSrOkI/ZI7ng aQDJWNgcO7/RNy2uTiE+2lzmT9/w0AqsX0GJ4JiyHkD9JK3+XUGe+mrcQ2yuuJzm6XA2 J/Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=S+/3n51uK6YVqfg0uJYNp1ryhvOV0tRq3GTQB+10QDE=; b=asz1YHmHu9hXmDjiKk5qlAZUhgxvFZy2be0sqA73uDORw5F2aOhdnK1dRUUvmU+UfR V4la2L7y/eu0D3chdhhsrFMJhfFW+uKYEJWOCp8eQI83aIR3a+sAYT8yIh+UDD13gcyF EgsxaIVuwMkv34mCFe6y//rwdqGUbuVx+L2hlnJ+NkXnX100EJ38762UYABICFTfmr1X UOLDxnvY6DjkN1e63+FL+yvpkFq/mtDJBr8yaDkXdpvyWBGNqe6+9aaKoWpa4MWE2oxf LlMUDKa1SxLWOWjn7z8RdCSbtx1JMICJNtJ/FE2Ih1hfdIMsRUdcdxBIAapGr4RAJtE+ o5RA== X-Gm-Message-State: AKS2vOy//uLFGYnRR4J3//v8/ep5p5IcOqT3fYW+Tp5kemUUmW9mfHZG +slZdIsFedM+Pm2v X-Received: by 10.200.43.105 with SMTP id 38mr38746966qtv.6.1497999042615; Tue, 20 Jun 2017 15:50:42 -0700 (PDT) Received: from localhost.localdomain ([181.231.116.134]) by smtp.gmail.com with ESMTPSA id o3sm9880465qtb.57.2017.06.20.15.50.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 20 Jun 2017 15:50:42 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Jun 2017 19:49:57 -0300 Message-Id: <20170620224959.2008-4-jamrial@gmail.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170620224959.2008-1-jamrial@gmail.com> References: <20170620224959.2008-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/5] build: Explicitly set 32-bit/64-bit object formats for nasm/yasm X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Diego Biurrun Consistently use object format names with "32" suffix and set object format to "win64" on Windows x86_64, which fixes assembling with nasm. (Cherry-picked from libav commit 808ef43597b1e3d6e69a5b9abe2237c8ddb97b44) Signed-off-by: James Almer --- configure | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/configure b/configure index 2f18a2bb0d..170089753a 100755 --- a/configure +++ b/configure @@ -3254,7 +3254,6 @@ doxygen_default="doxygen" install="install" ln_s_default="ln -s -f" nm_default="nm -g" -objformat="elf" pkg_config_default=pkg-config ranlib_default="ranlib" strip_default="strip" @@ -4796,6 +4795,8 @@ esac enable $subarch enabled spic && enable_weak pic +enabled x86_64 && objformat=elf64 || objformat="elf32" + # OS specific case $target_os in aix) @@ -4866,7 +4867,7 @@ case $target_os in SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME).$(LIBVERSION)$(SLIBSUF)' SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME).$(LIBMAJOR)$(SLIBSUF)' objformat="macho" - enabled x86_64 && objformat="macho64" + enabled x86_64 && objformat="macho64" || objformat="macho32" enabled_any pic shared x86_64 || { check_cflags -mdynamic-no-pic && add_asflags -mdynamic-no-pic; } check_header dispatch/dispatch.h && @@ -4910,7 +4911,7 @@ case $target_os in SLIB_INSTALL_EXTRA_SHLIB='$(SLIBNAME:$(SLIBSUF)=.lib)' 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,--disable-auto-image-base' - objformat="win32" + enabled x86_64 && objformat="win64" || objformat="win32" ranlib=: enable dos_paths check_ldflags -Wl,--nxcompat,--dynamicbase @@ -4950,7 +4951,7 @@ case $target_os in SLIB_INSTALL_EXTRA_SHLIB='$(SLIBNAME:$(SLIBSUF)=.lib)' SLIB_INSTALL_EXTRA_LIB='$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.def)' SHFLAGS='-dll -def:$$(@:$(SLIBSUF)=.def) -implib:$(SUBDIR)$(SLIBNAME:$(SLIBSUF)=.lib)' - objformat="win32" + enabled x86_64 && objformat="win64" || objformat="win32" ranlib=: enable dos_paths ;; @@ -4965,7 +4966,7 @@ case $target_os in SLIB_INSTALL_LINKS= SLIB_INSTALL_EXTRA_LIB='lib$(FULLNAME).dll.a' SHFLAGS='-shared -Wl,--out-implib,$(SUBDIR)lib$(FULLNAME).dll.a' - objformat="win32" + enabled x86_64 && objformat="win64" || objformat="win32" enable dos_paths enabled shared && ! enabled small && check_cmd $windres --version && enable gnu_windres add_cppflags -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600 @@ -5376,7 +5377,8 @@ EOF EOF # llvm's integrated assembler supports .object_arch from llvm 3.5 - [ "$objformat" = elf ] && check_as <