From a2acc8837d4d2cf6bfcea3bb5df15bc2618433cd Mon Sep 17 00:00:00 2001 From: Liam Girdwood Date: Sat, 14 Jul 2018 17:33:19 +0100 Subject: [PATCH 1/4] configure: gcc: make sure CFLAGS and LDFLAGS are set correctly. GCC needs flags set correctly in order to pass AC_PROG_CC test. Signed-off-by: Liam Girdwood --- configure.ac | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 8fe432ad8a97..a25f954bc74d 100644 --- a/configure.ac +++ b/configure.ac @@ -18,9 +18,6 @@ AC_DEFINE_UNQUOTED([SOF_MICRO], sof_micro, [Sof micro version]) AC_CANONICAL_HOST -# General compiler flags -CFLAGS="${CFLAGS:+$CFLAGS } -O2 -g -Wall -Werror -Wl,-EL -Wmissing-prototypes" - # General assembler flags ASFLAGS="-DASSEMBLY" AC_SUBST(ASFLAGS) @@ -94,6 +91,11 @@ case "$with_arch" in AM_LDFLAGS="-nostdlib" AM_CCASFLAGS="-fno-inline-functions -nostdlib -mlongcalls" + # GCC needs these additional flags on top of any user flags. + CFLAGS="${CFLAGS:+$CFLAGS } -O2 -g -Wall -Werror -Wl,-EL -Wmissing-prototypes" + LDFLAGS="${LDFLAGS:+$LDFLAGS } ${AM_LDFLAGS}" + CCASFLAGS="${CCASFLAGS:+$CCASFLAGS } ${AM_CCASFLAGS}" + ARCH="xtensa" AC_SUBST(ARCH) From 7c960669746096291c6549c0701eee658127b796 Mon Sep 17 00:00:00 2001 From: Liam Girdwood Date: Sat, 14 Jul 2018 17:34:15 +0100 Subject: [PATCH 2/4] configure: rimage: Make sure rimage CFLAGS are strict. Turn all warnings into errors for rimage. Signed-off-by: Liam Girdwood --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index a25f954bc74d..9979632cc1f7 100644 --- a/configure.ac +++ b/configure.ac @@ -65,6 +65,7 @@ AM_CONDITIONAL(BUILD_LIB, test "$have_library" = "yes") AC_ARG_ENABLE(rimage, [AS_HELP_STRING([--enable-rimage],[build rimage tool])], have_rimage=$enableval, have_rimage=no) if test "$have_rimage" = "yes"; then AC_DEFINE([CONFIG_RIMAGE], [1], [Configure to build rimage]) + AM_CFLAGS="-O2 -g -Wall -Werror -Wl,-EL -Wmissing-prototypes" fi AM_CONDITIONAL(BUILD_RIMAGE, test "$have_rimage" = "yes") From 8c907e903882929df11ee546013aabb442791967 Mon Sep 17 00:00:00 2001 From: Liam Girdwood Date: Sat, 14 Jul 2018 17:34:57 +0100 Subject: [PATCH 3/4] configure: host: Host CFLAGS should be strict Turns all warnings into errors. Signed-off-by: Liam Girdwood --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 9979632cc1f7..344dbd95be4e 100644 --- a/configure.ac +++ b/configure.ac @@ -110,9 +110,9 @@ case "$with_arch" in ARCH_CFLAGS="-g" # automake FLAGS defined here - AM_CFLAGS="-O3" + AM_CFLAGS="-O3 -Wall -Werror -Wl,-EL -Wmissing-prototypes" AM_LDFLAGS="-lpthread" - AM_CCASFLAGS="-O3" + AM_CCASFLAGS="-O3 -Wall -Werror -Wl,-EL -Wmissing-prototypes" ARCH="host" AC_SUBST(ARCH) From 792040997c1c602afe78ad3488a4564f537d8673 Mon Sep 17 00:00:00 2001 From: Liam Girdwood Date: Sat, 14 Jul 2018 17:35:57 +0100 Subject: [PATCH 4/4] build: host: Fix versioning for libtool. Libtools does not like version number starting with a leading 0 i.e. 01.1 must be converted to 1.1 Signed-off-by: Liam Girdwood --- src/audio/Makefile.am | 2 +- src/ipc/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/audio/Makefile.am b/src/audio/Makefile.am index 7e887a7c29e6..4c29967f1dd9 100644 --- a/src/audio/Makefile.am +++ b/src/audio/Makefile.am @@ -64,7 +64,7 @@ if BUILD_HOST # common linker flags for host libs host_lib_ldflags = \ $(AM_LDFLAGS) \ - -version-info `echo $(VERSION) | cut -d '.' -f 1` \ + -version-info `echo $(VERSION) | cut -d '.' -f 1 | cut -d '0' -f 2` \ -no-undefined \ -export-dynamic diff --git a/src/ipc/Makefile.am b/src/ipc/Makefile.am index 917384224013..69d7ea10d513 100644 --- a/src/ipc/Makefile.am +++ b/src/ipc/Makefile.am @@ -6,7 +6,7 @@ libsof_ipc_la_SOURCES = \ libsof_ipc_la_LDFLAGS = \ $(AM_LDFLAGS) \ - -version-info `echo $(VERSION) | cut -d '.' -f 1` \ + -version-info `echo $(VERSION) | cut -d '.' -f 1 | cut -d '0' -f 2` \ -no-undefined \ -export-dynamic