Attachment #183816 for bug #220291

View | Details | Raw Unified | Return to bug 220291
Collapse All | Expand All

Lines 58-64 Link Here

(-)Makefile (-1 / +1 lines)
58	RUN_DEPENDS= xdg-open:devel/xdg-utils \	58	RUN_DEPENDS= xdg-open:devel/xdg-utils \
59	droid-fonts-ttf>0:x11-fonts/droid-fonts-ttf	59	droid-fonts-ttf>0:x11-fonts/droid-fonts-ttf
60		60
61	ONLY_FOR_ARCHS= amd64 i386	61	ONLY_FOR_ARCHS= aarch64 amd64 i386
62	USES= bison compiler cpe desktop-file-utils execinfo jpeg \	62	USES= bison compiler cpe desktop-file-utils execinfo jpeg \
63	ninja perl5 pkgconfig python:2,build shebangfix tar:xz	63	ninja perl5 pkgconfig python:2,build shebangfix tar:xz
64		64




 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;
 }

Lines 1-5 Link Here

(-)files/patch-build_config_compiler_BUILD.gn (-2 / +11 lines)
1	--- build/config/compiler/BUILD.gn.orig 2017-06-05 21:03:01.000000000 +0200	1	--- build/config/compiler/BUILD.gn.orig 2017-06-20 22:03:10.000000000 +0000
2	+++ build/config/compiler/BUILD.gn 2017-06-13 16:28:04.062660000 +0200	2	+++ build/config/compiler/BUILD.gn 2017-06-26 17:10:17.493190000 +0000
3	@@ -37,7 +37,7 @@	3	@@ -37,7 +37,7 @@
4	# only two architectures that are currently checked in). Turn this off when	4	# only two architectures that are currently checked in). Turn this off when
5	# you are using a custom toolchain and need to control -B in cflags.	5	# you are using a custom toolchain and need to control -B in cflags.
Lines 80-85 Link Here
80	ldflags += [ "-Wl,-plugin-opt,-function-sections" ]	80	ldflags += [ "-Wl,-plugin-opt,-function-sections" ]
81	}	81	}
82	}	82	}
		83	@@ -584,7 +584,7 @@
		84	cflags += [ "-mtune=$arm_tune" ]
		85	}
		86	} else if (current_cpu == "arm64") {
		87	- if (is_clang && !is_android && !is_nacl) {
		88	+ if (is_clang && !is_android && !is_nacl && !is_bsd) {
		89	cflags += [ "--target=aarch64-linux-gnu" ]
		90	ldflags += [ "--target=aarch64-linux-gnu" ]
		91	}
83	@@ -781,7 +781,7 @@	92	@@ -781,7 +781,7 @@
84	# configs -= [ "//build/config/compiler:clang_stackrealign" ]	93	# configs -= [ "//build/config/compiler:clang_stackrealign" ]
85	# See https://crbug.com/556393 for details of where it must be avoided.	94	# See https://crbug.com/556393 for details of where it must be avoided.

Line 0 Link Here

(-)files/patch-build_toolchain_linux_BUILD.gn (+10 lines)
	1	--- build/toolchain/linux/BUILD.gn.orig 2017-06-22 07:22:30.798609000 +0000
	2	+++ build/toolchain/linux/BUILD.gn 2017-06-22 07:22:41.931974000 +0000
	3	@@ -14,7 +14,6 @@
	4	}
	5
	6	clang_toolchain("clang_arm64") {
	7	- toolprefix = "aarch64-linux-gnu-"
	8	toolchain_args = {
	9	current_cpu = "arm64"
	10	current_os = "linux"




--- 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 */




--- 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
 

Return to bug 220291

Lines 18-20 Link Here

(-)files/patch-base_sys__info__posix.cc (+9 lines)
18	int SysInfo::NumberOfProcessors() {	18	int SysInfo::NumberOfProcessors() {
19	return g_lazy_number_of_processors.Get().value();	19	return g_lazy_number_of_processors.Get().value();
20	}	20	}
		21	@@ -195,6 +195,8 @@ std::string SysInfo::OperatingSystemArchitecture() {
		22	arch = "x86";
		23	} else if (arch == "amd64") {
		24	arch = "x86_64";
		25	+ } else if (arch == "arm64") {
		26	+ arch = "aarch64";
		27	}
		28	return arch;
		29	}

Line 0 Link Here

(-)files/patch-third__party_boringssl_src_crypto_cpu_aarch64_linux.c (+40 lines)
	1	--- third_party/boringssl/src/crypto/cpu-aarch64-linux.c.orig 2017-06-21 14:20:44.695955000 +0000
	2	+++ third_party/boringssl/src/crypto/cpu-aarch64-linux.c 2017-06-21 14:24:50.411622000 +0000
	3	@@ -16,7 +16,9 @@
	4
	5	#if defined(OPENSSL_AARCH64) && !defined(OPENSSL_STATIC_ARMCAP)
	6
	7	+#if defined(OPENSSL_LINUX)
	8	#include <sys/auxv.h>
	9	+#endif
	10
	11	#include <openssl/arm_arch.h>
	12
	13	@@ -26,6 +28,7 @@
	14	extern uint32_t OPENSSL_armcap_P;
	15
	16	void OPENSSL_cpuid_setup(void) {
	17	+#if defined(OPENSSL_LINUX)
	18	unsigned long hwcap = getauxval(AT_HWCAP);
	19
	20	/* See /usr/include/asm/hwcap.h on an aarch64 installation for the source of
	21	@@ -41,9 +44,11 @@
	22	* either. */
	23	return;
	24	}
	25	+#endif
	26
	27	OPENSSL_armcap_P \|= ARMV7_NEON;
	28
	29	+#if defined(OPENSSL_LINUX)
	30	if (hwcap & kAES) {
	31	OPENSSL_armcap_P \|= ARMV8_AES;
	32	}
	33	@@ -56,6 +61,7 @@
	34	if (hwcap & kSHA256) {
	35	OPENSSL_armcap_P \|= ARMV8_SHA256;
	36	}
	37	+#endif
	38	}
	39
	40	#endif /* OPENSSL_AARCH64 && !OPENSSL_STATIC_ARMCAP */

Line 0 Link Here

(-)files/patch-v8_base_cpu.cc (+19 lines)
	1	--- v8/src/base/cpu.cc.orig 2017-06-21 15:13:58.047943000 +0000
	2	+++ v8/src/base/cpu.cc 2017-06-21 15:14:54.046012000 +0000
	3	@@ -604,6 +604,8 @@
	4
	5	#elif V8_HOST_ARCH_ARM64
	6
	7	+#if V8_OS_LINUX
	8	+
	9	CPUInfo cpu_info;
	10
	11	// Extract implementor from the "CPU implementer" field.
	12	@@ -637,6 +639,7 @@
	13	}
	14	delete[] part;
	15	}
	16	+#endif
	17
	18	#elif V8_HOST_ARCH_PPC
	19