aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAntonio Nino Diaz <antonio.ninodiaz@arm.com>2019-02-08 13:20:37 +0000
committerAntonio Nino Diaz <antonio.ninodiaz@arm.com>2019-02-08 13:42:38 +0000
commit70b0f2789e93f253bec5cbd2986d0de023c1bdf4 (patch)
tree4de89a2865b8412b3061567f40ee497b45851904 /include
parente05663051671bdec38056a2da5ddebd390b4abca (diff)
downloadtrusted-firmware-a-70b0f2789e93f253bec5cbd2986d0de023c1bdf4.tar.gz
libc: Move setjmp to libc folder
Now that setjmp() and longjmp() are compliant with the standard they can be moved with the other libc files. Change-Id: Iea3b91c34eb353ace5e171e72f331602d57774d5 Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Diffstat (limited to 'include')
-rw-r--r--include/lib/libc/aarch64/setjmp_.h (renamed from include/arch/aarch64/setjmp.h)11
-rw-r--r--include/lib/libc/setjmp.h20
2 files changed, 24 insertions, 7 deletions
diff --git a/include/arch/aarch64/setjmp.h b/include/lib/libc/aarch64/setjmp_.h
index f7991fddbd..174b3eb180 100644
--- a/include/arch/aarch64/setjmp.h
+++ b/include/lib/libc/aarch64/setjmp_.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef SETJMP_H
-#define SETJMP_H
+#ifndef SETJMP__H
+#define SETJMP__H
#define JMP_CTX_X19 0x0
#define JMP_CTX_X21 0x10
@@ -21,13 +21,10 @@
#ifndef __ASSEMBLY__
#include <cdefs.h>
-#include <stdint.h>
/* Jump buffer hosting x18 - x30 and sp_el0 registers */
typedef uint64_t jmp_buf[JMP_SIZE] __aligned(16);
-int setjmp(jmp_buf env);
-__dead2 void longjmp(jmp_buf env, int val);
-
#endif /* __ASSEMBLY__ */
-#endif /* SETJMP_H */
+
+#endif /* SETJMP__H */
diff --git a/include/lib/libc/setjmp.h b/include/lib/libc/setjmp.h
new file mode 100644
index 0000000000..5661201a0b
--- /dev/null
+++ b/include/lib/libc/setjmp.h
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef SETJMP_H
+#define SETJMP_H
+
+#include <setjmp_.h>
+
+#ifndef __ASSEMBLY__
+
+#include <cdefs.h>
+
+int setjmp(jmp_buf env);
+__dead2 void longjmp(jmp_buf env, int val);
+
+#endif /* __ASSEMBLY__ */
+#endif /* SETJMP_H */