summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2016-04-14 20:07:02 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2016-04-14 20:07:11 +0200
commit616558f6a4d1a69a47e1d93da1c964c46159bda7 (patch)
tree9bd03c7201e84d329de2ea911efde3e1ebda6589
parent971d7c5c179fc0547b08557cc00caccbe90f2ef5 (diff)
fix debugging of threaded apps
-rw-r--r--package/gdb/Makefile5
-rw-r--r--package/gdbserver/Makefile1
-rw-r--r--package/libthread_db/Makefile2
-rw-r--r--toolchain/gcc/Makefile4
4 files changed, 8 insertions, 4 deletions
diff --git a/package/gdb/Makefile b/package/gdb/Makefile
index 6e0d7e01f..7879c6fa7 100644
--- a/package/gdb/Makefile
+++ b/package/gdb/Makefile
@@ -7,7 +7,7 @@ include ${ADK_TOPDIR}/toolchain/gdb/Makefile.inc
PKG_NAME:= gdb
PKG_DESCR:= programm debugger
PKG_SECTION:= app/debug
-PKG_DEPENDS:= libncurses zlib libexpat
+PKG_DEPENDS:= libncurses zlib libexpat libthread-db
PKG_BUILDDEP:= ncurses readline expat zlib
PKG_NOPARALLEL:= 1
@@ -39,7 +39,8 @@ XAKE_FLAGS+= GCC_HONOUR_COPTS:=s
gdb-install:
${INSTALL_DIR} ${IDIR_GDB}/usr/bin
- ${INSTALL_BIN} ${WRKINST}/usr/bin/gdb ${IDIR_GDB}/usr/bin/
+ ${INSTALL_BIN} ${WRKINST}/usr/bin/gdb \
+ ${IDIR_GDB}/usr/bin/
# shipped libbfd conflicts with system wide one
rm -f ${WRKINST}/usr/lib/libbfd*
diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile
index c0e9ab9b4..d2bfad2a9 100644
--- a/package/gdbserver/Makefile
+++ b/package/gdbserver/Makefile
@@ -7,6 +7,7 @@ include ${ADK_TOPDIR}/toolchain/gdb/Makefile.inc
PKG_NAME:= gdbserver
PKG_DESCR:= remote programm debugger utility
PKG_SECTION:= app/debug
+PKG_DEPENDS:= libthread-db
PKG_LIBC_DEPENDS:= !musl
ifeq ($(ADK_TOOLCHAIN_GDB_6_7_1),y)
diff --git a/package/libthread_db/Makefile b/package/libthread_db/Makefile
index 90bbc9d90..90ed2f28f 100644
--- a/package/libthread_db/Makefile
+++ b/package/libthread_db/Makefile
@@ -24,7 +24,7 @@ NO_DISTFILES:= 1
include ${ADK_TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBTHREAD_DB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBTHREAD_DB,libthread-db,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 2b620bf07..4471bd4dd 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -328,10 +328,12 @@ $(WRKBUILD)/.final:
rm -rf $(TOOLCHAIN_DIR)/usr/share
# cleanup unneeded libtool files
-find $(STAGING_TARGET_DIR) $(STAGING_HOST_DIR) -name \*.la -exec rm {} \;
- # strip target libs and host tools for toolchain builds
+ # strip target libs and host tools for toolchain builds in non-Debug mode
+ifeq ($(ADK_DEBUG),)
PATH="$(TARGET_PATH)" debug='0' prefix='${TARGET_CROSS}' ${BASH} ${SCRIPT_DIR}/rstrip.sh \
$(STAGING_TARGET_DIR) $(TOOLCHAIN_DIR)/usr/lib/gcc/$(GNU_TARGET_NAME)
debug='0' prefix=' ' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(TOOLCHAIN_DIR)/usr/bin
+endif
touch $@
include ${ADK_TOPDIR}/mk/toolchain.mk