Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12842
-gerrit
commit 09e51328574594bcb4a36f346fdc12f8de94b2eb
Author: Martin Roth <martinroth(a)google.com>
Date: Tue Jan 5 14:56:13 2016 -0700
xcompile: Only include arm64 erratum check in arm64 section
Clean up the output file a bit by only including the erratum
for arm64 into the that architecture section instead of
every architecture.
Change-Id: Ib6276f12aee5deb92a03e1c4fa2ad57db46bdc8f
Signed-off-by: Martin Roth <martinroth(a)google.com>
---
util/xcompile/xcompile | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile
index be08f74..c8cf6e9 100755
--- a/util/xcompile/xcompile
+++ b/util/xcompile/xcompile
@@ -227,9 +227,19 @@ endif
CPP_${TARCH}:=${GCCPREFIX}cpp
AS_${TARCH}:=${GCCPREFIX}as ${ASFLAGS}
LD_${TARCH}:=${GCCPREFIX}ld${LINKER_SUFFIX} ${LDFLAGS}
+EOF
+
+ if [ "${TARCH}" = "arm64" ]; then
+ cat <<EOF
+
ifeq (\$(CONFIG_ARM64_A53_ERRATUM_843419)\$(CONFIG_LP_ARM64_A53_ERRATUM_843419),y)
-LD_${TARCH}+=${LDFLAGS_ARM64_A53_ERRATUM_843419}
+ LD_${TARCH}+=${LDFLAGS_ARM64_A53_ERRATUM_843419}
endif
+
+EOF
+ fi # if [ "${TARCH}" = "arm64" ]
+
+ cat <<EOF
NM_${TARCH}:=${GCCPREFIX}nm
OBJCOPY_${TARCH}:=${GCCPREFIX}objcopy
OBJDUMP_${TARCH}:=${GCCPREFIX}objdump
Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12841
-gerrit
commit 57e01765dffa1eafab9b5f4e2f0a091630cc9a2f
Author: Martin Roth <martinroth(a)google.com>
Date: Tue Jan 5 14:47:59 2016 -0700
xcompile: Put compiler variables outside of 'if' to allow checking
In order to be able to check the compiler versions, we need to be
able to access the compiler variables. Move the original assignments
outside of the GCC check, and assign either the GCC or CLANG compiler
to the actual CC_ environment variable later. This ends up with the
same value set, while allowing the compiler versions to be checked.
Change-Id: Iffad02d526420ebbdfb15ed45eb51187caaa94fb
Signed-off-by: Martin Roth <martinroth(a)google.com>
---
util/xcompile/xcompile | 35 ++++++++++++++++++++++++-----------
1 file changed, 24 insertions(+), 11 deletions(-)
diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile
index ebaf286..be08f74 100755
--- a/util/xcompile/xcompile
+++ b/util/xcompile/xcompile
@@ -197,19 +197,32 @@ report_arch_toolchain() {
# elf${TWIDTH}-${TBFDARCH} toolchain (${GCC})
ARCH_SUPPORTED+=${TARCH}
SUBARCH_SUPPORTED+=${TSUPP-${TARCH}}
+
+# GCC
+GCC_CC_${TARCH}:=${GCC}
+GCC_CFLAGS_${TARCH}:=${CFLAGS_GCC}
+GCC_COMPILER_RT_${TARCH}:=${CC_RT_GCC}
+GCC_COMPILER_RT_FLAGS_${TARCH}:=${CC_RT_EXTRA_GCC}
+
+# Clang
+CLANG_CC_${TARCH}:=${CLANG}
+CLANG_CFLAGS_${TARCH}:=${CFLAGS_CLANG}
+CLANG_CFLAGS_${TARCH}+=-no-integrated-as -Qunused-arguments -m${TWIDTH}
+# tone down clang compiler warnings
+CLANG_CFLAGS_${TARCH}+=-Wno-unused-variable -Wno-unused-function -Wno-tautological-compare -Wno-shift-overflow
+CLANG_COMPILER_RT_${TARCH}:=${CC_RT_CLANG}
+CLANG_COMPILER_RT_FLAGS_${TARCH}:=${CC_RT_EXTRA_CLANG}
+
ifeq (\$(CONFIG_COMPILER_GCC)\$(CONFIG_LP_COMPILER_GCC),y)
-CC_${TARCH}:=${GCC}
-CFLAGS_${TARCH}:=${CFLAGS_GCC}
-COMPILER_RT_${TARCH}:=${CC_RT_GCC}
-COMPILER_RT_FLAGS_${TARCH}:=${CC_RT_EXTRA_GCC}
+ CC_${TARCH}:=\$(GCC_CC_${TARCH})
+ CFLAGS_${TARCH}:=\$(GCC_CFLAGS_${TARCH})
+ COMPILER_RT_${TARCH}:=\$(GCC_COMPILER_RT_${TARCH})
+ COMPILER_RT_FLAGS_${TARCH}:=\$(GCC_COMPILER_RT_FLAGS_${TARCH})
else
-CC_${TARCH}:=${CLANG}
-CFLAGS_${TARCH}:=${CFLAGS_CLANG}
-CFLAGS_${TARCH}+=-no-integrated-as -Qunused-arguments -m${TWIDTH}
-# tone down compiler warnings
-CFLAGS_${TARCH}+=-Wno-unused-variable -Wno-unused-function -Wno-tautological-compare -Wno-shift-overflow
-COMPILER_RT_${TARCH}:=${CC_RT_CLANG}
-COMPILER_RT_FLAGS_${TARCH}:=${CC_RT_EXTRA_CLANG}
+ CC_${TARCH}:=\$(CLANG_CC_${TARCH})
+ CFLAGS_${TARCH}:=\$(CLANG_CFLAGS_${TARCH})
+ COMPILER_RT_${TARCH}:=\$(CLANG_COMPILER_RT_${TARCH})
+ COMPILER_RT_FLAGS_${TARCH}:=\$(CLANG_COMPILER_RT_FLAGS_${TARCH})
endif
CPP_${TARCH}:=${GCCPREFIX}cpp
AS_${TARCH}:=${GCCPREFIX}as ${ASFLAGS}
Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12840
-gerrit
commit 01c3d4229da98b4a7363e179c6b09d169465abde
Author: Martin Roth <martinroth(a)google.com>
Date: Tue Jan 5 14:34:59 2016 -0700
xcompile: Separate flags from clang executable
We already have a CFLAGS variable - Use it for all of the flags.
Change-Id: I22b4c5cf24b8743e85ffab29ddcccdc6c732ea3b
Signed-off-by: Martin Roth <martinroth(a)google.com>
---
util/xcompile/xcompile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile
index bce8169..ebaf286 100755
--- a/util/xcompile/xcompile
+++ b/util/xcompile/xcompile
@@ -350,7 +350,8 @@ test_architecture() {
# FIXME: this may break in a clang && !gcc configuration,
# but that's more of a clang limitation. Let's be optimistic
# that this will change in the future.
- CLANG="${XGCCPATH}clang -target ${clang_arch}-${TABI} -ccc-gcc-name ${GCC}"
+ CLANG="${XGCCPATH}clang"
+ CFLAGS_CLANG="-target ${clang_arch}-${TABI} $CFLAGS_CLANG -ccc-gcc-name ${GCC}"
fi
}
Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12839
-gerrit
commit a84fdf2a0a05f457a7953a9c883af8518d053dd6
Author: Martin Roth <martinroth(a)google.com>
Date: Tue Jan 5 14:30:22 2016 -0700
xcompile: Add XGCCPATH to clang compiler
The XGCCPATH prefix is on all the other tools and compilers,
so add it to clang as well, so it can be found correctly.
Change-Id: Ibc250a81433f37bbb0555d32605aebe3a68aaf40
Signed-off-by: Martin Roth <martinroth(a)google.com>
---
util/xcompile/xcompile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile
index 3535793..bce8169 100755
--- a/util/xcompile/xcompile
+++ b/util/xcompile/xcompile
@@ -343,14 +343,14 @@ test_architecture() {
fi
for clang_arch in $TCLIST invalid; do
- testcc "clang" "-target ${clang_arch}-$TABI -c" && break
+ testcc "${XGCCPATH}clang" "-target ${clang_arch}-$TABI -c" && break
done
if [ "invalid" != "$clang_arch" ]; then
# FIXME: this may break in a clang && !gcc configuration,
# but that's more of a clang limitation. Let's be optimistic
# that this will change in the future.
- CLANG="clang -target ${clang_arch}-${TABI} -ccc-gcc-name ${GCC}"
+ CLANG="${XGCCPATH}clang -target ${clang_arch}-${TABI} -ccc-gcc-name ${GCC}"
fi
}
Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12838
-gerrit
commit 83fa68341d03d0f7a60db0f7c161565bd517825e
Author: Martin Roth <martinroth(a)google.com>
Date: Tue Jan 5 14:21:02 2016 -0700
xcompile: Add separation for architectures to improve readability
- Add bar at the top of each architecture
- Make the architecture name and the TARCH_SEARCH to two lines
- Add a second line at the bottom of each architecture
- Add a comment about the two blank lines so they don't get
accidentally removed.
Change-Id: Ib4326bd94fe39b979244816ce54b752d083f6b16
Signed-off-by: Martin Roth <martinroth(a)google.com>
---
util/xcompile/xcompile | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile
index 82a5885..3535793 100755
--- a/util/xcompile/xcompile
+++ b/util/xcompile/xcompile
@@ -225,7 +225,9 @@ STRIP_${TARCH}:=${GCCPREFIX}strip
AR_${TARCH}:=${GCCPREFIX}ar
CROSS_COMPILE_${TARCH}:=${GCCPREFIX}
+
EOF
+#The two blank lines above are intentional separators
}
# Architecture definitions
@@ -320,7 +322,9 @@ test_architecture() {
search="$search $toolchain-linux-gnu-"
search="$search $toolchain-"
done
- echo "# $architecture TARCH_SEARCH=$search"
+ echo "###########################################################################"
+ echo "# $architecture"
+ echo "# TARCH_SEARCH=$search"
# Search toolchain by checking assembler capability.
for TBFDARCH in $TBFDARCHS; do
the following patch was just integrated into master:
commit 31c4b64ab4527dc8265bc1736415fad8b4bcdd01
Author: Martin Roth <martinroth(a)google.com>
Date: Mon Dec 7 14:34:46 2015 -0700
xcompile: Remove warnings about missing tools & architectures
Let toolchain.inc error out when the architecture or tool is missing.
Change-Id: I39a51e5a2c778d6bbc50354807e5e2b717fa9e52
Signed-off-by: Martin Roth <martinroth(a)google.com>
Reviewed-on: https://review.coreboot.org/12682
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
See https://review.coreboot.org/12682 for details.
-gerrit