Attachment 183816 Details for Bug 220291 – Patch to build for arm64

[patch] Patch to build for arm64

chromium.diff (text/plain), 5.81 KB, created by Andrew Turner on 2017-06-26 18:20:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Turner

Created: 2017-06-26 18:20:06 UTC

Size: 5.81 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 444357)
>+++ Makefile	(working copy)
>@@ -58,7 +58,7 @@
> RUN_DEPENDS=	xdg-open:devel/xdg-utils \
> 		droid-fonts-ttf>0:x11-fonts/droid-fonts-ttf
> 
>-ONLY_FOR_ARCHS=	amd64 i386
>+ONLY_FOR_ARCHS=	aarch64 amd64 i386
> USES=		bison compiler cpe desktop-file-utils execinfo jpeg \
> 		ninja perl5 pkgconfig python:2,build shebangfix tar:xz
> 
>Index: files/patch-base_sys__info__posix.cc
>===================================================================
>--- files/patch-base_sys__info__posix.cc	(revision 444357)
>+++ files/patch-base_sys__info__posix.cc	(working copy)
>@@ -18,3 +18,12 @@
>  int SysInfo::NumberOfProcessors() {
>    return g_lazy_number_of_processors.Get().value();
>  }
>+@@ -195,6 +195,8 @@ std::string SysInfo::OperatingSystemArchitecture() {
>+     arch = "x86";
>+   } else if (arch == "amd64") {
>+     arch = "x86_64";
>++  } else if (arch == "arm64") {
>++    arch = "aarch64";
>+   }
>+   return arch;
>+ }
>Index: files/patch-build_config_compiler_BUILD.gn
>===================================================================
>--- files/patch-build_config_compiler_BUILD.gn	(revision 444357)
>+++ files/patch-build_config_compiler_BUILD.gn	(working copy)
>@@ -1,5 +1,5 @@
>---- build/config/compiler/BUILD.gn.orig	2017-06-05 21:03:01.000000000 +0200
>-+++ build/config/compiler/BUILD.gn	2017-06-13 16:28:04.062660000 +0200
>+--- build/config/compiler/BUILD.gn.orig	2017-06-20 22:03:10.000000000 +0000
>++++ build/config/compiler/BUILD.gn	2017-06-26 17:10:17.493190000 +0000
> @@ -37,7 +37,7 @@
>    # only two architectures that are currently checked in). Turn this off when
>    # you are using a custom toolchain and need to control -B in cflags.
>@@ -80,6 +80,15 @@
>        ldflags += [ "-Wl,-plugin-opt,-function-sections" ]
>      }
>    }
>+@@ -584,7 +584,7 @@
>+         cflags += [ "-mtune=$arm_tune" ]
>+       }
>+     } else if (current_cpu == "arm64") {
>+-      if (is_clang && !is_android && !is_nacl) {
>++      if (is_clang && !is_android && !is_nacl && !is_bsd) {
>+         cflags += [ "--target=aarch64-linux-gnu" ]
>+         ldflags += [ "--target=aarch64-linux-gnu" ]
>+       }
> @@ -781,7 +781,7 @@
>  #   configs -= [ "//build/config/compiler:clang_stackrealign" ]
>  # See https://crbug.com/556393 for details of where it must be avoided.
>Index: files/patch-build_toolchain_linux_BUILD.gn
>===================================================================
>--- files/patch-build_toolchain_linux_BUILD.gn	(nonexistent)
>+++ files/patch-build_toolchain_linux_BUILD.gn	(working copy)
>@@ -0,0 +1,10 @@
>+--- build/toolchain/linux/BUILD.gn.orig	2017-06-22 07:22:30.798609000 +0000
>++++ build/toolchain/linux/BUILD.gn	2017-06-22 07:22:41.931974000 +0000
>+@@ -14,7 +14,6 @@
>+ }
>+ 
>+ clang_toolchain("clang_arm64") {
>+-  toolprefix = "aarch64-linux-gnu-"
>+   toolchain_args = {
>+     current_cpu = "arm64"
>+     current_os = "linux"
>
>Property changes on: files/patch-build_toolchain_linux_BUILD.gn
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-third__party_boringssl_src_crypto_cpu_aarch64_linux.c
>===================================================================
>--- files/patch-third__party_boringssl_src_crypto_cpu_aarch64_linux.c	(nonexistent)
>+++ files/patch-third__party_boringssl_src_crypto_cpu_aarch64_linux.c	(working copy)
>@@ -0,0 +1,40 @@
>+--- third_party/boringssl/src/crypto/cpu-aarch64-linux.c.orig	2017-06-21 14:20:44.695955000 +0000
>++++ third_party/boringssl/src/crypto/cpu-aarch64-linux.c	2017-06-21 14:24:50.411622000 +0000
>+@@ -16,7 +16,9 @@
>+ 
>+ #if defined(OPENSSL_AARCH64) && !defined(OPENSSL_STATIC_ARMCAP)
>+ 
>++#if defined(OPENSSL_LINUX)
>+ #include <sys/auxv.h>
>++#endif
>+ 
>+ #include <openssl/arm_arch.h>
>+ 
>+@@ -26,6 +28,7 @@
>+ extern uint32_t OPENSSL_armcap_P;
>+ 
>+ void OPENSSL_cpuid_setup(void) {
>++#if defined(OPENSSL_LINUX)
>+   unsigned long hwcap = getauxval(AT_HWCAP);
>+ 
>+   /* See /usr/include/asm/hwcap.h on an aarch64 installation for the source of
>+@@ -41,9 +44,11 @@
>+      * either. */
>+     return;
>+   }
>++#endif
>+ 
>+   OPENSSL_armcap_P |= ARMV7_NEON;
>+ 
>++#if defined(OPENSSL_LINUX)
>+   if (hwcap & kAES) {
>+     OPENSSL_armcap_P |= ARMV8_AES;
>+   }
>+@@ -56,6 +61,7 @@
>+   if (hwcap & kSHA256) {
>+     OPENSSL_armcap_P |= ARMV8_SHA256;
>+   }
>++#endif
>+ }
>+ 
>+ #endif /* OPENSSL_AARCH64 && !OPENSSL_STATIC_ARMCAP */
>
>Property changes on: files/patch-third__party_boringssl_src_crypto_cpu_aarch64_linux.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-v8_base_cpu.cc
>===================================================================
>--- files/patch-v8_base_cpu.cc	(nonexistent)
>+++ files/patch-v8_base_cpu.cc	(working copy)
>@@ -0,0 +1,19 @@
>+--- v8/src/base/cpu.cc.orig	2017-06-21 15:13:58.047943000 +0000
>++++ v8/src/base/cpu.cc	2017-06-21 15:14:54.046012000 +0000
>+@@ -604,6 +604,8 @@
>+ 
>+ #elif V8_HOST_ARCH_ARM64
>+ 
>++#if V8_OS_LINUX
>++
>+   CPUInfo cpu_info;
>+ 
>+   // Extract implementor from the "CPU implementer" field.
>+@@ -637,6 +639,7 @@
>+     }
>+     delete[] part;
>+   }
>++#endif
>+ 
>+ #elif V8_HOST_ARCH_PPC
>+ 
>
>Property changes on: files/patch-v8_base_cpu.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 220291: 183816