Attachment 207399 Details for Bug 240516 – v2

[patch] v2

llvm90.patch (text/plain), 5.08 KB, created by Piotr Kubaj on 2019-09-11 20:25:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Piotr Kubaj

Created: 2019-09-11 20:25:08 UTC

Size: 5.08 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 511806)
>+++ Makefile	(working copy)
>@@ -69,9 +69,11 @@
> OPTIONS_DEFINE=	BE_AMDGPU CLANG DOCS EXTRAS LIT LLD LLDB PYCLANG
> OPTIONS_DEFINE_amd64=	COMPILER_RT GOLD OPENMP
> OPTIONS_DEFINE_i386=	COMPILER_RT OPENMP
>+OPTIONS_DEFINE_powerpc64=	OPENMP
> OPTIONS_DEFAULT=	BE_AMDGPU BE_STANDARD CLANG EXTRAS LIT LLD LLDB PYCLANG
> OPTIONS_DEFAULT_amd64=	COMPILER_RT GOLD OPENMP
> OPTIONS_DEFAULT_i386=	COMPILER_RT OPENMP
>+OPTIONS_DEFAULT_powerpc64=	OPENMP
> OPTIONS_SINGLE=		BACKENDS
> OPTIONS_SINGLE_BACKENDS=BE_FREEBSD BE_NATIVE BE_STANDARD
> OPTIONS_SUB=	yes
>@@ -92,6 +94,7 @@
> CLANG_PORTDOCS=		clang
> CLANG_USE=		GNOME=libxml2
> COMPILER_RT_DESC=	Sanitizer libraries
>+COMPILER_RT_EXTRA_PATCHES=	${PATCHDIR}/compiler-rt
> COMPILER_RT_DISTFILES=	compiler-rt-${DISTVERSION}.src${EXTRACT_SUFX}
> COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \
> 			${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|}
>@@ -124,6 +127,7 @@
> LLDB_PORTDOCS=		lldb
> LLDB_VARS=		_USES_PYTHON=python:3.6+
> OPENMP_DESC=		Install libomp, the LLVM OpenMP runtime library
>+OPENMP_EXTRA_PATCHES=	${PATCHDIR}/openmp
> OPENMP_DISTFILES=	openmp-${DISTVERSION}.src${EXTRACT_SUFX}
> PYCLANG_DESC=	Install python bindings to libclang
> PYCLANG_IMPLIES=	CLANG
>Index: files/openmp/patch-projects_openmp_runtime_src_kmp__platform.h
>===================================================================
>--- files/openmp/patch-projects_openmp_runtime_src_kmp__platform.h	(nonexistent)
>+++ files/openmp/patch-projects_openmp_runtime_src_kmp__platform.h	(working copy)
>@@ -0,0 +1,33 @@
>+--- projects/openmp/runtime/src/kmp_platform.h.orig	2019-01-19 10:56:40 UTC
>++++ projects/openmp/runtime/src/kmp_platform.h
>+@@ -93,9 +93,9 @@
>+ #define KMP_ARCH_X86 0
>+ #define KMP_ARCH_X86_64 0
>+ #define KMP_ARCH_AARCH64 0
>+-#define KMP_ARCH_PPC64_BE 0
>+-#define KMP_ARCH_PPC64_LE 0
>+-#define KMP_ARCH_PPC64 (KMP_ARCH_PPC64_LE || KMP_ARCH_PPC64_BE)
>++#define KMP_ARCH_PPC64_ELFv1 0
>++#define KMP_ARCH_PPC64_ELFv2 0
>++#define KMP_ARCH_PPC64 (KMP_ARCH_PPC64_ELFv2 || KMP_ARCH_PPC64_ELFv1)
>+ #define KMP_ARCH_MIPS 0
>+ #define KMP_ARCH_MIPS64 0
>+ 
>+@@ -117,12 +117,12 @@
>+ #undef KMP_ARCH_X86
>+ #define KMP_ARCH_X86 1
>+ #elif defined __powerpc64__
>+-#if defined __LITTLE_ENDIAN__
>+-#undef KMP_ARCH_PPC64_LE
>+-#define KMP_ARCH_PPC64_LE 1
>++#if defined(_CALL_ELF) && _CALL_ELF == 2
>++#undef KMP_ARCH_PPC64_ELFv2
>++#define KMP_ARCH_PPC64_ELFv2 1
>+ #else
>+-#undef KMP_ARCH_PPC64_BE
>+-#define KMP_ARCH_PPC64_BE 1
>++#undef KMP_ARCH_PPC64_ELFv1
>++#define KMP_ARCH_PPC64_ELFv1 1
>+ #endif
>+ #elif defined __aarch64__
>+ #undef KMP_ARCH_AARCH64
>
>Property changes on: files/openmp/patch-projects_openmp_runtime_src_kmp__platform.h
>___________________________________________________________________
>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/openmp/patch-projects_openmp_runtime_src_z__Linux__asm.S
>===================================================================
>--- files/openmp/patch-projects_openmp_runtime_src_z__Linux__asm.S	(nonexistent)
>+++ files/openmp/patch-projects_openmp_runtime_src_z__Linux__asm.S	(working copy)
>@@ -0,0 +1,62 @@
>+--- projects/openmp/runtime/src/z_Linux_asm.S.orig	2019-07-02 13:45:40 UTC
>++++ projects/openmp/runtime/src/z_Linux_asm.S
>+@@ -1328,12 +1328,12 @@ KMP_LABEL(kmp_1):
>+ // return:	r3	(always 1/TRUE)
>+ //
>+ 	.text
>+-# if KMP_ARCH_PPC64_LE
>++# if KMP_ARCH_PPC64_ELFv2
>+ 	.abiversion 2
>+ # endif
>+ 	.globl	__kmp_invoke_microtask
>+ 
>+-# if KMP_ARCH_PPC64_LE
>++# if KMP_ARCH_PPC64_ELFv2
>+ 	.p2align	4
>+ # else
>+ 	.p2align	2
>+@@ -1341,7 +1341,7 @@ KMP_LABEL(kmp_1):
>+ 
>+ 	.type	__kmp_invoke_microtask,@function
>+ 
>+-# if KMP_ARCH_PPC64_LE
>++# if KMP_ARCH_PPC64_ELFv2
>+ __kmp_invoke_microtask:
>+ .Lfunc_begin0:
>+ .Lfunc_gep0:
>+@@ -1385,7 +1385,7 @@ __kmp_invoke_microtask:
>+ 	.cfi_offset lr, 16
>+ 
>+ // Compute the size necessary for the local stack frame.
>+-# if KMP_ARCH_PPC64_LE
>++# if KMP_ARCH_PPC64_ELFv2
>+ 	li 12, 72
>+ # else
>+ 	li 12, 88
>+@@ -1463,7 +1463,7 @@ __kmp_invoke_microtask:
>+ // for the microtask begins 48 + 8*8 == 112 bytes above r1 for ELFv1 and
>+ // 32 + 8*8 == 96 bytes above r1 for ELFv2.
>+ 	addi 4, 4, 40
>+-# if KMP_ARCH_PPC64_LE
>++# if KMP_ARCH_PPC64_ELFv2
>+ 	addi 12, 1, 88
>+ # else
>+ 	addi 12, 1, 104
>+@@ -1475,7 +1475,7 @@ __kmp_invoke_microtask:
>+ 	bdnz .Lnext
>+ 
>+ .Lcall:
>+-# if KMP_ARCH_PPC64_LE
>++# if KMP_ARCH_PPC64_ELFv2
>+ 	std 2, 24(1)
>+ 	mr 12, 3
>+ #else
>+@@ -1491,7 +1491,7 @@ __kmp_invoke_microtask:
>+ 
>+ 	mtctr 12
>+ 	bctrl
>+-# if KMP_ARCH_PPC64_LE
>++# if KMP_ARCH_PPC64_ELFv2
>+ 	ld 2, 24(1)
>+ # else
>+ 	ld 2, 40(1)
>
>Property changes on: files/openmp/patch-projects_openmp_runtime_src_z__Linux__asm.S
>___________________________________________________________________
>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

Flags:

pkubaj: maintainer-approval? (brooks)

Actions: View | Diff

Attachments on bug 240516: 207398 | 207399