[Openmp-commits] [openmp] r271583 - Merging r271035:

[Jonathan Peyton via Openmp-commits]

Author: jlpeyton
Date: Thu Jun  2 15:33:53 2016
New Revision: 271583

URL: http://llvm.org/viewvc/llvm-project?rev=271583&view=rev
Log:
Merging r271035:
------------------------------------------------------------------------
r271035 | hfinkel | 2016-05-27 14:04:05 -0500 (Fri, 27 May 2016) | 3 lines

Fix storing the frame pointer for OMP-T during ppc64 microtask dispatch

Thanks to John Mellor-Crummey for reporting the omission.
------------------------------------------------------------------------

Modified:
    openmp/branches/release_38/   (props changed)
    openmp/branches/release_38/runtime/src/z_Linux_asm.s

Propchange: openmp/branches/release_38/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun  2 15:33:53 2016
@@ -1 +1 @@
-/openmp/trunk:257833,258169,258528,258695,258990,263651,264166,270464,270821,270884
+/openmp/trunk:257833,258169,258528,258695,258990,263651,264166,270464,270821,270884,271035

Modified: openmp/branches/release_38/runtime/src/z_Linux_asm.s
URL: http://llvm.org/viewvc/llvm-project/openmp/branches/release_38/runtime/src/z_Linux_asm.s?rev=271583&r1=271582&r2=271583&view=diff
==============================================================================
--- openmp/branches/release_38/runtime/src/z_Linux_asm.s (original)
+++ openmp/branches/release_38/runtime/src/z_Linux_asm.s Thu Jun  2 15:33:53 2016
@@ -1520,6 +1520,7 @@ __kmp_invoke_microtask:
 # if OMPT_SUPPORT
 	.cfi_offset r30, -16
 	std 30, -16(31)
+	std 1, 0(8)
 	mr 30, 8
 # endif