From 3d2fc2ae68cbfe3339828e528f6f988f6e72eece Mon Sep 17 00:00:00 2001
From: Martin Karsten <mkarsten@uwaterloo.ca>
Date: Wed, 20 Jun 2018 18:19:46 -0400
Subject: [PATCH] - minor bug in gdb extension - clerical updates

---
 src/libfibre/Makefile           | 2 +-
 src/libfibre/libfibre.so-gdb.py | 8 +++++---
 src/testoptions.h               | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/libfibre/Makefile b/src/libfibre/Makefile
index deac502..1380ff3 100644
--- a/src/libfibre/Makefile
+++ b/src/libfibre/Makefile
@@ -36,7 +36,7 @@ CXXFLAGS=$(LANGFLAGS) $(OPTFLAGS) $(DBGFLAGS) $(COMPFLAGS) $(CFGFLAGS)
 PREFLAGS=$(LANGFLAGS) $(OPTFLAGS)             $(COMPFLAGS) $(KERNFLAGS) $(CFGFLAGS)
 
 #SPLITSTACK=-fsplit-stack -DSPLIT_STACK
-CXXFLAGS+=-fpic -fno-extern-tls-init $(SPLITSTACK)
+CXXFLAGS+=-fpic $(SPLITSTACK)
 
 ifneq ($(OPTIM),1)
 #CXXFLAGS+=-fsanitize=address # and/or other -fsanitize options
diff --git a/src/libfibre/libfibre.so-gdb.py b/src/libfibre/libfibre.so-gdb.py
index 4b50152..85b6b6f 100644
--- a/src/libfibre/libfibre.so-gdb.py
+++ b/src/libfibre/libfibre.so-gdb.py
@@ -152,10 +152,12 @@ class InfoFibres(gdb.Command):
                 print(" (*)", end='')
             with FibreSupport.get_frame(FibreSupport.list[i]) as frame:
                 if frame is not None:
-                    sal = frame.find_sal()
-                    symtab = sal.symtab
                     print(" in ", frame.name(), sep='', end='')
-                    print(" at ", symtab.filename, ":", sal.line, sep='')
+                    sal = frame.find_sal()
+                    if sal is not None and sal.symtab is not None:
+                        print(" at ", sal.symtab.filename, ":", sal.line, sep='')
+                    else:
+                        print()
                 else:
                     print()
 
diff --git a/src/testoptions.h b/src/testoptions.h
index 1b9e5e0..93009a7 100644
--- a/src/testoptions.h
+++ b/src/testoptions.h
@@ -21,7 +21,7 @@
 //#define TESTING_IDLE_SPIN             128 // spin before idle/halt threshold
 //#define TESTING_MUTEX_FIFO            1 // use fifo/baton mutex
 //#define TESTING_MUTEX_SPIN            1 // spin before block in non-fifo mutex
-//#define TESTING_PLACEMENT_RR          1 // RR placement, instead of load-based
+//#define TESTING_PLACEMENT_RR          1 // RR placement, instead of load-based staging
 #define TESTING_WAKE_CLUSTER          1 // try waking idle processor on cluster backlog
 #define TESTING_WORK_STEALING         1 // enable work stealing (default transient)
 #define TESTING_WORK_STEALING_STICKY  5 // sticky work stealing load threshold
-- 
GitLab