diff options
| author | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2015-07-07 00:32:47 +0200 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2015-07-07 17:40:09 +0200 |
| commit | 4c8fa2aad28fa5290478317a99e1323ade714677 (patch) | |
| tree | 9bcef6aacae459b226c9b070947e7669a0007d94 | |
| parent | faa76f5548297ce246b84fe9a1aa6cbff2ff9fdb (diff) | |
Unconditionally compile romstage with -Wa,--divide
The option --divide is required by our assembler to ensure that
'/' is not parsed as a comment sign but as a division, because
some of the cache as ram code is using divisions.
The --divide parameter has been part of the GNU as since binutils 2.17.
Hence, compile romstage (which contains cache as ram init) with
-Wa,--divide unconditionally instead of probing for it and adding it to
all compiler invocations (because that is causing random trouble with
clang when compiling the SMM code and calling gcc with --divide instead of
-Wa,--divide)
Change-Id: Ideefb2a243dc1d657ba415a99c1f8ab1d93800e0
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-on: http://review.coreboot.org/10817
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
| -rw-r--r-- | src/arch/x86/Makefile.inc | 3 | ||||
| -rwxr-xr-x | util/xcompile/xcompile | 8 |
2 files changed, 3 insertions, 8 deletions
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index f502bbe03e..20740a4df1 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -247,6 +247,9 @@ $(objgenerated)/crt0.S: $$(crt0s) # Compiling crt0 with -g seems to trigger https://sourceware.org/bugzilla/show_bug.cgi?id=6428 romstage-S-ccopts += -I. -g0 +# Some cache as ram code is doing divisions +romstage-S-ccopts +=-Wa,--divide + endif # CONFIG_ARCH_ROMSTAGE_X86_32 / CONFIG_ARCH_ROMSTAGE_X86_64 ############################################################################### diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile index 7ae1e39cc9..884d7b8174 100755 --- a/util/xcompile/xcompile +++ b/util/xcompile/xcompile @@ -143,10 +143,6 @@ detect_special_flags() { case "$architecture" in x86) - testcc "$GCC" "$CFLAGS_GCC -Wa,--divide" && - CFLAGS_GCC="$CFLAGS_GCC -Wa,--divide" - testcc "$CLANG" "$CFLAGS_CLANG -Wa,--divide" && - CFLAGS_CLANG="$CFLAGS_CLANG -Wa,--divide" # Always build for i686 -- no sse/mmx instructions since SMM # modules are compiled using these flags. Note that this # doesn't prevent a project using xcompile to explicitly @@ -154,10 +150,6 @@ detect_special_flags() { CFLAGS_GCC="$CFLAGS_GCC -march=i686" ;; x64) - testcc "$GCC" "$CFLAGS_GCC -Wa,--divide" && - CFLAGS_GCC="$CFLAGS_GCC -Wa,--divide" - testcc "$CLANG" "$CFLAGS_CLANG -Wa,--divide" && - CFLAGS_CLANG="$CFLAGS_CLANG -Wa,--divide" ;; mipsel) testcc "$GCC" "$CFLAGS_GCC -mno-abicalls -fno-pic" && \ |