diff options
| author | Alistair Delva <adelva@google.com> | 2020-02-05 15:42:52 -0800 |
|---|---|---|
| committer | Alistair Delva <adelva@google.com> | 2020-02-06 18:35:58 +0000 |
| commit | 5dfd96a0b3264f2ea428fcbed5d76f7f4aef4f2f (patch) | |
| tree | 76d9e0cabe45c1ed6d9ea87a5deb9c75c4345653 /lib/compiler-rt | |
| parent | f8cb4bf36efbe497216e23043732fbb8949c7d43 (diff) | |
| parent | 5f62213e684dbea03b5a2bb732405a03ccc1a815 (diff) | |
| download | platform_external_arm-trusted-firmware-5dfd96a0b3264f2ea428fcbed5d76f7f4aef4f2f.tar.gz platform_external_arm-trusted-firmware-5dfd96a0b3264f2ea428fcbed5d76f7f4aef4f2f.tar.bz2 platform_external_arm-trusted-firmware-5dfd96a0b3264f2ea428fcbed5d76f7f4aef4f2f.zip | |
Merge '5f62213e684dbea03b5a2bb732405a03ccc1a815' into master
Update to fix an incompatibility with U-Boot 2020.01 on rockpi
IGNORE_MERGE_CONFLICT_CHECK==false positive
Bug: 147107640
Change-Id: Ie767196449b0a8e661883f8220ae02eb3535c4a5
Diffstat (limited to 'lib/compiler-rt')
| -rw-r--r-- | lib/compiler-rt/compiler-rt.mk | 16 | ||||
| -rw-r--r-- | lib/compiler-rt/include/float.h | 1 |
2 files changed, 13 insertions, 4 deletions
diff --git a/lib/compiler-rt/compiler-rt.mk b/lib/compiler-rt/compiler-rt.mk index 49e497eb8..a8d36a361 100644 --- a/lib/compiler-rt/compiler-rt.mk +++ b/lib/compiler-rt/compiler-rt.mk @@ -1,5 +1,5 @@ # -# Copyright (c) 2017, ARM Limited and Contributors. All rights reserved. +# Copyright (c) 2017-2019, ARM Limited and Contributors. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: @@ -28,9 +28,17 @@ # POSSIBILITY OF SUCH DAMAGE. # +CPPFLAGS += -Ilib/compiler-rt/include + +COMPILER_RT_SRCS := lib/compiler-rt/builtins/popcountdi2.c \ + lib/compiler-rt/builtins/popcountsi2.c + ifeq (${ARCH},aarch32) -COMPILER_RT_SRCS := lib/compiler-rt/builtins/arm/aeabi_uldivmod.S \ - lib/compiler-rt/builtins/udivmoddi4.c \ +COMPILER_RT_SRCS += lib/compiler-rt/builtins/arm/aeabi_ldivmod.S \ + lib/compiler-rt/builtins/arm/aeabi_uldivmod.S \ lib/compiler-rt/builtins/ctzdi2.c \ - lib/compiler-rt/builtins/lshrdi3.c + lib/compiler-rt/builtins/divdi3.c \ + lib/compiler-rt/builtins/divmoddi4.c \ + lib/compiler-rt/builtins/lshrdi3.c \ + lib/compiler-rt/builtins/udivmoddi4.c endif diff --git a/lib/compiler-rt/include/float.h b/lib/compiler-rt/include/float.h new file mode 100644 index 000000000..710cecca9 --- /dev/null +++ b/lib/compiler-rt/include/float.h @@ -0,0 +1 @@ +/* Empty */ |