about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPaul Pluzhnikov <ppluzhnikov@google.com>2014-03-03 17:19:26 -0800
committerPaul Pluzhnikov <ppluzhnikov@google.com>2014-03-03 17:19:26 -0800
commitc6679b5e43039413685a5f4f3d2e87f1e3127c66 (patch)
tree20ba46a2cefaa49260a9ee89d8c33f58b48909f3
parentad06b0b3fb44026ad1e934378803e78c84ab5b90 (diff)
downloadglibc-c6679b5e43039413685a5f4f3d2e87f1e3127c66.tar.gz
glibc-c6679b5e43039413685a5f4f3d2e87f1e3127c66.tar.xz
glibc-c6679b5e43039413685a5f4f3d2e87f1e3127c66.zip
For b/5013921, build pthread_join.c and pthread_timedjoin.c with frame pointers.
-rw-r--r--README.google9
-rw-r--r--nptl/Makefile6
2 files changed, 13 insertions, 2 deletions
diff --git a/README.google b/README.google
index ad1924414a..5e3cae1782 100644
--- 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 f2c3006b30..0a1fa5c7c4 100644
--- 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