Commit 3a76b8a5 authored by AndreyChurbanov's avatar AndreyChurbanov
Browse files

Fix openmp on PowerPC64-BE-ELFv2 ABI on FreeBSD. 

Patch by adalava (Alfredo Dal'Ava J.nior)

Differential Revision: https://reviews.llvm.org/D67190
parent 4f7dce78

openmp/runtime/src/kmp_platform.h

+8 −8
Original line number Diff line number Diff line
@@ -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

#define KMP_ARCH_RISCV64 0
@@ -118,12 +118,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

openmp/runtime/src/z_Linux_asm.S

+7 −7
Original line number Diff line number Diff line
@@ -1367,12 +1367,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
@@ -1380,7 +1380,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:
@@ -1424,7 +1424,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
@@ -1502,7 +1502,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
@@ -1514,7 +1514,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
@@ -1530,7 +1530,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)