summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2021-08-01 07:44:07 -0700
committerArmin Kuster <akuster808@gmail.com>2021-09-08 21:25:39 -0700
commit355e47cd858809cb2470a7bf9e769c5a3d5be756 (patch)
treeec41f32d12d54cfb5566ee7f6e5593c3a8cdc640
parentcea26b8482b83eda18370406f8d59cf63436b5ba (diff)
downloadmeta-openembedded-355e47cd858809cb2470a7bf9e769c5a3d5be756.tar.gz
vboxguestdrivers: Remove __divmoddi4 patch
This function has been added upstream as well, therefore the patch is no longer needed Signed-off-by: Khem Raj <raj.khem@gmail.com> Cc: Gianfranco Costamagna <locutusofborg@debian.org> (cherry picked from commit 552269da69d3c7d366ca3ad7340de715f06005a5) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/add__divmoddi4.patch36
-rw-r--r--meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.26.bb1
2 files changed, 0 insertions, 37 deletions
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 @@
1add __divmoddi4 builtin
2
3GCC 11 will generate it in code
4
5void foo(unsigned char *u8Second, unsigned int *u32Nanosecond, long long timeSpec)
6{
7 long long i64Div;
8 int i32Div;
9 int i32Rem;
10 i64Div = timeSpec;
11 i32Rem = (int)(i64Div % 1000000000);
12 i64Div /= 1000000000;
13 *u32Nanosecond = i32Rem;
14 i32Rem = (int)(i64Div % 60);
15 *u8Second = i32Rem;
16}
17
18
19Upstream-Status: Pending
20Signed-off-by: Khem Raj <raj.khem@gmail.com>
21
22--- a/src/VBox/Runtime/common/math/gcc/divdi3.c
23+++ b/src/VBox/Runtime/common/math/gcc/divdi3.c
24@@ -68,3 +68,12 @@ __divdi3(a, b)
25 uq = - uq;
26 return uq;
27 }
28+
29+quad_t
30+__divmoddi4(quad_t a, quad_t b, quad_t* rem)
31+{
32+ quad_t d = __divdi3(a,b);
33+ *rem = a - (d*b);
34+ return d;
35+}
36+
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}"
13 13
14SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ 14SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \
15 file://Makefile.utils \ 15 file://Makefile.utils \
16 file://add__divmoddi4.patch \
17" 16"
18 17
19SRC_URI[md5sum] = "fce04bbef244b4df1a50e53d132d3e6f" 18SRC_URI[md5sum] = "fce04bbef244b4df1a50e53d132d3e6f"