.../Library/IntrinsicLib/CompilerHelper.c | 41 +++++++++++++++++++ .../Library/IntrinsicLib/IntrinsicLib.inf | 6 ++- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 CryptoPkg/Library/IntrinsicLib/CompilerHelper.c
The RiscV toolchain doesn't provide __ctzdi2 implementation when
compiled with -nostdlib that needed by openssl library when EC
enabled. So adding the simple implementation of __ctzdi2.
Forcing to use CopyMem of EDK2 as builtin memcpy disabled for RiscV
with -fno-builtin-memcpy flag.
Signed-off-by: Tuan Phan <tphan@ventanamicro.com>
---
.../Library/IntrinsicLib/CompilerHelper.c | 41 +++++++++++++++++++
.../Library/IntrinsicLib/IntrinsicLib.inf | 6 ++-
2 files changed, 46 insertions(+), 1 deletion(-)
create mode 100644 CryptoPkg/Library/IntrinsicLib/CompilerHelper.c
diff --git a/CryptoPkg/Library/IntrinsicLib/CompilerHelper.c b/CryptoPkg/Library/IntrinsicLib/CompilerHelper.c
new file mode 100644
index 000000000000..9e700a11ed17
--- /dev/null
+++ b/CryptoPkg/Library/IntrinsicLib/CompilerHelper.c
@@ -0,0 +1,41 @@
+/** @file
+ Implement functions that not available when compiled with -nostdlib flag.
+
+ SPDX-License-Identifier: BSD-2-Clause-Patent
+
+**/
+
+unsigned int
+__ctzdi2 (unsigned long long x)
+{
+ unsigned int ret = 0;
+
+ if (!x) {
+ return 64;
+ }
+ if (!(x & 0xffffffff)) {
+ x >>= 32;
+ ret |= 32;
+ }
+ if (!(x & 0xffff)) {
+ x >>= 16;
+ ret |= 16;
+ }
+ if (!(x & 0xff)) {
+ x >>= 8;
+ ret |= 8;
+ }
+ if (!(x & 0xf)) {
+ x >>= 4;
+ ret |= 4;
+ }
+ if (!(x & 0x3)) {
+ x >>= 2;
+ ret |= 2;
+ }
+ if (!(x & 0x1)) {
+ x >>= 1;
+ ret |= 1;
+ }
+ return ret;
+}
diff --git a/CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf b/CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
index 86e74b57b109..6796b39b07cf 100644
--- a/CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
+++ b/CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
@@ -18,7 +18,7 @@
#
# The following information is for reference only and not required by the build tools.
#
-# VALID_ARCHITECTURES = IA32 X64
+# VALID_ARCHITECTURES = IA32 X64 RISCV64
#
[Sources]
@@ -43,6 +43,10 @@
[Sources.X64]
CopyMem.c
+[Sources.RISCV64]
+ CopyMem.c
+ CompilerHelper.c
+
[Packages]
MdePkg/MdePkg.dec
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#97583): https://edk2.groups.io/g/devel/message/97583
Mute This Topic: https://groups.io/mt/95777532/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
On Thu, Dec 15, 2022 at 09:48:59AM -0800, Tuan Phan wrote: > The RiscV toolchain doesn't provide __ctzdi2 implementation when > compiled with -nostdlib that needed by openssl library when EC > enabled. So adding the simple implementation of __ctzdi2. > > Forcing to use CopyMem of EDK2 as builtin memcpy disabled for RiscV > with -fno-builtin-memcpy flag. > Hi Tuan, Thanks for the patch. Please add "REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4103" in the commit message and add the copyright in the new file created. Please CC Mike (Michael D Kinney <michael.d.kinney@intel.com>) and the maintainers of CryptoPkg. Acked-by: Sunil V L <sunilvl@ventanamicro.com> Thanks Sunil > Signed-off-by: Tuan Phan <tphan@ventanamicro.com> > --- > .../Library/IntrinsicLib/CompilerHelper.c | 41 +++++++++++++++++++ > .../Library/IntrinsicLib/IntrinsicLib.inf | 6 ++- > 2 files changed, 46 insertions(+), 1 deletion(-) > create mode 100644 CryptoPkg/Library/IntrinsicLib/CompilerHelper.c > > diff --git a/CryptoPkg/Library/IntrinsicLib/CompilerHelper.c b/CryptoPkg/Library/IntrinsicLib/CompilerHelper.c > new file mode 100644 > index 000000000000..9e700a11ed17 > --- /dev/null > +++ b/CryptoPkg/Library/IntrinsicLib/CompilerHelper.c > @@ -0,0 +1,41 @@ > +/** @file > + Implement functions that not available when compiled with -nostdlib flag. > + > + SPDX-License-Identifier: BSD-2-Clause-Patent > + > +**/ > + > +unsigned int > +__ctzdi2 (unsigned long long x) > +{ > + unsigned int ret = 0; > + > + if (!x) { > + return 64; > + } > + if (!(x & 0xffffffff)) { > + x >>= 32; > + ret |= 32; > + } > + if (!(x & 0xffff)) { > + x >>= 16; > + ret |= 16; > + } > + if (!(x & 0xff)) { > + x >>= 8; > + ret |= 8; > + } > + if (!(x & 0xf)) { > + x >>= 4; > + ret |= 4; > + } > + if (!(x & 0x3)) { > + x >>= 2; > + ret |= 2; > + } > + if (!(x & 0x1)) { > + x >>= 1; > + ret |= 1; > + } > + return ret; > +} > diff --git a/CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf b/CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > index 86e74b57b109..6796b39b07cf 100644 > --- a/CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > +++ b/CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > @@ -18,7 +18,7 @@ > # > # The following information is for reference only and not required by the build tools. > # > -# VALID_ARCHITECTURES = IA32 X64 > +# VALID_ARCHITECTURES = IA32 X64 RISCV64 > # > > [Sources] > @@ -43,6 +43,10 @@ > [Sources.X64] > CopyMem.c > > +[Sources.RISCV64] > + CopyMem.c > + CompilerHelper.c > + > [Packages] > MdePkg/MdePkg.dec > > -- > 2.25.1 > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#97489): https://edk2.groups.io/g/devel/message/97489 Mute This Topic: https://groups.io/mt/95704709/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=-
© 2016 - 2024 Red Hat, Inc.