diff options
author | Justus Winter <4winter@informatik.uni-hamburg.de> | 2014-11-13 16:16:07 +0100 |
---|---|---|
committer | Justus Winter <4winter@informatik.uni-hamburg.de> | 2014-11-13 16:16:07 +0100 |
commit | dd88ee3755c39d17e11319267cf7bb46a83a7d84 (patch) | |
tree | 59e7008664a8485647ee7e9f71d98930ddfa5f0e /debian | |
parent | c5a19ca2d876513d81e93ae89831818a338cf6d5 (diff) |
drop old patch series
Diffstat (limited to 'debian')
3 files changed, 0 insertions, 136 deletions
diff --git a/debian/patches/0001-libshouldbeinlibc-add-assert.h-variant-that-prints-b.patch b/debian/patches/0001-libshouldbeinlibc-add-assert.h-variant-that-prints-b.patch deleted file mode 100644 index 1c23b384..00000000 --- a/debian/patches/0001-libshouldbeinlibc-add-assert.h-variant-that-prints-b.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 7b40b0208f3ee9af379b83720ff624dd99fdf823 Mon Sep 17 00:00:00 2001 -From: Justus Winter <4winter@informatik.uni-hamburg.de> -Date: Fri, 20 Jun 2014 15:50:53 +0200 -Subject: [PATCH hurd 1/3] libshouldbeinlibc: add assert.h variant that prints - backtraces - -* libshouldbeinlibc/assert-backtrace.h: New file. -* libshouldbeinlibc/Makefile (installhdrs): Add assert-backtrace.h. ---- - libshouldbeinlibc/Makefile | 4 ++- - libshouldbeinlibc/assert-backtrace.h | 70 ++++++++++++++++++++++++++++++++++++ - 2 files changed, 73 insertions(+), 1 deletion(-) - create mode 100644 libshouldbeinlibc/assert-backtrace.h - -diff --git a/libshouldbeinlibc/Makefile b/libshouldbeinlibc/Makefile -index 14a7939..b32e1bd 100644 ---- a/libshouldbeinlibc/Makefile -+++ b/libshouldbeinlibc/Makefile -@@ -29,7 +29,9 @@ SRCS = termsize.c timefmt.c exec-reauth.c maptime-funcs.c \ - ugids-auth.c ugids-xinl.c ugids-merge.c ugids-imply.c ugids-posix.c \ - ugids-verify-auth.c nullauth.c - installhdrs = idvec.h timefmt.h maptime.h \ -- wire.h portinfo.h portxlate.h cacheq.h ugids.h nullauth.h -+ wire.h portinfo.h portxlate.h cacheq.h ugids.h nullauth.h \ -+ assert-backtrace.h \ -+ - installhdrsubdir = . - - OBJS = $(SRCS:.c=.o) -diff --git a/libshouldbeinlibc/assert-backtrace.h b/libshouldbeinlibc/assert-backtrace.h -new file mode 100644 -index 0000000..099a112 ---- /dev/null -+++ b/libshouldbeinlibc/assert-backtrace.h -@@ -0,0 +1,70 @@ -+/* Augment failing assertions with backtraces. -+ -+ Copyright (C) 2014 Free Software Foundation, Inc. -+ -+ This file is part of the GNU Hurd. -+ -+ The GNU Hurd is free software; you can redistribute it and/or -+ modify it under the terms of the GNU General Public License as -+ published by the Free Software Foundation; either version 2, or (at -+ your option) any later version. -+ -+ The GNU Hurd is distributed in the hope that it will be useful, but -+ WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with the GNU Hurd. If not, see <http://www.gnu.org/licenses/>. */ -+ -+#ifndef __ASSERT_BACKTRACE__ -+#define __ASSERT_BACKTRACE__ -+ -+#ifndef NDEBUG -+ -+#include <assert.h> -+#include <errno.h> -+#include <execinfo.h> -+#include <stdio.h> -+#include <unistd.h> -+ -+/* This prints an "Assertion failed" message and aborts. */ -+static void __assert_fail_backtrace (const char *__assertion, -+ const char *__file, -+ unsigned int __line, -+ const char *__function) -+ __attribute__ ((noreturn, unused)); -+ -+#undef assert -+#define assert(expr) \ -+ ((expr) \ -+ ? __ASSERT_VOID_CAST (0) \ -+ : __assert_fail_backtrace (__STRING(expr), __FILE__, __LINE__, __ASSERT_FUNCTION)) -+ -+static inline void -+__assert_fail_backtrace (const char *__assertion, const char *__file, -+ unsigned int __line, const char *__function) -+{ -+#define SIZE 128 -+#define SKIP 1 -+#define MY_errno (*__errno_location ()) -+ int nptrs; -+ void *buffer[SIZE]; -+ -+ error (0, 0, "%s:%d: %s: Assertion `%s' failed.", -+ __file, __line, __function, __assertion); -+ -+ nptrs = backtrace(buffer, SIZE); -+ if (nptrs == 0) -+ error (1, MY_errno, "backtrace"); -+ -+ backtrace_symbols_fd (&buffer[SKIP], nptrs - SKIP, STDERR_FILENO); -+ fflush (stderr); -+ exit (EXIT_FAILURE); -+#undef MY_errno -+#undef SKIP -+#undef SIZE -+} -+ -+#endif /* NDEBUG */ -+#endif /* __ASSERT_BACKTRACE__ */ --- -2.1.1 - diff --git a/debian/patches/0002-include-use-assert-backtrace.h-in-refcount.h.patch b/debian/patches/0002-include-use-assert-backtrace.h-in-refcount.h.patch deleted file mode 100644 index 2487ed1f..00000000 --- a/debian/patches/0002-include-use-assert-backtrace.h-in-refcount.h.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 594181754f5067093e7f73217b9b59e98c9abe39 Mon Sep 17 00:00:00 2001 -From: Justus Winter <4winter@informatik.uni-hamburg.de> -Date: Fri, 20 Jun 2014 15:52:52 +0200 -Subject: [PATCH hurd 2/3] include: use assert-backtrace.h in refcount.h - -* include/refcount.h: Use assert-backtrace.h. ---- - include/refcount.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/refcount.h b/include/refcount.h -index ebde42d..5bb9660 100644 ---- a/include/refcount.h -+++ b/include/refcount.h -@@ -22,7 +22,7 @@ - #ifndef _HURD_REFCOUNT_H_ - #define _HURD_REFCOUNT_H_ - --#include <assert.h> -+#include <assert-backtrace.h> - #include <limits.h> - #include <stdint.h> - --- -2.1.1 - diff --git a/debian/patches/series b/debian/patches/series index 76ad8769..cfa5c51f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -56,7 +56,5 @@ xkb-compat.patch #procfs-0007-procfs-provide-magic-retry-response-for-proc-self.patch startup-avoid-broken-puts.patch -0001-libshouldbeinlibc-add-assert.h-variant-that-prints-b.patch -0002-include-use-assert-backtrace.h-in-refcount.h.patch mach-defpager-fix-build.patch |