diff options
| author | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2019-02-08 13:20:37 +0000 |
|---|---|---|
| committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2019-02-08 13:42:38 +0000 |
| commit | 70b0f2789e93f253bec5cbd2986d0de023c1bdf4 (patch) | |
| tree | 4de89a2865b8412b3061567f40ee497b45851904 /lib | |
| parent | e05663051671bdec38056a2da5ddebd390b4abca (diff) | |
| download | platform_external_arm-trusted-firmware-70b0f2789e93f253bec5cbd2986d0de023c1bdf4.tar.gz platform_external_arm-trusted-firmware-70b0f2789e93f253bec5cbd2986d0de023c1bdf4.tar.bz2 platform_external_arm-trusted-firmware-70b0f2789e93f253bec5cbd2986d0de023c1bdf4.zip | |
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 'lib')
| -rw-r--r-- | lib/libc/aarch64/setjmp.S (renamed from lib/aarch64/setjmp.S) | 0 | ||||
| -rw-r--r-- | lib/libc/libc.mk | 9 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lib/aarch64/setjmp.S b/lib/libc/aarch64/setjmp.S index 9d9eb49ba..9d9eb49ba 100644 --- a/lib/aarch64/setjmp.S +++ b/lib/libc/aarch64/setjmp.S diff --git a/lib/libc/libc.mk b/lib/libc/libc.mk index 1276f5c82..e1b5560f8 100644 --- a/lib/libc/libc.mk +++ b/lib/libc/libc.mk @@ -1,10 +1,10 @@ # -# Copyright (c) 2016-2018, ARM Limited and Contributors. All rights reserved. +# Copyright (c) 2016-2019, ARM Limited and Contributors. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # -LIBC_SRCS := $(addprefix lib/libc/, \ +LIBC_SRCS := $(addprefix lib/libc/, \ abort.c \ assert.c \ exit.c \ @@ -25,5 +25,10 @@ LIBC_SRCS := $(addprefix lib/libc/, \ strnlen.c \ strrchr.c) +ifeq (${ARCH},aarch64) +LIBC_SRCS += $(addprefix lib/libc/aarch64/, \ + setjmp.S) +endif + INCLUDES += -Iinclude/lib/libc \ -Iinclude/lib/libc/$(ARCH) \ |