1 files changed, 141 insertions, 0 deletions
diff --git a/recipes-bsp/u-boot/u-boot-ota/0002-Replace-wraps-with-built-in-code-to-remove-dependenc.patch b/recipes-bsp/u-boot/u-boot-ota/0002-Replace-wraps-with-built-in-code-to-remove-dependenc.patch
new file mode 100644
index 0000000..83e223f
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-ota/0002-Replace-wraps-with-built-in-code-to-remove-dependenc.patch
@@ -0,0 +1,141 @@
+From d5bea58bf85522a289194d59dfab00207ffdfb4f Mon Sep 17 00:00:00 2001
+From: Anton Gerasimov <anton@advancedtelematic.com>
+Date: Fri, 26 Aug 2016 13:51:30 +0200
+Subject: [PATCH 2/2] Replace wraps with built-in code to remove dependency on
+ multilib
+---
+ arch/x86/config.mk |  3 --
+ arch/x86/lib/gcc.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++-------
+ 2 files changed, 86 insertions(+), 14 deletions(-)
+diff --git a/arch/x86/config.mk b/arch/x86/config.mk
+index d7addd8..892e0fc 100644
+--- a/arch/x86/config.mk
+++ b/arch/x86/config.mk
+@@ -21,9 +21,6 @@ PLATFORM_RELFLAGS += -ffunction-sections -fvisibility=hidden
+ 
+ PLATFORM_LDFLAGS += -Bsymbolic -Bsymbolic-functions -m elf_i386
+ 
+-LDFLAGS_FINAL += --wrap=__divdi3 --wrap=__udivdi3
+-LDFLAGS_FINAL += --wrap=__moddi3 --wrap=__umoddi3
+-
+ # This is used in the top-level Makefile which does not include
+ # PLATFORM_LDFLAGS
+ LDFLAGS_EFI_PAYLOAD := -Bsymbolic -Bsymbolic-functions -shared --no-undefined
+diff --git a/arch/x86/lib/gcc.c b/arch/x86/lib/gcc.c
+index 3c70d79..6b47785 100644
+--- a/arch/x86/lib/gcc.c
+++ b/arch/x86/lib/gcc.c
+@@ -8,22 +8,97 @@
+ 
+ #ifdef __GNUC__
+ 
+#include <stdint.h>
+#include <stddef.h>
+ /*
+  * GCC's libgcc handling is quite broken. While the libgcc functions
+  * are always regparm(0) the code that calls them uses whatever the
+  * compiler call specifies. Therefore we need a wrapper around those
+  * functions. See gcc bug PR41055 for more information.
+  */
+-#define WRAP_LIBGCC_CALL(type, name) \
+-       type __normal_##name(type a, type b) __attribute__((regparm(0))); \
+-       type __wrap_##name(type a, type b); \
+-       type __attribute__((no_instrument_function)) \
+-               __wrap_##name(type a, type b) \
+-                { return __normal_##name(a, b); }
+-
+-WRAP_LIBGCC_CALL(long long, __divdi3)
+-WRAP_LIBGCC_CALL(unsigned long long, __udivdi3)
+-WRAP_LIBGCC_CALL(long long, __moddi3)
+-WRAP_LIBGCC_CALL(unsigned long long, __umoddi3)
+uint64_t __udivmoddi4 ( uint64_t num,
+                       uint64_t den,
+                       uint64_t *rem_p )
+{
+       uint64_t quot = 0, qbit = 1;
+
+       if ( den == 0 ) {
+               return 1/((unsigned)den); /* Intentional divide by zero, without
+                                            triggering a compiler warning which
+                                            would abort the build */
+       }
+
+       /* Left-justify denominator and count shift */
+       while ( (int64_t)den >= 0 ) {
+               den <<= 1;
+               qbit <<= 1;
+       }
+
+       while ( qbit ) {
+               if ( den <= num ) {
+                       num -= den;
+                       quot += qbit;
+               }
+               den >>= 1;
+               qbit >>= 1;
+       }
+
+       if ( rem_p )
+               *rem_p = num;
+
+       return quot;
+}      
+
+uint64_t __udivdi3( uint64_t num, uint64_t den )
+{
+       return __udivmoddi4(num, den, NULL);
+}
+
+uint64_t __umoddi3 ( uint64_t num, uint64_t den )
+{
+       uint64_t v;
+
+       (void) __udivmoddi4(num, den, &v);
+       return v;
+}
+
+int64_t __divmoddi4 ( int64_t num,
+               int64_t den,
+               int64_t* rem_p )
+{
+       int minus = 0;
+       int64_t v;
+
+       if ( num < 0 ) {
+               num = -num;
+               minus = 1;
+       }
+       if ( den < 0 ) {
+               den = -den;
+               minus ^= 1;
+       }
+
+       v = __udivmoddi4(num, den, (uint64_t *)rem_p);
+       if ( minus ) {
+               v = -v;
+               if ( rem_p )
+                       *rem_p = -(*rem_p);
+       }
+
+       return v;
+}
+
+int64_t __moddi3 (int64_t num, int64_t den)
+{
+       int64_t v;
+
+       (void) __divmoddi4(num, den, &v);
+       return v;
+}
+
+int64_t __divdi3(int64_t num, int64_t den)
+{
+       return __divmoddi4(num, den, NULL);
+}
+ 
+ #endif
+-- 
+2.9.2

diff --git a/recipes-bsp/u-boot/u-boot-ota/0002-Replace-wraps-with-built-in-code-to-remove-dependenc.patch b/recipes-bsp/u-boot/u-boot-ota/0002-Replace-wraps-with-built-in-code-to-remove-dependenc.patch new file mode 100644 index 0000000..83e223f --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-ota/0002-Replace-wraps-with-built-in-code-to-remove-dependenc.patch
@@ -0,0 +1,141 @@
	1	From d5bea58bf85522a289194d59dfab00207ffdfb4f Mon Sep 17 00:00:00 2001
	2	From: Anton Gerasimov <anton@advancedtelematic.com>
	3	Date: Fri, 26 Aug 2016 13:51:30 +0200
	4	Subject: [PATCH 2/2] Replace wraps with built-in code to remove dependency on
	5	multilib
	6
	7	---
	8	arch/x86/config.mk \| 3 --
	9	arch/x86/lib/gcc.c \| 97 +++++++++++++++++++++++++++++++++++++++++++++++-------
	10	2 files changed, 86 insertions(+), 14 deletions(-)
	11
	12	diff --git a/arch/x86/config.mk b/arch/x86/config.mk
	13	index d7addd8..892e0fc 100644
	14	--- a/arch/x86/config.mk
	15	+++ b/arch/x86/config.mk
	16	@@ -21,9 +21,6 @@ PLATFORM_RELFLAGS += -ffunction-sections -fvisibility=hidden
	17
	18	PLATFORM_LDFLAGS += -Bsymbolic -Bsymbolic-functions -m elf_i386
	19
	20	-LDFLAGS_FINAL += --wrap=__divdi3 --wrap=__udivdi3
	21	-LDFLAGS_FINAL += --wrap=__moddi3 --wrap=__umoddi3
	22	-
	23	# This is used in the top-level Makefile which does not include
	24	# PLATFORM_LDFLAGS
	25	LDFLAGS_EFI_PAYLOAD := -Bsymbolic -Bsymbolic-functions -shared --no-undefined
	26	diff --git a/arch/x86/lib/gcc.c b/arch/x86/lib/gcc.c
	27	index 3c70d79..6b47785 100644
	28	--- a/arch/x86/lib/gcc.c
	29	+++ b/arch/x86/lib/gcc.c
	30	@@ -8,22 +8,97 @@
	31
	32	#ifdef __GNUC__
	33
	34	+#include <stdint.h>
	35	+#include <stddef.h>
	36	/*
	37	* GCC's libgcc handling is quite broken. While the libgcc functions
	38	* are always regparm(0) the code that calls them uses whatever the
	39	* compiler call specifies. Therefore we need a wrapper around those
	40	* functions. See gcc bug PR41055 for more information.
	41	*/
	42	-#define WRAP_LIBGCC_CALL(type, name) \
	43	- type __normal_##name(type a, type b) __attribute__((regparm(0))); \
	44	- type __wrap_##name(type a, type b); \
	45	- type __attribute__((no_instrument_function)) \
	46	- __wrap_##name(type a, type b) \
	47	- { return __normal_##name(a, b); }
	48	-
	49	-WRAP_LIBGCC_CALL(long long, __divdi3)
	50	-WRAP_LIBGCC_CALL(unsigned long long, __udivdi3)
	51	-WRAP_LIBGCC_CALL(long long, __moddi3)
	52	-WRAP_LIBGCC_CALL(unsigned long long, __umoddi3)
	53	+uint64_t __udivmoddi4 ( uint64_t num,
	54	+ uint64_t den,
	55	+ uint64_t *rem_p )
	56	+{
	57	+ uint64_t quot = 0, qbit = 1;
	58	+
	59	+ if ( den == 0 ) {
	60	+ return 1/((unsigned)den); /* Intentional divide by zero, without
	61	+ triggering a compiler warning which
	62	+ would abort the build */
	63	+ }
	64	+
	65	+ /* Left-justify denominator and count shift */
	66	+ while ( (int64_t)den >= 0 ) {
	67	+ den <<= 1;
	68	+ qbit <<= 1;
	69	+ }
	70	+
	71	+ while ( qbit ) {
	72	+ if ( den <= num ) {
	73	+ num -= den;
	74	+ quot += qbit;
	75	+ }
	76	+ den >>= 1;
	77	+ qbit >>= 1;
	78	+ }
	79	+
	80	+ if ( rem_p )
	81	+ *rem_p = num;
	82	+
	83	+ return quot;
	84	+}
	85	+
	86	+uint64_t __udivdi3( uint64_t num, uint64_t den )
	87	+{
	88	+ return __udivmoddi4(num, den, NULL);
	89	+}
	90	+
	91	+uint64_t __umoddi3 ( uint64_t num, uint64_t den )
	92	+{
	93	+ uint64_t v;
	94	+
	95	+ (void) __udivmoddi4(num, den, &v);
	96	+ return v;
	97	+}
	98	+
	99	+int64_t __divmoddi4 ( int64_t num,
	100	+ int64_t den,
	101	+ int64_t* rem_p )
	102	+{
	103	+ int minus = 0;
	104	+ int64_t v;
	105	+
	106	+ if ( num < 0 ) {
	107	+ num = -num;
	108	+ minus = 1;
	109	+ }
	110	+ if ( den < 0 ) {
	111	+ den = -den;
	112	+ minus ^= 1;
	113	+ }
	114	+
	115	+ v = __udivmoddi4(num, den, (uint64_t *)rem_p);
	116	+ if ( minus ) {
	117	+ v = -v;
	118	+ if ( rem_p )
	119	+ rem_p = -(rem_p);
	120	+ }
	121	+
	122	+ return v;
	123	+}
	124	+
	125	+int64_t __moddi3 (int64_t num, int64_t den)
	126	+{
	127	+ int64_t v;
	128	+
	129	+ (void) __divmoddi4(num, den, &v);
	130	+ return v;
	131	+}
	132	+
	133	+int64_t __divdi3(int64_t num, int64_t den)
	134	+{
	135	+ return __divmoddi4(num, den, NULL);
	136	+}
	137
	138	#endif
	139	--
	140	2.9.2
	141