From 83d9e6a49a456fab7978ec56c4bc8bf1b41eda98 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Fri, 16 Dec 2016 16:10:32 -0800 Subject: Kill dmalloc. - No new releases in almost 10 year. - No public bug tracker or VCS. - No responses from maintainer over sent patches. RIP, dmalloc. Signed-off-by: Alexey Neyman diff --git a/README.md b/README.md index 498494a..778243f 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ It's quite difficult to list all possible features available in crosstool-NG. He * support for multlib toolchains (experimental for now) * debug facilities * native and cross gdb, gdbserver - * debugging libraries: dmalloc, duma + * debugging libraries: duma * debugging tools: ltrace, strace * restart a build at any step * sample configurations repository usable as starting point for your own toolchain diff --git a/config/debug/dmalloc.in b/config/debug/dmalloc.in deleted file mode 100644 index aae0e6e..0000000 --- a/config/debug/dmalloc.in +++ /dev/null @@ -1,25 +0,0 @@ -# dmalloc debug facility - -## depends on ! BACKEND -## depends on ! BARE_METAL -## -## help dmalloc helps tracking memory allocation mis-usage -## help such as double-free, use-after-free... - -choice - bool - prompt "dmalloc version" -# Don't remove next line -# CT_INSERT_VERSION_BELOW - -config DMALLOC_V_5_5_2 - bool - prompt "5.5.2" - -endchoice - -config DMALLOC_VERSION - string -# Don't remove next line -# CT_INSERT_VERSION_STRING_BELOW - default "5.5.2" if DMALLOC_V_5_5_2 diff --git a/docs/7 - Contributing to crosstool-NG.txt b/docs/7 - Contributing to crosstool-NG.txt index 5e363a1..2e95daf 100644 --- a/docs/7 - Contributing to crosstool-NG.txt +++ b/docs/7 - Contributing to crosstool-NG.txt @@ -34,7 +34,7 @@ Here is the (mostly-complete) list of categories and components: binutils | binutils, elf2flt, sstrip libc | uClibc, glibc, newlib, mingw, none kernel | linux, mingw32, bare-metal - debug | dmalloc, duma, gdb, ltrace, strace + debug | duma, gdb, ltrace, strace complibs | gmp, mpfr, isl, cloog, mpc, libelf comptools | make, m4, autoconf, automake, libtool ------------+------------------------------------------------------- diff --git a/docs/9 - How is a toolchain constructed.txt b/docs/9 - How is a toolchain constructed.txt index f8e3292..92edc3e 100644 --- a/docs/9 - How is a toolchain constructed.txt +++ b/docs/9 - How is a toolchain constructed.txt @@ -246,7 +246,7 @@ strictly required. Second, crosstool-NG can also build some additional debug utilities to run on the target. This is where we build, for example, the cross-gdb, the gdbserver and the native gdb (the last two run on the target, the first runs on the -same machine as the toolchain). The others (strace, ltrace, DUMA and dmalloc) +same machine as the toolchain). The others (strace, ltrace and DUMA) are absolutely not related to the toolchain, but are nice-to-have stuff that can greatly help when developing, so are included as goodies (and they are quite easy to build, so it's OK; more complex stuff is not worth the effort diff --git a/patches/dmalloc/5.5.2/100-use-xtools.patch b/patches/dmalloc/5.5.2/100-use-xtools.patch deleted file mode 100644 index 78097fc..0000000 --- a/patches/dmalloc/5.5.2/100-use-xtools.patch +++ /dev/null @@ -1,58 +0,0 @@ -This patch makes configure use the cross ld and ar rather than the native tools. - -It was build up by Yann E. MORIN from some -bits gathered from buildroot, which is LGPL v2.1 -License for dmalloc is: - * Permission to use, copy, modify, and distribute this software for - * any purpose and without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies, and that the name of Gray Watson not be used in advertising - * or publicity pertaining to distribution of the document or software - * without specific, written prior permission. - * - * Gray Watson makes no representations about the suitability of the - * software described herein for any purpose. It is provided "as is" - * without express or implied warranty. - -I personnaly believe that the resulting code should therefore be -LGPL v2.1, but don't believe me, ask your lawyers! - -diff -dur dmalloc-5.5.2.orig/configure dmalloc-5.5.2/configure ---- dmalloc-5.5.2.orig/configure 2007-05-14 19:26:14.000000000 +0200 -+++ dmalloc-5.5.2/configure 2007-05-18 11:38:25.000000000 +0200 -@@ -4418,14 +4418,14 @@ - (exit $ac_status); }; }; then - - # so now we try to create an archive from the compiled .o file -- (ar cr conftest.a conftest.o) 2>&5 -+ (${AR} cr conftest.a conftest.o) 2>&5 - # see which shared-library ld commands work - # - # Darwin/Mac OS X - Terry Teague - # username terry_teague at domain users.sourceforge.net - ac_cv_shared_lib_link_objs=no - if test `uname` = "Darwin"; then -- if (ld -dylib -o conftest.so.t -lc conftest.a) 2>&5; then -+ if (${LD} -dylib -o conftest.so.t -lc conftest.a) 2>&5; then - # By convention on some platforms - # libLLL.so, libLLL.X.so are symlinks to libLLL.X.Y.Z.so - # where X.Y.Z is version # (major.minor.increment) of the library -@@ -4443,12 +4443,12 @@ - ac_cv_shared_link_args='# Could not configure shlib linking' - enable_shlib=no - fi -- elif (ld -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then -- ac_cv_shared_link_args='ld -shared --whole-archive -soname $@ -o $@.t' -- elif (ld -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then -- ac_cv_shared_link_args='ld -shared -o $@.t -all -soname $@ -none -lc -all' -- elif (ld -G -o conftest.so.t conftest.a) 2>&5; then -- ac_cv_shared_link_args='ld -G -o $@.t' -+ elif (${LD} -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then -+ ac_cv_shared_link_args="${LD}"' -shared --whole-archive -soname $@ -o $@.t' -+ elif (${LD} -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then -+ ac_cv_shared_link_args="${LD}"' -shared -o $@.t -all -soname $@ -none -lc -all' -+ elif (${LD} -G -o conftest.so.t conftest.a) 2>&5; then -+ ac_cv_shared_link_args="${LD}"' -G -o $@.t' - else - # oh well, toss an error - ac_cv_shared_link_args='# Could not configure shlib linking' diff --git a/patches/dmalloc/5.5.2/110-block_size.patch b/patches/dmalloc/5.5.2/110-block_size.patch deleted file mode 100644 index 41d9c5c..0000000 --- a/patches/dmalloc/5.5.2/110-block_size.patch +++ /dev/null @@ -1,32 +0,0 @@ -This patch sets the page size to a default 12, that is a 4KiB block size. -Testing for the correct block-size is impossible when cross-compiling. - -It was build up by Yann E. MORIN from some -bits gathered from buildroot, which is LGPL v2.1 -License for dmalloc is: - * Permission to use, copy, modify, and distribute this software for - * any purpose and without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies, and that the name of Gray Watson not be used in advertising - * or publicity pertaining to distribution of the document or software - * without specific, written prior permission. - * - * Gray Watson makes no representations about the suitability of the - * software described herein for any purpose. It is provided "as is" - * without express or implied warranty. - -I personnaly believe that the resulting code should therefore be -LGPL v2.1, but don't believe me, ask your lawyers! - -diff -dur dmalloc-5.5.2.orig/configure dmalloc-5.5.2/configure ---- dmalloc-5.5.2.orig/configure 2007-05-14 19:26:14.000000000 +0200 -+++ dmalloc-5.5.2/configure 2007-05-18 11:38:25.000000000 +0200 -@@ -5306,7 +5306,7 @@ - - echo "$as_me:$LINENO: checking basic-block size" >&5 - echo $ECHO_N "checking basic-block size... $ECHO_C" >&6 --ac_cv_page_size=0 -+ac_cv_page_size=12 - if test $ac_cv_page_size = 0; then - if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling diff --git a/patches/dmalloc/5.5.2/120-g++_check.patch b/patches/dmalloc/5.5.2/120-g++_check.patch deleted file mode 100644 index a8f76f5..0000000 --- a/patches/dmalloc/5.5.2/120-g++_check.patch +++ /dev/null @@ -1,17 +0,0 @@ -Correctly check for g++ existence. - -Copyright 2007 Yann E. MORIN -Licensed to you as dmalloc-5.5.2 is. - -diff -dur dmalloc-5.5.2.orig/configure dmalloc-5.5.2/configure ---- dmalloc-5.5.2.orig/configure 2007-05-18 11:40:31.000000000 +0200 -+++ dmalloc-5.5.2/configure 2007-05-18 11:42:02.000000000 +0200 -@@ -2643,7 +2643,7 @@ - - - # see if we actually have a CXX program --if test "$ac_cv_prog_CXX" = "" -o ! -x "$ac_cv_prog_CXX"; then -+if test "$ac_cv_prog_CXX" = "" -o ! -x `which "$ac_cv_prog_CXX"`; then - { echo "$as_me:$LINENO: WARNING: could not find C++ compiler $ac_cv_prog_CXX" >&5 - echo "$as_me: WARNING: could not find C++ compiler $ac_cv_prog_CXX" >&2;} - enable_cxx=no diff --git a/patches/dmalloc/5.5.2/130-mips.patch b/patches/dmalloc/5.5.2/130-mips.patch deleted file mode 100644 index 69f0e45..0000000 --- a/patches/dmalloc/5.5.2/130-mips.patch +++ /dev/null @@ -1,64 +0,0 @@ -Patch to correctly handle the MIPS case. - -It was build up by Yann E. MORIN from some -bits gathered from buildroot, which is LGPL v2.1 -License for dmalloc is: - * Permission to use, copy, modify, and distribute this software for - * any purpose and without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies, and that the name of Gray Watson not be used in advertising - * or publicity pertaining to distribution of the document or software - * without specific, written prior permission. - * - * Gray Watson makes no representations about the suitability of the - * software described herein for any purpose. It is provided "as is" - * without express or implied warranty. - -I personnaly believe that the resulting code should therefore be -LGPL v2.1, but don't believe me, ask your lawyers! - -diff -dur dmalloc-5.5.2.orig/configure dmalloc-5.5.2/configure ---- dmalloc-5.5.2.orig/configure 2007-05-18 12:15:39.000000000 +0200 -+++ dmalloc-5.5.2/configure 2007-05-18 12:15:48.000000000 +0200 -@@ -7107,7 +7107,7 @@ - echo $ECHO_N "checking return.h macros work... $ECHO_C" >&6 - if test "$cross_compiling" = yes; then - cat >>confdefs.h <<\_ACEOF --#define RETURN_MACROS_WORK 0 -+#define RETURN_MACROS_WORK 1 - _ACEOF - echo "$as_me:$LINENO: result: no" >&5 - echo "${ECHO_T}no" >&6 -diff -dur dmalloc-5.5.2.orig/return.h dmalloc-5.5.2/return.h ---- dmalloc-5.5.2.orig/return.h 2007-05-14 19:26:14.000000000 +0200 -+++ dmalloc-5.5.2/return.h 2007-05-18 12:15:48.000000000 +0200 -@@ -106,26 +106,16 @@ - /*************************************/ - - /* -- * For DEC Mips machines running Ultrix -+ * For Mips machines running Linux - */ - #if __mips - - /* -- * I have no idea how to get inline assembly with the default cc. -- * Anyone know how? -- */ -- --#if 0 -- --/* - * NOTE: we assume here that file is global. - * -- * $31 is the frame pointer. $2 looks to be the return address but maybe -- * not consistently. -+ * $31 is the return address. - */ --#define GET_RET_ADDR(file) asm("sw $2, file") -- --#endif -+#define GET_RET_ADDR(file) asm("sw $31, %0" : "=m" (file)) - - #endif /* __mips */ - diff --git a/patches/dmalloc/5.5.2/140-shared_library.patch b/patches/dmalloc/5.5.2/140-shared_library.patch deleted file mode 100644 index ccf2bb2..0000000 --- a/patches/dmalloc/5.5.2/140-shared_library.patch +++ /dev/null @@ -1,44 +0,0 @@ -This patch makes building the shared library possible. - -Copyright 2007 Yann E. MORIN -Licensed to you as dmalloc-5.5.2 is. - -diff -dur dmalloc-5.5.2.orig/Makefile.in dmalloc-5.5.2/Makefile.in ---- dmalloc-5.5.2.orig/Makefile.in 2007-05-14 19:26:14.000000000 +0200 -+++ dmalloc-5.5.2/Makefile.in 2007-05-18 15:54:04.000000000 +0200 -@@ -257,7 +257,7 @@ - # via: http://256.com/gray/email.html - $(LIB_SL) : $(LIBRARY) - rm -f $@ $@.t -- @shlinkargs@ $(LIBRARY) $(OBJS) $(NORMAL_OBJS) -+ @shlinkargs@ $(LIBRARY) - mv $@.t $@ - - $(LIBRARY) : $(OBJS) $(NORMAL_OBJS) -@@ -270,7 +270,7 @@ - - $(LIB_TH_SL) : $(LIB_TH) - rm -f $@ $@.t -- @shlinkargs@ $(LIB_TH) $(OBJS) $(THREAD_OBJS) -+ @shlinkargs@ $(LIB_TH) - mv $@.t $@ - - $(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS) -@@ -279,7 +279,7 @@ - - $(LIB_CXX_SL) : $(LIB_CXX) - rm -f $@ $@.t -- @shlinkargs@ $(LIB_CXX) $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS) -+ @shlinkargs@ $(LIB_CXX) - mv $@.t $@ - - $(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS) -@@ -288,7 +288,7 @@ - - $(LIB_TH_CXX_SL) : $(LIB_TH_CXX) - rm -f $@ $@.t -- @shlinkargs@ $(LIB_TH_CXX) $(OBJS) $(THREAD_OBJS) $(CXX_OBJS) -+ @shlinkargs@ $(LIB_TH_CXX) - mv $@.t $@ - - threadssl : $(LIB_TH_SL) diff --git a/patches/dmalloc/5.5.2/150-use_DESTDIR.patch b/patches/dmalloc/5.5.2/150-use_DESTDIR.patch deleted file mode 100644 index 072e3a7..0000000 --- a/patches/dmalloc/5.5.2/150-use_DESTDIR.patch +++ /dev/null @@ -1,105 +0,0 @@ -Make install rules use DESTDIR. -Split installation of the utilitity from the global install. - -Copyright 2007 Yann E. MORIN -Licensed to you as dmalloc-5.5.2 is. - -diff -dur dmalloc-5.5.2.orig/Makefile.in dmalloc-5.5.2/Makefile.in ---- dmalloc-5.5.2.orig/Makefile.in 2007-05-18 16:03:31.000000000 +0200 -+++ dmalloc-5.5.2/Makefile.in 2007-05-18 16:22:59.000000000 +0200 -@@ -174,66 +174,67 @@ - # rm -f configure - - installdirs : -- $(srcdir)/mkinstalldirs $(includedir) $(libdir) $(bindir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)/$(includedir) $(DESTDIR)/$(libdir) $(DESTDIR)/$(bindir) - - installincs : $(HFLS) -- $(srcdir)/mkinstalldirs $(includedir) -- $(INSTALL_DATA) $(HFLS) $(includedir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)/$(includedir) -+ $(INSTALL_DATA) $(HFLS) $(DESTDIR)/$(includedir) - - installthsl : $(LIB_TH_SL) -- $(srcdir)/mkinstalldirs $(libdir) -- $(INSTALL_PROGRAM) $(LIB_TH_SL) $(libdir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)/$(libdir) -+ $(INSTALL_PROGRAM) $(LIB_TH_SL) $(DESTDIR)/$(libdir) - - installth : $(INSTALL_THREADS) -- $(srcdir)/mkinstalldirs $(libdir) -- $(INSTALL_PROGRAM) $(LIB_TH) $(libdir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)/$(libdir) -+ $(INSTALL_PROGRAM) $(LIB_TH) $(DESTDIR)/$(libdir) - @CXX_OFF@ @echo "Enter 'make installthcxx' to install the threaded C++ library" - @SL_OFF@ @echo "Enter 'make installthsl' to install the threaded shared-library" - - installthcxxsl : $(LIB_TH_CXX_SL) -- $(srcdir)/mkinstalldirs $(shlibdir) -- $(INSTALL_PROGRAM) $(LIB_TH_CXX_SL) $(shlibdir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)/$(shlibdir) -+ $(INSTALL_PROGRAM) $(LIB_TH_CXX_SL) $(DESTDIR)/$(shlibdir) - - installthcxx : $(INSTALL_TH_CXX) -- $(srcdir)/mkinstalldirs $(libdir) -- $(INSTALL_PROGRAM) $(LIB_TH_CXX) $(libdir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)/$(libdir) -+ $(INSTALL_PROGRAM) $(LIB_TH_CXX) $(DESTDIR)/$(libdir) - @SL_OFF@ @echo "Enter 'make installthcxxsl' to install the threaded C++ shared-library" - - installcxxsl : $(LIB_CXX_SL) -- $(srcdir)/mkinstalldirs $(libdir) -- $(INSTALL_PROGRAM) $(LIB_CXX_SL) $(libdir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)/$(libdir) -+ $(INSTALL_PROGRAM) $(LIB_CXX_SL) $(DESTDIR)/$(libdir) - - installcxx : $(INSTALL_CXX) -- $(srcdir)/mkinstalldirs $(libdir) -- $(INSTALL_PROGRAM) $(LIB_CXX) $(libdir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)/$(libdir) -+ $(INSTALL_PROGRAM) $(LIB_CXX) $(DESTDIR)/$(libdir) - @TH_OFF@ @echo "Enter 'make installthcxx' to install the threaded C++ library" - @SL_OFF@ @echo "Enter 'make installcxxsl' to install the C++ shared-library" - - installsl : $(LIB_SL) -- $(srcdir)/mkinstalldirs $(shlibdir) -- $(INSTALL_PROGRAM) $(LIB_SL) $(shlibdir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)/$(shlibdir) -+ $(INSTALL_PROGRAM) $(LIB_SL) $(DESTDIR)/$(shlibdir) - @CXX_OFF@ @echo "Enter 'make installcxxsl' to install the C++ shared-library" - @TH_OFF@ @echo "Enter 'make installthsl' to install thread shared-library" - - installlib : $(INSTALL_LIB) -- $(srcdir)/mkinstalldirs $(libdir) -- $(INSTALL_PROGRAM) $(LIBRARY) $(libdir) -- @RANLIB@ $(libdir)/$(LIBRARY) -+ $(srcdir)/mkinstalldirs $(DESTDIR)/$(libdir) -+ $(INSTALL_PROGRAM) $(LIBRARY) $(DESTDIR)/$(libdir) -+ @RANLIB@ $(DESTDIR)/$(libdir)/$(LIBRARY) - @SL_OFF@ @echo "Enter 'make installsl' to install $(LIB_SL) in $(shlibdir)" - @CXX_OFF@ @echo "Enter 'make installcxx' to install the C++ library" - @TH_OFF@ @echo "Enter 'make installth' to install thread library" - - installdocs : $(srcdir)/docs/$(HTMLFILE) $(srcdir)/docs/$(TEXIFILE) \ - $(srcdir)/docs/$(PDFFILE) -- $(srcdir)/mkinstalldirs $(docdir) -- $(INSTALL_DATA) $(srcdir)/docs/$(HTMLFILE) $(docdir) -- $(INSTALL_DATA) $(srcdir)/docs/$(TEXIFILE) $(docdir) -- $(INSTALL_DATA) $(srcdir)/docs/$(PDFFILE) $(docdir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)/$(docdir) -+ $(INSTALL_DATA) $(srcdir)/docs/$(HTMLFILE) $(DESTDIR)/$(docdir) -+ $(INSTALL_DATA) $(srcdir)/docs/$(TEXIFILE) $(DESTDIR)/$(docdir) -+ $(INSTALL_DATA) $(srcdir)/docs/$(PDFFILE) $(DESTDIR)/$(docdir) - --install : installincs installlib $(UTIL) -- $(srcdir)/mkinstalldirs $(bindir) -- $(INSTALL_PROGRAM) $(UTIL) $(bindir) -- @echo "Enter 'make installdocs' to install $(DOCFILES) in $(docdir)" -+installutil : $(UTIL) -+ $(srcdir)/mkinstalldirs $(DESTDIR)/$(bindir) -+ $(INSTALL_PROGRAM) $(UTIL) $(DESTDIR)/$(bindir) -+ -+install : installincs installlib installutil installdocs - - dmalloc.h.2 : $(srcdir)/configure - $(SHELL) $(srcdir)/configure diff --git a/patches/dmalloc/5.5.2/160-strdup_macro.patch b/patches/dmalloc/5.5.2/160-strdup_macro.patch deleted file mode 100644 index 4974d14..0000000 --- a/patches/dmalloc/5.5.2/160-strdup_macro.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- dmalloc-5.5.2.orig/configure 2008-06-17 13:10:09.000000000 +0200 -+++ dmalloc-5.5.2/configure 2008-06-17 13:11:25.000000000 +0200 -@@ -4691,8 +4691,35 @@ - echo "$as_me:$LINENO: checking strdup macro" >&5 - echo $ECHO_N "checking strdup macro... $ECHO_C" >&6 - if test "$cross_compiling" = yes; then -- ac_cv_strdup_macro=no -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+#if HAVE_STDLIB_H -+# include -+#endif -+ -+#ifndef strdup -+ choke me -+#endif - -+main() { exit(0); } -+ -+_ACEOF -+rm -f conftest.o conftest.obj -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ ac_cv_strdup_macro=yes -+else -+ ac_cv_strdup_macro=no -+fi -+ - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ diff --git a/patches/dmalloc/5.5.2/170-ppc-bogus-assembly.patch b/patches/dmalloc/5.5.2/170-ppc-bogus-assembly.patch deleted file mode 100644 index d92bd8a..0000000 --- a/patches/dmalloc/5.5.2/170-ppc-bogus-assembly.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ur dmalloc-5.5.2.orig/return.h dmalloc-5.5.2/return.h ---- dmalloc-5.5.2.orig/return.h 2016-03-13 13:11:48.090431764 -0700 -+++ dmalloc-5.5.2/return.h 2016-03-13 13:12:11.246642618 -0700 -@@ -251,8 +251,7 @@ - - #define GET_RET_ADDR(file) \ - do { \ -- asm("mflr 0"); \ -- asm("stw 0,%0" : "=g" (file)); \ -+ asm("mflr %0" : "=r"(file)); \ - } while(0) - - #endif /* __powerpc__ && __GNUC__ && !__OPTIMIZE__ */ diff --git a/scripts/addToolVersion.sh b/scripts/addToolVersion.sh index 643dcbb..1976743 100755 --- a/scripts/addToolVersion.sh +++ b/scripts/addToolVersion.sh @@ -16,7 +16,7 @@ doHelp() { cat <<-EOF Usage: ${myname} <--tool> <[options] version [...]> ... 'tool' in one of: - gcc, binutils, glibc, uClibc, uClibc-ng, newlib, linux, gdb, dmalloc, + gcc, binutils, glibc, uClibc, uClibc-ng, newlib, linux, gdb, duma, strace, ltrace, libelf, gmp, mpfr, isl, cloog, mpc, mingw-w64, expat, ncurses @@ -194,7 +194,6 @@ while [ $# -gt 0 ]; do --mingw-w64)EXP=; OBS=; cat=WINAPI; tool=mingw; tool_prefix=libc; dot2suffix=;; --linux) EXP=; OBS=; cat=KERNEL; tool=linux; tool_prefix=kernel; dot2suffix=;; --gdb) EXP=; OBS=; cat=GDB; tool=gdb; tool_prefix=debug; dot2suffix=;; - --dmalloc) EXP=; OBS=; cat=DMALLOC; tool=dmalloc; tool_prefix=debug; dot2suffix=;; --duma) EXP=; OBS=; cat=DUMA; tool=duma; tool_prefix=debug; dot2suffix=;; --strace) EXP=; OBS=; cat=STRACE; tool=strace; tool_prefix=debug; dot2suffix=;; --ltrace) EXP=; OBS=; cat=LTRACE; tool=ltrace; tool_prefix=debug; dot2suffix=;; diff --git a/scripts/build/debug/100-dmalloc.sh b/scripts/build/debug/100-dmalloc.sh deleted file mode 100644 index ad0d78d..0000000 --- a/scripts/build/debug/100-dmalloc.sh +++ /dev/null @@ -1,57 +0,0 @@ -# Build script for the dmalloc debug library facility - -do_debug_dmalloc_get() { - CT_GetFile "dmalloc-${CT_DMALLOC_VERSION}" http://dmalloc.com/releases/ -} - -do_debug_dmalloc_extract() { - CT_Extract "dmalloc-${CT_DMALLOC_VERSION}" - CT_Patch "dmalloc" "${CT_DMALLOC_VERSION}" -} - -do_debug_dmalloc_build() { - local -a extra_config - - CT_DoStep INFO "Installing dmalloc" - CT_DoLog EXTRA "Configuring dmalloc" - - mkdir -p "${CT_BUILD_DIR}/build-dmalloc" - cd "${CT_BUILD_DIR}/build-dmalloc" - - case "${CT_CC_LANG_CXX}" in - y) extra_config+=("--enable-cxx");; - *) extra_config+=("--disable-cxx");; - esac - case "${CT_THREADS}" in - none) extra_config+=("--disable-threads");; - *) extra_config+=("--enable-threads");; - esac - case "${CT_SHARED_LIBS}" in - y) extra_config+=("--enable-shlib");; - *) extra_config+=("--disable-shlib");; - esac - - CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'" - - CT_DoExecLog CFG \ - CC="${CT_TARGET}-gcc" \ - CXX="${CT_TARGET}-g++" \ - CPP="${CT_TARGET}-cpp" \ - LD="${CT_TARGET}-ld" \ - AR="${CT_TARGET}-ar" \ - CFLAGS=-fPIC \ - "${CT_SRC_DIR}/dmalloc-${CT_DMALLOC_VERSION}/configure" \ - --prefix=/usr \ - --build="${CT_BUILD}" \ - --host="${CT_TARGET}" \ - "${extra_config[@]}" - - CT_DoLog EXTRA "Building dmalloc" - CT_DoExecLog ALL make - - CT_DoLog EXTRA "Installing dmalloc" - CT_DoExecLog ALL make DESTDIR="${CT_SYSROOT_DIR}" installincs installlib - CT_DoExecLog ALL make DESTDIR="${CT_DEBUGROOT_DIR}" installutil - - CT_EndStep -} diff --git a/scripts/showSamples.sh b/scripts/showSamples.sh index aed3dd1..f3a21d2 100755 --- a/scripts/showSamples.sh +++ b/scripts/showSamples.sh @@ -116,7 +116,6 @@ dump_single_sample() { printf " %-*s : %s (threads: %s)\n" ${width} "C library" "${libc_name}${libc_ver:+-}${libc_ver}" "${CT_THREADS}" printf " %-*s :" ${width} "Tools" [ "${CT_TOOL_sstrip}" ] && printf " sstrip" - [ "${CT_DEBUG_dmalloc}" ] && printf " dmalloc-${CT_DMALLOC_VERSION}" [ "${CT_DEBUG_duma}" ] && printf " duma-${CT_DUMA_VERSION}" [ "${CT_DEBUG_gdb}" ] && printf " gdb-${CT_GDB_VERSION}" [ "${CT_DEBUG_ltrace}" ] && printf " ltrace-${CT_LTRACE_VERSION}" -- cgit v0.10.2-6-g49f6 From e593a1a30b193f7aef2f439a28f162e8c5b3fd6e Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Fri, 16 Dec 2016 16:12:15 -0800 Subject: Run samples through 'ct-ng update-samples'. Signed-off-by: Alexey Neyman diff --git a/samples/arm-cortex_a15-linux-gnueabihf/crosstool.config b/samples/arm-cortex_a15-linux-gnueabihf/crosstool.config index b625116..07a9590 100644 --- a/samples/arm-cortex_a15-linux-gnueabihf/crosstool.config +++ b/samples/arm-cortex_a15-linux-gnueabihf/crosstool.config @@ -13,7 +13,6 @@ CT_BINUTILS_LD_WRAPPER=y CT_BINUTILS_PLUGINS=y CT_CC_GCC_SHOW_LINARO=y CT_CC_LANG_CXX=y -CT_DEBUG_dmalloc=y CT_DEBUG_duma=y CT_DEBUG_gdb=y # CT_GDB_CROSS_PYTHON is not set diff --git a/samples/arm-cortex_a8-linux-gnueabi/crosstool.config b/samples/arm-cortex_a8-linux-gnueabi/crosstool.config index ff787d0..a80bb74 100644 --- a/samples/arm-cortex_a8-linux-gnueabi/crosstool.config +++ b/samples/arm-cortex_a8-linux-gnueabi/crosstool.config @@ -11,7 +11,6 @@ CT_BINUTILS_GOLD_THREADS=y CT_BINUTILS_LD_WRAPPER=y CT_BINUTILS_PLUGINS=y CT_CC_LANG_CXX=y -CT_DEBUG_dmalloc=y CT_DEBUG_duma=y CT_DEBUG_gdb=y # CT_GDB_CROSS_PYTHON is not set diff --git a/samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config b/samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config index 5c7039e..b8b31b6 100644 --- a/samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config +++ b/samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config @@ -15,7 +15,6 @@ CT_BINUTILS_PLUGINS=y CT_LIBC_uClibc=y CT_LIBC_UCLIBC_WCHAR=y CT_CC_LANG_CXX=y -CT_DEBUG_dmalloc=y CT_DEBUG_duma=y CT_DEBUG_gdb=y CT_GDB_CROSS_STATIC=y diff --git a/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config b/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config index 958880a..4580410 100644 --- a/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config +++ b/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config @@ -9,7 +9,6 @@ CT_ARCH_arm=y CT_TARGET_VENDOR="cortexa9_neon" CT_TOOLCHAIN_ENABLE_NLS=y CT_KERNEL_linux=y -CT_BINUTILS_V_2_22=y CT_BINUTILS_LINKER_LD_GOLD=y CT_BINUTILS_GOLD_THREADS=y CT_BINUTILS_LD_WRAPPER=y diff --git a/samples/arm-multilib-linux-uclibcgnueabi/crosstool.config b/samples/arm-multilib-linux-uclibcgnueabi/crosstool.config index b9fcb42..19bf836 100644 --- a/samples/arm-multilib-linux-uclibcgnueabi/crosstool.config +++ b/samples/arm-multilib-linux-uclibcgnueabi/crosstool.config @@ -13,6 +13,5 @@ CT_BINUTILS_PLUGINS=y CT_LIBC_uClibc=y CT_THREADS_NONE=y CT_CC_GCC_MULTILIB_LIST="aprofile" -CT_DEBUG_dmalloc=y CT_DEBUG_ltrace=y CT_DEBUG_strace=y diff --git a/samples/arm-unknown-linux-gnueabi/crosstool.config b/samples/arm-unknown-linux-gnueabi/crosstool.config index 5be3309..ed48825 100644 --- a/samples/arm-unknown-linux-gnueabi/crosstool.config +++ b/samples/arm-unknown-linux-gnueabi/crosstool.config @@ -11,7 +11,6 @@ CT_BINUTILS_LD_WRAPPER=y CT_BINUTILS_PLUGINS=y # CT_CC_GCC_SJLJ_EXCEPTIONS is not set CT_CC_LANG_CXX=y -CT_DEBUG_dmalloc=y CT_DEBUG_duma=y CT_DEBUG_gdb=y # CT_GDB_CROSS_PYTHON is not set diff --git a/samples/arm-unknown-linux-musleabi/crosstool.config b/samples/arm-unknown-linux-musleabi/crosstool.config index ba62cfb..50cfcd6 100644 --- a/samples/arm-unknown-linux-musleabi/crosstool.config +++ b/samples/arm-unknown-linux-musleabi/crosstool.config @@ -11,7 +11,6 @@ CT_BINUTILS_PLUGINS=y CT_BINUTILS_FOR_TARGET=y CT_LIBC_musl=y CT_CC_LANG_CXX=y -CT_DEBUG_dmalloc=y CT_DEBUG_duma=y CT_DEBUG_gdb=y CT_GDB_NATIVE=y diff --git a/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config b/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config index 9f6a4ba..0c285a5 100644 --- a/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config +++ b/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config @@ -11,7 +11,6 @@ CT_BINUTILS_LD_WRAPPER=y CT_BINUTILS_PLUGINS=y CT_LIBC_uClibc=y CT_CC_LANG_CXX=y -CT_DEBUG_dmalloc=y CT_DEBUG_duma=y CT_DEBUG_gdb=y CT_GDB_CROSS_STATIC=y diff --git a/samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config b/samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config index 0ca5498..ddf6e74 100644 --- a/samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config +++ b/samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config @@ -12,7 +12,6 @@ CT_BINUTILS_LD_WRAPPER=y CT_BINUTILS_PLUGINS=y CT_LIBC_uClibc=y CT_CC_LANG_CXX=y -CT_DEBUG_dmalloc=y CT_DEBUG_duma=y CT_DEBUG_gdb=y CT_GDB_CROSS_STATIC=y diff --git a/samples/armeb-unknown-linux-gnueabi/crosstool.config b/samples/armeb-unknown-linux-gnueabi/crosstool.config index 5af2ece..a9ac884 100644 --- a/samples/armeb-unknown-linux-gnueabi/crosstool.config +++ b/samples/armeb-unknown-linux-gnueabi/crosstool.config @@ -12,7 +12,6 @@ CT_BINUTILS_LD_WRAPPER=y CT_BINUTILS_PLUGINS=y # CT_CC_GCC_SJLJ_EXCEPTIONS is not set CT_CC_LANG_CXX=y -CT_DEBUG_dmalloc=y CT_DEBUG_duma=y CT_DEBUG_gdb=y # CT_GDB_CROSS_PYTHON is not set diff --git a/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config b/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config index 22ed53c..3867dce 100644 --- a/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config +++ b/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config @@ -13,7 +13,6 @@ CT_BINUTILS_PLUGINS=y CT_LIBC_uClibc=y # CT_CC_GCC_SJLJ_EXCEPTIONS is not set CT_CC_LANG_CXX=y -CT_DEBUG_dmalloc=y CT_DEBUG_duma=y CT_DEBUG_gdb=y # CT_GDB_CROSS_PYTHON is not set diff --git a/samples/i586-geode-linux-uclibc/crosstool.config b/samples/i586-geode-linux-uclibc/crosstool.config index 5a5a2dc..a10f9ea 100644 --- a/samples/i586-geode-linux-uclibc/crosstool.config +++ b/samples/i586-geode-linux-uclibc/crosstool.config @@ -12,7 +12,6 @@ CT_BINUTILS_PLUGINS=y CT_LIBC_uClibc=y CT_LIBC_UCLIBC_WCHAR=y CT_CC_LANG_CXX=y -CT_DEBUG_dmalloc=y CT_DEBUG_duma=y CT_DEBUG_gdb=y # CT_GDB_CROSS_PYTHON is not set diff --git a/samples/i686-nptl-linux-gnu/crosstool.config b/samples/i686-nptl-linux-gnu/crosstool.config index 951053c..3259d05 100644 --- a/samples/i686-nptl-linux-gnu/crosstool.config +++ b/samples/i686-nptl-linux-gnu/crosstool.config @@ -10,7 +10,6 @@ CT_BINUTILS_GOLD_THREADS=y CT_BINUTILS_LD_WRAPPER=y CT_BINUTILS_PLUGINS=y CT_CC_LANG_CXX=y -CT_DEBUG_dmalloc=y CT_DEBUG_duma=y CT_DEBUG_gdb=y # CT_GDB_CROSS_PYTHON is not set diff --git a/samples/i686-w64-mingw32,nios2-spico-elf/crosstool.config b/samples/i686-w64-mingw32,nios2-spico-elf/crosstool.config index 70b5a03..e0075fd 100644 --- a/samples/i686-w64-mingw32,nios2-spico-elf/crosstool.config +++ b/samples/i686-w64-mingw32,nios2-spico-elf/crosstool.config @@ -9,9 +9,7 @@ CT_TOOLCHAIN_BUGURL="https://bitbucket.org/netzimme/eax-gcc/issues?status=new&st CT_TARGET_VENDOR="spico" CT_CANADIAN=y CT_HOST="i686-w64-mingw32" -CT_BINUTILS_V_2_25=y CT_CC_LANG_CXX=y CT_DEBUG_gdb=y CT_MPFR_V_3_1_2=y -CT_ISL_V_0_14=y CT_MPC_V_1_0_2=y diff --git a/samples/i686-w64-mingw32/crosstool.config b/samples/i686-w64-mingw32/crosstool.config index a686988..aa0c515 100644 --- a/samples/i686-w64-mingw32/crosstool.config +++ b/samples/i686-w64-mingw32/crosstool.config @@ -1,5 +1,5 @@ -CT_LOCAL_TARBALLS_DIR="${HOME}/src" CT_EXPERIMENTAL=y +CT_LOCAL_TARBALLS_DIR="${HOME}/src" CT_SAVE_TARBALLS=y CT_LOG_EXTRA=y CT_ARCH_ARCH="i686" diff --git a/samples/m68k-unknown-uclinux-uclibc/crosstool.config b/samples/m68k-unknown-uclinux-uclibc/crosstool.config index 21175ea..05bf58e 100644 --- a/samples/m68k-unknown-uclinux-uclibc/crosstool.config +++ b/samples/m68k-unknown-uclinux-uclibc/crosstool.config @@ -3,5 +3,4 @@ CT_SAVE_TARBALLS=y CT_LOG_EXTRA=y CT_ARCH_m68k=y CT_KERNEL_linux=y -CT_LIBC_uClibc=y CT_THREADS_LT=y diff --git a/samples/mips-unknown-linux-uclibc/crosstool.config b/samples/mips-unknown-linux-uclibc/crosstool.config index 38cd258..cc4fb42 100644 --- a/samples/mips-unknown-linux-uclibc/crosstool.config +++ b/samples/mips-unknown-linux-uclibc/crosstool.config @@ -10,7 +10,6 @@ CT_LIBC_uClibc=y CT_LIBC_UCLIBC_WCHAR=y CT_CC_GCC_mips_plt=y CT_CC_LANG_CXX=y -CT_DEBUG_dmalloc=y CT_DEBUG_duma=y CT_DEBUG_gdb=y # CT_GDB_CROSS_PYTHON is not set diff --git a/samples/mipsel-multilib-linux-gnu/crosstool.config b/samples/mipsel-multilib-linux-gnu/crosstool.config index fa54b08..4f52c97 100644 --- a/samples/mipsel-multilib-linux-gnu/crosstool.config +++ b/samples/mipsel-multilib-linux-gnu/crosstool.config @@ -12,7 +12,6 @@ CT_CC_GCC_CORE_EXTRA_CONFIG_ARRAY="--enable-targets=all" CT_CC_GCC_EXTRA_CONFIG_ARRAY="--enable-targets=all" CT_CC_GCC_mips_plt=y CT_CC_LANG_CXX=y -CT_DEBUG_dmalloc=y CT_DEBUG_duma=y CT_DEBUG_gdb=y # CT_GDB_CROSS_PYTHON is not set diff --git a/samples/mipsel-unknown-linux-gnu/crosstool.config b/samples/mipsel-unknown-linux-gnu/crosstool.config index edaefed..7506d4c 100644 --- a/samples/mipsel-unknown-linux-gnu/crosstool.config +++ b/samples/mipsel-unknown-linux-gnu/crosstool.config @@ -9,7 +9,6 @@ CT_KERNEL_linux=y CT_BINUTILS_PLUGINS=y CT_CC_GCC_mips_plt=y CT_CC_LANG_CXX=y -CT_DEBUG_dmalloc=y CT_DEBUG_duma=y CT_DEBUG_gdb=y # CT_GDB_CROSS_PYTHON is not set diff --git a/samples/powerpc-unknown-linux-uclibc/crosstool.config b/samples/powerpc-unknown-linux-uclibc/crosstool.config index fd2ea66..e797ccb 100644 --- a/samples/powerpc-unknown-linux-uclibc/crosstool.config +++ b/samples/powerpc-unknown-linux-uclibc/crosstool.config @@ -8,7 +8,6 @@ CT_BINUTILS_FOR_TARGET=y CT_LIBC_uClibc=y CT_CC_LANG_FORTRAN=y CT_CC_LANG_CXX=y -CT_DEBUG_dmalloc=y CT_DEBUG_duma=y CT_DEBUG_gdb=y CT_GDB_NATIVE=y diff --git a/samples/powerpc64le-unknown-linux-gnu/crosstool.config b/samples/powerpc64le-unknown-linux-gnu/crosstool.config index 6c7771d..5359d42 100644 --- a/samples/powerpc64le-unknown-linux-gnu/crosstool.config +++ b/samples/powerpc64le-unknown-linux-gnu/crosstool.config @@ -1,6 +1,7 @@ CT_LOCAL_TARBALLS_DIR="${HOME}/src" CT_SAVE_TARBALLS=y CT_LOG_EXTRA=y +CT_ARCH_LE=y CT_ARCH_64=y CT_ARCH_powerpc=y CT_KERNEL_linux=y @@ -9,5 +10,3 @@ CT_CC_LANG_CXX=y CT_DEBUG_gdb=y # CT_GDB_CROSS_PYTHON is not set CT_GDB_NATIVE=y -CT_ARCH_ENDIAN="little" -CT_ARCH_LE=y diff --git a/samples/x86_64-multilib-linux-musl/crosstool.config b/samples/x86_64-multilib-linux-musl/crosstool.config index c16bd4a..e633110 100644 --- a/samples/x86_64-multilib-linux-musl/crosstool.config +++ b/samples/x86_64-multilib-linux-musl/crosstool.config @@ -14,6 +14,5 @@ CT_BINUTILS_LD_WRAPPER=y CT_BINUTILS_PLUGINS=y CT_LIBC_musl=y CT_CC_LANG_CXX=y -CT_DEBUG_dmalloc=y CT_DEBUG_duma=y CT_DEBUG_gdb=y diff --git a/samples/x86_64-multilib-linux-uclibc/crosstool.config b/samples/x86_64-multilib-linux-uclibc/crosstool.config index f28915a..2a29629 100644 --- a/samples/x86_64-multilib-linux-uclibc/crosstool.config +++ b/samples/x86_64-multilib-linux-uclibc/crosstool.config @@ -14,7 +14,6 @@ CT_BINUTILS_PLUGINS=y CT_LIBC_uClibc=y CT_LIBC_UCLIBC_WCHAR=y CT_CC_LANG_CXX=y -CT_DEBUG_dmalloc=y CT_DEBUG_duma=y CT_DEBUG_gdb=y CT_GDB_NATIVE=y diff --git a/samples/x86_64-unknown-linux-uclibc/crosstool.config b/samples/x86_64-unknown-linux-uclibc/crosstool.config index 6f724e6..31af80b 100644 --- a/samples/x86_64-unknown-linux-uclibc/crosstool.config +++ b/samples/x86_64-unknown-linux-uclibc/crosstool.config @@ -12,7 +12,6 @@ CT_BINUTILS_PLUGINS=y CT_LIBC_uClibc=y CT_LIBC_UCLIBC_WCHAR=y CT_CC_LANG_CXX=y -CT_DEBUG_dmalloc=y CT_DEBUG_duma=y CT_DEBUG_gdb=y CT_GDB_NATIVE=y diff --git a/samples/x86_64-w64-mingw32,x86_64-pc-linux-gnu/crosstool.config b/samples/x86_64-w64-mingw32,x86_64-pc-linux-gnu/crosstool.config index 304ad60..cb9e187 100644 --- a/samples/x86_64-w64-mingw32,x86_64-pc-linux-gnu/crosstool.config +++ b/samples/x86_64-w64-mingw32,x86_64-pc-linux-gnu/crosstool.config @@ -22,5 +22,5 @@ CT_GMP_V_5_1_3=y CT_MPFR_V_3_1_2=y CT_MPC_V_0_9=y CT_COMP_TOOLS=y -CT_COMP_TOOLS_make=y CT_COMP_TOOLS_libtool=y +CT_COMP_TOOLS_make=y -- cgit v0.10.2-6-g49f6