From 355e47cd858809cb2470a7bf9e769c5a3d5be756 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 1 Aug 2021 07:44:07 -0700 Subject: vboxguestdrivers: Remove __divmoddi4 patch This function has been added upstream as well, therefore the patch is no longer needed Signed-off-by: Khem Raj Cc: Gianfranco Costamagna (cherry picked from commit 552269da69d3c7d366ca3ad7340de715f06005a5) Signed-off-by: Armin Kuster --- .../vboxguestdrivers/add__divmoddi4.patch | 36 ---------------------- .../vboxguestdrivers/vboxguestdrivers_6.1.26.bb | 1 - 2 files changed, 37 deletions(-) delete mode 100644 meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/add__divmoddi4.patch diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/add__divmoddi4.patch b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/add__divmoddi4.patch deleted file mode 100644 index 8dd30a20ef..0000000000 --- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/add__divmoddi4.patch +++ /dev/null @@ -1,36 +0,0 @@ -add __divmoddi4 builtin - -GCC 11 will generate it in code - -void foo(unsigned char *u8Second, unsigned int *u32Nanosecond, long long timeSpec) -{ - long long i64Div; - int i32Div; - int i32Rem; - i64Div = timeSpec; - i32Rem = (int)(i64Div % 1000000000); - i64Div /= 1000000000; - *u32Nanosecond = i32Rem; - i32Rem = (int)(i64Div % 60); - *u8Second = i32Rem; -} - - -Upstream-Status: Pending -Signed-off-by: Khem Raj - ---- a/src/VBox/Runtime/common/math/gcc/divdi3.c -+++ b/src/VBox/Runtime/common/math/gcc/divdi3.c -@@ -68,3 +68,12 @@ __divdi3(a, b) - uq = - uq; - return uq; - } -+ -+quad_t -+__divmoddi4(quad_t a, quad_t b, quad_t* rem) -+{ -+ quad_t d = __divdi3(a,b); -+ *rem = a - (d*b); -+ return d; -+} -+ diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.26.bb b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.26.bb index 1b2fb44036..d1e42a4d7a 100644 --- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.26.bb +++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.26.bb @@ -13,7 +13,6 @@ VBOX_NAME = "VirtualBox-${PV}" SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ file://Makefile.utils \ - file://add__divmoddi4.patch \ " SRC_URI[md5sum] = "fce04bbef244b4df1a50e53d132d3e6f" -- cgit 1.2.3-korg