Revert "[zircon-internal] Remove deprecated zx_crashlogger_request_backtrace"
This reverts commit d2f6e543aa4e4139794cbce12e0e77af4e802147.
Reason for revert: This breaks global integration, and is blocking the Zircon roller.
Original change's description:
> [zircon-internal] Remove deprecated zx_crashlogger_request_backtrace
>
> All clients have been migrated to backtrace_request().
>
> Test: no functional change
> Change-Id: I33f4b7b4489b6be4fd75a649003a04676c629fd9
TBR=kulakowski@google.com,jamesr@google.com
Change-Id: Ie49b31ec6fcb886c39f064bd9be96ab430712697
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
diff --git a/system/ulib/test-utils/test-utils.c b/system/ulib/test-utils/test-utils.c
index 900711d..918f841 100644
--- a/system/ulib/test-utils/test-utils.c
+++ b/system/ulib/test-utils/test-utils.c
@@ -7,6 +7,7 @@
#include <launchpad/launchpad.h>
#include <launchpad/vmo.h>
#include <lib/backtrace-request/backtrace-request.h>
+#include <lib/zircon-internal/crashlogger.h>
#include <zircon/process.h>
#include <zircon/syscalls.h>
#include <zircon/syscalls/port.h>
diff --git a/system/ulib/zircon-internal/include/lib/zircon-internal/crashlogger.h b/system/ulib/zircon-internal/include/lib/zircon-internal/crashlogger.h
new file mode 100644
index 0000000..98749a3
--- /dev/null
+++ b/system/ulib/zircon-internal/include/lib/zircon-internal/crashlogger.h
@@ -0,0 +1,27 @@
+// Copyright 2016 The Fuchsia Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef ZIRCON_CRASHLOGGER_H_
+#define ZIRCON_CRASHLOGGER_H_
+
+#include <stdint.h>
+
+#define ZX_CRASHLOGGER_REQUEST_SELF_BT_MAGIC ((uint64_t)0xee726573756d65ee)
+
+// Invoke this function to cause crashlogger to print a backtrace
+// and resume the thread without killing the process.
+
+static inline void zx_crashlogger_request_backtrace(void) {
+#ifdef __x86_64__
+ __asm__ ("int3" : : "a" (ZX_CRASHLOGGER_REQUEST_SELF_BT_MAGIC));
+#endif
+#ifdef __aarch64__
+ // This is what gdb uses.
+ __asm__ ("mov x0, %0\n"
+ "\tbrk 0"
+ : : "r" (ZX_CRASHLOGGER_REQUEST_SELF_BT_MAGIC) : "x0");
+#endif
+}
+
+#endif // ZIRCON_CRASHLOGGER_H_
