shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge changes from topic "llvm-mingw"

* changes:
  configure: Add an arm64-win64-gcc target
  test: Check for ARCH_X86_64 in addition to _WIN64
  configure: Add an armv7-win32-gcc target
  ads2gas: Add a -noelf option

--- a/build/make/ads2gas.pl

+++ b/build/make/ads2gas.pl

@@ -23,9 +23,11 @@

 use thumb;

 my $thumb = 0;

+my $elf = 1;

 foreach my $arg (@ARGV) {

     $thumb = 1 if ($arg eq "-thumb");

+    $elf = 0 if ($arg eq "-noelf");

 }

 print "@ This file was created from a .asm file\n";

@@ -140,7 +142,11 @@

     # Make function visible to linker, and make additional symbol with

     # prepended underscore

-    s/EXPORT\s+\|([\$\w]*)\|/.global $1 \n\t.type $1, function/;

+    if ($elf) {

+        s/EXPORT\s+\|([\$\w]*)\|/.global $1 \n\t.type $1, function/;

+    } else {

+        s/EXPORT\s+\|([\$\w]*)\|/.global $1/;

+    }

     s/IMPORT\s+\|([\$\w]*)\|/.global $1/;

     s/EXPORT\s+([\$\w]*)/.global $1/;

@@ -181,11 +187,16 @@

     # eabi_attributes numerical equivalents can be found in the

     # "ARM IHI 0045C" document.

-    # REQUIRE8 Stack is required to be 8-byte aligned

-    s/\sREQUIRE8/.eabi_attribute 24, 1 \@Tag_ABI_align_needed/g;

+    if ($elf) {

+        # REQUIRE8 Stack is required to be 8-byte aligned

+        s/\sREQUIRE8/.eabi_attribute 24, 1 \@Tag_ABI_align_needed/g;

-    # PRESERVE8 Stack 8-byte align is preserved

-    s/\sPRESERVE8/.eabi_attribute 25, 1 \@Tag_ABI_align_preserved/g;

+        # PRESERVE8 Stack 8-byte align is preserved

+        s/\sPRESERVE8/.eabi_attribute 25, 1 \@Tag_ABI_align_preserved/g;

+    } else {

+        s/\sREQUIRE8//;

+        s/\sPRESERVE8//;

+    }

     # Use PROC and ENDP to give the symbols a .size directive.

     # This makes them show up properly in debugging tools like gdb and valgrind.

@@ -202,7 +213,7 @@

         my $proc;

         s/\bENDP\b/@ $&/;

         $proc = pop(@proc_stack);

-        $_ = "\t.size $proc, .-$proc".$_ if ($proc);

+        $_ = "\t.size $proc, .-$proc".$_ if ($proc and $elf);

     }

     # EQU directive

@@ -225,4 +236,4 @@

 }

 # Mark that this object doesn't need an executable stack.

-printf ("\t.section\t.note.GNU-stack,\"\",\%\%progbits\n");

+printf ("\t.section\t.note.GNU-stack,\"\",\%\%progbits\n") if $elf;

--- a/build/make/configure.sh

+++ b/build/make/configure.sh

@@ -941,7 +941,6 @@

           setup_gnu_toolchain

           arch_int=${tgt_isa##armv}

           arch_int=${arch_int%%te}

-          check_add_asflags --defsym ARCHITECTURE=${arch_int}

           tune_cflags="-mtune="

           if [ ${tgt_isa} = "armv7" ] || [ ${tgt_isa} = "armv7s" ]; then

             if [ -z "${float_abi}" ]; then

@@ -968,6 +967,19 @@

           enabled debug && add_asflags -g

           asm_conversion_cmd="${source_path}/build/make/ads2gas.pl"

+

+          case ${tgt_os} in

+            win*)

+              asm_conversion_cmd="$asm_conversion_cmd -noelf"

+              AS="$CC -c"

+              EXE_SFX=.exe

+              enable_feature thumb

+              ;;

+            *)

+              check_add_asflags --defsym ARCHITECTURE=${arch_int}

+              ;;

+          esac

+

           if enabled thumb; then

             asm_conversion_cmd="$asm_conversion_cmd -thumb"

             check_add_cflags -mthumb

--- a/configure

+++ b/configure

@@ -101,11 +101,13 @@

 all_platforms="${all_platforms} arm64-android-gcc"

 all_platforms="${all_platforms} arm64-darwin-gcc"

 all_platforms="${all_platforms} arm64-linux-gcc"

+all_platforms="${all_platforms} arm64-win64-gcc"

 all_platforms="${all_platforms} armv7-android-gcc"   #neon Cortex-A8

 all_platforms="${all_platforms} armv7-darwin-gcc"    #neon Cortex-A8

 all_platforms="${all_platforms} armv7-linux-rvct"    #neon Cortex-A8

 all_platforms="${all_platforms} armv7-linux-gcc"     #neon Cortex-A8

 all_platforms="${all_platforms} armv7-none-rvct"     #neon Cortex-A8

+all_platforms="${all_platforms} armv7-win32-gcc"

 all_platforms="${all_platforms} armv7-win32-vs11"

 all_platforms="${all_platforms} armv7-win32-vs12"

 all_platforms="${all_platforms} armv7-win32-vs14"

--- a/test/register_state_check.h

+++ b/test/register_state_check.h

@@ -28,7 +28,7 @@

 //   See platform implementations of RegisterStateCheckXXX for details.

 //

-#if defined(_WIN64)

+#if defined(_WIN64) && ARCH_X86_64

 #undef NOMINMAX

 #define NOMINMAX

@@ -138,7 +138,7 @@

 }  // namespace libvpx_test

-#endif  // _WIN64

+#endif  // _WIN64 && ARCH_X86_64

 #if ARCH_X86

 #if defined(__GNUC__)

-- 

⑨