GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libpayload: lpgcc: CFLAGS and CMDLINE order inversion 

When building an external payload with lpgcc, the provided cmdline needs to be
included before libpayload-specific CFLAGS so that the include priority is the
payload first. This way, a payload using e.g. Kconfig that declares a config.h
will have its config.h included first, instead of libpayload's config.h.

Change-Id: I19b8012623e04c92a427d74904aed7f3bf5f0996
Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
Reviewed-on: http://review.coreboot.org/11113
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Paul Kocialkowski 2015-08-03 14:08:40 +02:00 committed by Patrick Georgi
parent f534203f06
commit 7572e66bc7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
payloads/libpayload/bin/lpgcc
View File

@ -165,10 +165,10 @@ _LDFLAGS="-L$BASE/../lib -L$_LIBDIR $_LDSCRIPT -static"
if [ $DOLINK -eq 0 ]; then if [ $DOLINK -eq 0 ]; then
if [ $DEBUGME -eq 1 ]; then if [ $DEBUGME -eq 1 ]; then
echo "$DEFAULT_CC $_CFLAGS $CMDLINE" echo "$DEFAULT_CC $CMDLINE $_CFLAGS"
fi fi
$DEFAULT_CC $_CFLAGS $CMDLINE $DEFAULT_CC $CMDLINE $_CFLAGS
else else
if [ -z "${CONFIG_LP_ARCH_MIPS}" ]; then if [ -z "${CONFIG_LP_ARCH_MIPS}" ]; then
_LIBGCC=`$DEFAULT_CC $_ARCHEXTRA -print-libgcc-file-name` _LIBGCC=`$DEFAULT_CC $_ARCHEXTRA -print-libgcc-file-name`
@ -182,7 +182,7 @@ else
exit 1 exit 1
fi fi
if [ $DEBUGME -eq 1 ]; then if [ $DEBUGME -eq 1 ]; then
echo "$DEFAULT_CC $_CFLAGS $_LDFLAGS $HEAD_O $CMDLINE -lpayload $_LIBGCC" echo "$DEFAULT_CC $_LDFLAGS $HEAD_O $CMDLINE $_CFLAGS -lpayload $_LIBGCC"
fi fi
# Note: $_ARCHLIBDIR/head.o must be the first object being linked, because it # Note: $_ARCHLIBDIR/head.o must be the first object being linked, because it
@ -190,5 +190,5 @@ else
# header to be placed below 0x2000 in the resulting image. See: # 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 # http://www.gnu.org/software/grub/manual/multiboot/html_node/OS-image-format.html
$DEFAULT_CC $_CFLAGS $_LDFLAGS $HEAD_O $CMDLINE -lpayload $_LIBGCC $DEFAULT_CC $_LDFLAGS $HEAD_O $CMDLINE $_CFLAGS -lpayload $_LIBGCC
fi fi