Browse Source

fix debugging of threaded apps

Waldemar Brodkorb 8 years ago
parent
commit
616558f6a4
4 changed files with 8 additions and 4 deletions
  1. 3 2
      package/gdb/Makefile
  2. 1 0
      package/gdbserver/Makefile
  3. 1 1
      package/libthread_db/Makefile
  4. 3 1
      toolchain/gcc/Makefile

+ 3 - 2
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*
 

+ 1 - 0
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)

+ 1 - 1
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

+ 3 - 1
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