summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/patches/0003-hack_why_doesnt_backtrace_symbols_fd_work.patch29
-rw-r--r--debian/patches/series4
-rw-r--r--debian/patches/use__ATOMIC_SEQ_CST.patch94
3 files changed, 2 insertions, 125 deletions
diff --git a/debian/patches/0003-hack_why_doesnt_backtrace_symbols_fd_work.patch b/debian/patches/0003-hack_why_doesnt_backtrace_symbols_fd_work.patch
deleted file mode 100644
index d2e0b2d4..00000000
--- a/debian/patches/0003-hack_why_doesnt_backtrace_symbols_fd_work.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0dc93993bcdf6e606ed6a8238b4981d9d51294d5 Mon Sep 17 00:00:00 2001
-From: Justus Winter <4winter@informatik.uni-hamburg.de>
-Date: Wed, 29 Oct 2014 15:00:29 +0100
-Subject: [PATCH hurd 3/3] hack_why_doesnt_backtrace_symbols_fd_work
-
----
- libshouldbeinlibc/assert-backtrace.h | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/libshouldbeinlibc/assert-backtrace.h b/libshouldbeinlibc/assert-backtrace.h
-index 099a112..825c9cf 100644
---- a/libshouldbeinlibc/assert-backtrace.h
-+++ b/libshouldbeinlibc/assert-backtrace.h
-@@ -58,6 +58,12 @@ __assert_fail_backtrace (const char *__assertion, const char *__file,
- if (nptrs == 0)
- error (1, MY_errno, "backtrace");
-
-+#ifndef why_doesnt_backtrace_symbols_fd_work
-+ int i;
-+ for (i = SKIP; i < nptrs; i++)
-+ error (0, 0, "%d: %p", i - SKIP, buffer[i]);
-+#endif
-+
- backtrace_symbols_fd (&buffer[SKIP], nptrs - SKIP, STDERR_FILENO);
- fflush (stderr);
- exit (EXIT_FAILURE);
---
-2.1.1
-
diff --git a/debian/patches/series b/debian/patches/series
index 2c54826d..5df1a067 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -56,8 +56,8 @@ xkb-compat.patch
#procfs-0007-procfs-provide-magic-retry-response-for-proc-self.patch
startup-avoid-broken-puts.patch
libpager-fixthreads.patch
+
0001-libshouldbeinlibc-add-assert.h-variant-that-prints-b.patch
0002-include-use-assert-backtrace.h-in-refcount.h.patch
-0003-hack_why_doesnt_backtrace_symbols_fd_work.patch
-use__ATOMIC_SEQ_CST.patch
+
mach-defpager-fix-build.patch
diff --git a/debian/patches/use__ATOMIC_SEQ_CST.patch b/debian/patches/use__ATOMIC_SEQ_CST.patch
deleted file mode 100644
index 59f1f9bc..00000000
--- a/debian/patches/use__ATOMIC_SEQ_CST.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff --git a/include/refcount.h b/include/refcount.h
-index 5bb9660..68fb8fc 100644
---- a/include/refcount.h
-+++ b/include/refcount.h
-@@ -50,7 +50,7 @@ static inline unsigned int
- refcount_unsafe_ref (refcount_t *ref)
- {
- unsigned int r;
-- r = __atomic_add_fetch (ref, 1, __ATOMIC_RELAXED);
-+ r = __atomic_add_fetch (ref, 1, __ATOMIC_SEQ_CST);
- assert (r != UINT_MAX || !"refcount overflowed!");
- return r;
- }
-@@ -74,7 +74,7 @@ static inline unsigned int
- refcount_deref (refcount_t *ref)
- {
- unsigned int r;
-- r = __atomic_sub_fetch (ref, 1, __ATOMIC_RELAXED);
-+ r = __atomic_sub_fetch (ref, 1, __ATOMIC_SEQ_CST);
- assert (r != UINT_MAX || !"refcount underflowed!");
- return r;
- }
-@@ -84,7 +84,7 @@ refcount_deref (refcount_t *ref)
- static inline unsigned int
- refcount_references (refcount_t *ref)
- {
-- return __atomic_load_n (ref, __ATOMIC_RELAXED);
-+ return __atomic_load_n (ref, __ATOMIC_SEQ_CST);
- }
-
- /* Reference counting with weak references. */
-@@ -140,7 +140,7 @@ refcounts_unsafe_ref (refcounts_t *ref, struct references *result)
- {
- const union _references op = { .references = { .hard = 1 } };
- union _references r;
-- r.value = __atomic_add_fetch (&ref->value, op.value, __ATOMIC_RELAXED);
-+ r.value = __atomic_add_fetch (&ref->value, op.value, __ATOMIC_SEQ_CST);
- assert (r.references.hard != UINT32_MAX || !"refcount overflowed!");
- if (result)
- *result = r.references;
-@@ -170,7 +170,7 @@ refcounts_deref (refcounts_t *ref, struct references *result)
- {
- const union _references op = { .references = { .hard = 1 } };
- union _references r;
-- r.value = __atomic_sub_fetch (&ref->value, op.value, __ATOMIC_RELAXED);
-+ r.value = __atomic_sub_fetch (&ref->value, op.value, __ATOMIC_SEQ_CST);
- assert (r.references.hard != UINT32_MAX || !"refcount underflowed!");
- if (result)
- *result = r.references;
-@@ -200,7 +200,7 @@ refcounts_promote (refcounts_t *ref, struct references *result)
- const union _references op =
- { .references = { .weak = ~0U, .hard = 1} };
- union _references r;
-- r.value = __atomic_add_fetch (&ref->value, op.value, __ATOMIC_RELAXED);
-+ r.value = __atomic_add_fetch (&ref->value, op.value, __ATOMIC_SEQ_CST);
- assert (r.references.hard != UINT32_MAX || !"refcount overflowed!");
- assert (r.references.weak != UINT32_MAX || !"refcount underflowed!");
- if (result)
-@@ -228,7 +228,7 @@ refcounts_demote (refcounts_t *ref, struct references *result)
- operation. */
- const union _references op = { .references = { .hard = ~0U } };
- union _references r;
-- r.value = __atomic_add_fetch (&ref->value, op.value, __ATOMIC_RELAXED);
-+ r.value = __atomic_add_fetch (&ref->value, op.value, __ATOMIC_SEQ_CST);
- assert (r.references.hard != UINT32_MAX || !"refcount underflowed!");
- assert (r.references.weak != UINT32_MAX || !"refcount overflowed!");
- if (result)
-@@ -248,7 +248,7 @@ refcounts_unsafe_ref_weak (refcounts_t *ref, struct references *result)
- {
- const union _references op = { .references = { .weak = 1 } };
- union _references r;
-- r.value = __atomic_add_fetch (&ref->value, op.value, __ATOMIC_RELAXED);
-+ r.value = __atomic_add_fetch (&ref->value, op.value, __ATOMIC_SEQ_CST);
- assert (r.references.weak != UINT32_MAX || !"refcount overflowed!");
- if (result)
- *result = r.references;
-@@ -278,7 +278,7 @@ refcounts_deref_weak (refcounts_t *ref, struct references *result)
- {
- const union _references op = { .references = { .weak = 1 } };
- union _references r;
-- r.value = __atomic_sub_fetch (&ref->value, op.value, __ATOMIC_RELAXED);
-+ r.value = __atomic_sub_fetch (&ref->value, op.value, __ATOMIC_SEQ_CST);
- assert (r.references.weak != UINT32_MAX || !"refcount underflowed!");
- if (result)
- *result = r.references;
-@@ -291,7 +291,7 @@ static inline void
- refcounts_references (refcounts_t *ref, struct references *result)
- {
- union _references r;
-- r.value =__atomic_load_n (&ref->value, __ATOMIC_RELAXED);
-+ r.value =__atomic_load_n (&ref->value, __ATOMIC_SEQ_CST);
- *result = r.references;
- }
-
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-18 00:31:44 +0000