diff options
| author | Subrata Banik <subratabanik@google.com> | 2024-05-16 15:19:22 +0530 |
|---|---|---|
| committer | Subrata Banik <subratabanik@google.com> | 2024-05-24 08:10:56 +0000 |
| commit | 36e2b97e4cdaeb065265ed79b77f130747308b61 (patch) | |
| tree | 837f3e011868e35113480ddffeff993892848c67 /payloads/libpayload/bin | |
| parent | 814ae3b05507726938b0f9a9ba0c3a2a37e7b295 (diff) | |
libpayload: Inject head.S into libc, remove separate class
Integrate head.S directly into libc and remove all instances of head.o.
* Drop 'separate class' entry for head.S.
* Drop special treament for head.o inside lpgcc.
* Change the .text in `x86/head.S` to `.section .text._entry`.
* Drop arch/mock/head.c, initially added as a dummy file.
Change-Id: I156d781908fcc38d455bbf9f2c29e5ab95c7775a
Signed-off-by: Subrata Banik <subratabanik@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/82478
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'payloads/libpayload/bin')
| -rwxr-xr-x | payloads/libpayload/bin/lpgcc | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/payloads/libpayload/bin/lpgcc b/payloads/libpayload/bin/lpgcc index 724f5eca64..a954d4ff5b 100755 --- a/payloads/libpayload/bin/lpgcc +++ b/payloads/libpayload/bin/lpgcc @@ -201,14 +201,6 @@ if [ $DOLINK -eq 0 ]; then $DEFAULT_CC $CMDLINE $_CFLAGS else _LIBGCC=`$DEFAULT_CC $_ARCHEXTRA -print-libgcc-file-name` - if [ -f $_ARCHLIBDIR/head.o ]; then - HEAD_O=$_ARCHLIBDIR/head.o - elif [ -f $_OBJ/head.o ]; then - HEAD_O=$_OBJ/head.o - else - echo "Could not find head.o" - exit 1 - fi if [ "$CONFIG_LP_ARM64_A53_ERRATUM_843419" = y ] && grep -q fix-cortex-a53-843419 $_XCOMPILE; then @@ -220,13 +212,8 @@ else _LDFLAGS="$_LDFLAGS -Wl,--defsym=CONFIG_LP_STACK_SIZE=$CONFIG_LP_STACK_SIZE" if [ $DEBUGME -eq 1 ]; then - echo "$DEFAULT_CC $_LDFLAGS $HEAD_O $CMDLINE $_CFLAGS -lpayload $_LIBGCC" + echo "$DEFAULT_CC $_LDFLAGS $CMDLINE $_CFLAGS -lpayload $_LIBGCC" fi - # Note: $_ARCHLIBDIR/head.o must be the first object being linked, because it - # contains a Multiboot header. The Multiboot standard requires this - # header to be placed below 0x2000 in the resulting image. See: - # http://www.gnu.org/software/grub/manual/multiboot/html_node/OS-image-format.html - - $DEFAULT_CC $_LDFLAGS $HEAD_O $CMDLINE $_CFLAGS -lpayload -xnone $_LIBGCC + $DEFAULT_CC $_LDFLAGS $CMDLINE $_CFLAGS -lpayload -xnone $_LIBGCC fi |