For b/5013921, build pthread_join.c and pthread_timedjoin.c with frame pointers.

diff --git a/README.google b/README.google
index ad1924414a82dfa7ae3e09334654371bb3b8c8b8..5e3cae17825259397328889451fa609604ddc355 100644 (file)
--- a/README.google
+++ b/README.google
@@ -193,3 +193,12 @@ nptl/sysdeps/pthread/unwind-forcedunwind.c
   Forward-ported from cl/51438157.
   (ppluzhnikov, google-local)
 
+nptl/Makefile
+  For b/5013921, build pthread_join.c and pthread_timedjoin.c with
+  frame pointers.
+  Forward-ported from cl/51440285 (from cl//54512-p2).
+  Note: this is redundant with http://cr/62476718 that builds entire glibc
+  with -fno-omit-frame-pointer, but I am forward-porting it anyway in case
+  we decide to revert cr/62476718 later.
+  (ppluzhnikov, google-local)
+

diff --git a/nptl/Makefile b/nptl/Makefile
index f2c3006b308ab4cae6b9a97c9bb9675423460779..0a1fa5c7c480b15e0e6926d9c1409c1ed0fa7158 100644 (file)
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -170,8 +170,10 @@ CFLAGS-forward.c = -fexceptions
 # block and therefore temporarily enable asynchronous cancellation.
 # Those must be compiled asynchronous unwind tables.
 CFLAGS-pthread_testcancel.c = -fexceptions
-CFLAGS-pthread_join.c = -fexceptions -fasynchronous-unwind-tables
-CFLAGS-pthread_timedjoin.c = -fexceptions -fasynchronous-unwind-tables
+CFLAGS-pthread_join.c = -fexceptions -fasynchronous-unwind-tables \
+                       -fno-omit-frame-pointer
+CFLAGS-pthread_timedjoin.c = -fexceptions -fasynchronous-unwind-tables \
+                            -fno-omit-frame-pointer
 CFLAGS-pthread_once.c = $(uses-callbacks) -fexceptions \
                        -fasynchronous-unwind-tables
 CFLAGS-pthread_cond_wait.c = -fexceptions -fasynchronous-unwind-tables