[Buildroot] [git commit branch/2019.05.x] package/git: work around gcc bug 85180

Peter Korsgaard peter at korsgaard.com
Tue Aug 20 19:23:07 UTC 2019


commit: https://git.buildroot.net/buildroot/commit/?id=72171df6675cc65f6f42a3ee0df16ec867fe9e6f
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2019.05.x

With Microblaze Gcc version < 8.x the build hangs due to gcc bug
85180: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85180. The bug
shows up when building git with optimization but not when building with
-O0. To work around this, if BR2_TOOLCHAIN_HAS_GCC_BUG_85180=y we force
using -O0.

Fixes:

  http://autobuild.buildroot.net/results/7ad/7adff001631053ae5a3cb3e176d321f6a2d3cceb/

Signed-off-by: Giulio Benetti <giulio.benetti at micronovasrl.com>
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
(cherry picked from commit 7c7c0e4406aea45b2db0a932b128960b4ef4b474)
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
---
 package/git/git.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/package/git/git.mk b/package/git/git.mk
index 804a6e2325..b1434fb7be 100644
--- a/package/git/git.mk
+++ b/package/git/git.mk
@@ -66,6 +66,14 @@ ifeq ($(BR2_SYSTEM_ENABLE_NLS),)
 GIT_MAKE_OPTS += NO_GETTEXT=1
 endif
 
+GIT_CFLAGS = $(TARGET_CFLAGS)
+
+ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
+GIT_CFLAGS += -O0
+endif
+
+GIT_CONF_OPTS += CFLAGS="$(GIT_CFLAGS)"
+
 GIT_INSTALL_TARGET_OPTS = $(GIT_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install
 
 # assume yes for these tests, configure will bail out otherwise


More information about the buildroot mailing list