From 4e1566679067975e3e8ee0a9198e4df332e6e32e Mon Sep 17 00:00:00 2001 From: Anton Gerasimov Date: Mon, 26 Sep 2016 15:44:53 +0200 Subject: Added initramfs image and fixed several error to make AGL rootfs bootable as an OSTree deployment Bug-AGL: SPEC-253 Change-Id: If636a282d51a64c73c46ce70a361518c1f70cdd6 Signed-off-by: Anton Gerasimov --- ...ps-with-built-in-code-to-remove-dependenc.patch | 165 ++++++++++----------- 1 file changed, 81 insertions(+), 84 deletions(-) (limited to 'meta-sota/recipes-bsp/u-boot/u-boot-ota/0002-Replace-wraps-with-built-in-code-to-remove-dependenc.patch') diff --git a/meta-sota/recipes-bsp/u-boot/u-boot-ota/0002-Replace-wraps-with-built-in-code-to-remove-dependenc.patch b/meta-sota/recipes-bsp/u-boot/u-boot-ota/0002-Replace-wraps-with-built-in-code-to-remove-dependenc.patch index 83e223f..7540b74 100644 --- a/meta-sota/recipes-bsp/u-boot/u-boot-ota/0002-Replace-wraps-with-built-in-code-to-remove-dependenc.patch +++ b/meta-sota/recipes-bsp/u-boot/u-boot-ota/0002-Replace-wraps-with-built-in-code-to-remove-dependenc.patch @@ -1,44 +1,38 @@ -From d5bea58bf85522a289194d59dfab00207ffdfb4f Mon Sep 17 00:00:00 2001 +From ab0d7e270d89f6eb99582197d2d58bf60c9c3d26 Mon Sep 17 00:00:00 2001 From: Anton Gerasimov -Date: Fri, 26 Aug 2016 13:51:30 +0200 +Date: Thu, 15 Sep 2016 16:49:32 +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(-) + arch/x86/config.mk | 2 -- + arch/x86/lib/gcc.c | 104 ++++++++++++++++++++++++++++++++++++++++++++--------- + 2 files changed, 87 insertions(+), 19 deletions(-) diff --git a/arch/x86/config.mk b/arch/x86/config.mk -index d7addd8..892e0fc 100644 +index 999143e..139576e 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 +@@ -22,5 +22,3 @@ PLATFORM_RELFLAGS += -ffunction-sections -fvisibility=hidden + PLATFORM_LDFLAGS += --emit-relocs -Bsymbolic -Bsymbolic-functions -m elf_i386 + LDFLAGS_FINAL += --gc-sections -pie -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 +index 497ad75..c321b11 100644 --- a/arch/x86/lib/gcc.c +++ b/arch/x86/lib/gcc.c -@@ -8,22 +8,97 @@ +@@ -19,22 +19,92 @@ #ifdef __GNUC__ -+#include -+#include - /* - * 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. - */ +-/* +- * 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); \ @@ -50,92 +44,95 @@ index 3c70d79..6b47785 100644 -WRAP_LIBGCC_CALL(unsigned long long, __udivdi3) -WRAP_LIBGCC_CALL(long long, __moddi3) -WRAP_LIBGCC_CALL(unsigned long long, __umoddi3) ++#include ++#include ++ +uint64_t __udivmoddi4 ( uint64_t num, -+ uint64_t den, -+ uint64_t *rem_p ) ++ 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 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); ++ return __udivmoddi4(num, den, NULL); +} + +uint64_t __umoddi3 ( uint64_t num, uint64_t den ) +{ -+ uint64_t v; ++ uint64_t v; + -+ (void) __udivmoddi4(num, den, &v); -+ return v; ++ (void) __udivmoddi4(num, den, &v); ++ return v; +} + +int64_t __divmoddi4 ( int64_t num, -+ int64_t den, -+ int64_t* rem_p ) ++ 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; ++ 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; ++ int64_t v; + -+ (void) __divmoddi4(num, den, &v); -+ return v; ++ (void) __divmoddi4(num, den, &v); ++ return v; +} + +int64_t __divdi3(int64_t num, int64_t den) +{ -+ return __divmoddi4(num, den, NULL); ++ return __divmoddi4(num, den, NULL); +} #endif -- -2.9.2 +2.9.3 -- cgit 1.2.3-korg