On Sat, 9 Aug 2014, Janne Grunau wrote:

On 2014-08-09 08:06:12 -0700, Diego Biurrun wrote:
---

Implemented Janne's suggestion.  Untested since I don't have the right system.

 configure | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 46b8391..7c2fab6 100755
--- a/configure
+++ b/configure
@@ -2199,8 +2199,6 @@ ranlib="ranlib"
 strip="strip"
 yasmexe="yasm"

-nogas=":"
-
 # machine
 arch_default=$(uname -m)
 cpu="generic"
@@ -3420,7 +3418,6 @@ case $target_os in
         add_extralibs -lpoll -lgnugetopt
         ;;
     darwin)
-        gas="gas-preprocessor.pl $cc"
         enabled ppc && add_asflags -force_cpusubtype_ALL
         SHFLAGS='-dynamiclib -Wl,-single_module 
-Wl,-install_name,$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR),-current_version,$(LIBVERSION),-compatibility_version,$(LIBMAJOR)'
         enabled x86_32 && append SHFLAGS -Wl,-read_only_relocs,suppress
@@ -3779,9 +3776,21 @@ EOF
 }

 if enabled_any arm aarch64 || enabled_all ppc altivec && enabled asm; then
+    nogas=:
     enabled_any arm aarch64 && nogas=die
     enabled_all ppc altivec && nogas=warn

+    case $as_type

Missing 'in' at the end

+        arm*) gaspp_as_type=armasm ;;

We don't have any assembler probing that actually identifies armasm at the moment, but I could try adding it.

+        gcc)  gaspp_as_type=gas ;;
+        *)    gaspp_as_type=$as_type ;;
+    esac
+
+    [ $target_os = "darwin" ] && gaspp_as_type="apple-$as_type"
+
+    check_cmd gas-preprocessor.pl -arch $arch -as-type $gaspp_as_type &&

This only gives "Unrecognized input filetype at gas-preprocessor.pl line 95." Something like "check_cmd gas-preprocessor.pl -arch $arch -as-type $gaspp_as_type -- $as -v" could work, but armasm doesn't support -v (doing that returns a failure). We could do $as -h though, but that doesn't work with e.g. clang. So we'd have to do $as $as_noop, with as_noop set differently depending on assembler type.

+        gas="gas-preprocessor.pl -arch $arch -as-type $gaspp_as_type $as"

missing '--' to divide gaspp options from the assembler cmd line. looks
good otherwise. I'll test aarch64/arm with Xcode on darwin and llvm on
linux. Martin can hopefully test armasm.

I got all of this working now, with a few tweaks on top of this - I'll send those patches for review as RFC.

// Martin
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to