diff options
| author | Martin Roth <martinroth@google.com> | 2016-01-07 14:57:26 -0700 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2016-01-14 19:14:57 +0100 |
| commit | a6e77027870826539f3dd4835c3b9dbc48f216c8 (patch) | |
| tree | f1240b9c6c3358d1a074a029bf558194f8738f28 | |
| parent | 3cbe62fe3700f11bc820171b8efda1ee4954c198 (diff) | |
| download | coreboot-a6e77027870826539f3dd4835c3b9dbc48f216c8.tar.xz | |
xcompile: More updates on ARM64 Erratum flags
I tried to handle the checking for the config flag internal to xcompile,
but the config flags don't appear to have been loaded into the
environment by make at that point.
This does update the if to check if the flag is even set before putting
anything into .xcompile though. If the LDFLAG isn't set, there's no
point in appending anything.
Also removes the LP version of the erratum config flag, which was a
copy/paste mistake from $(CONFIG_LP_COMPILER_GCC).
Change-Id: I3d8b0328c85310393a120741a498bc18867a6f54
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/12858
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
| -rwxr-xr-x | util/xcompile/xcompile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile index b3dd074486..a1856e4232 100755 --- a/util/xcompile/xcompile +++ b/util/xcompile/xcompile @@ -231,15 +231,16 @@ AS_${TARCH}:=${GCCPREFIX}as ${ASFLAGS} LD_${TARCH}:=${GCCPREFIX}ld${LINKER_SUFFIX} ${LDFLAGS} EOF - if [ "${TARCH}" = "arm64" ]; then - cat <<EOF + if [ "${TARCH}" = "arm64" ] && \ + [ -n "${LDFLAGS_ARM64_A53_ERRATUM_843419}" ]; then + cat <<EOF -ifeq (\$(CONFIG_ARM64_A53_ERRATUM_843419)\$(CONFIG_LP_ARM64_A53_ERRATUM_843419),y) +ifeq (\$(CONFIG_ARM64_A53_ERRATUM_843419),y) LD_${TARCH}+=${LDFLAGS_ARM64_A53_ERRATUM_843419} endif EOF - fi # if [ "${TARCH}" = "arm64" ] + fi # if [ "${TARCH}" = "arm64" ]... cat <<EOF NM_${TARCH}:=${GCCPREFIX}nm |