jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-28 13:46:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/haproxy: re-enable package on microblaze

Browse Source 
With Microblaze ccc version < 8.x and optimization, the build fails
with;

  'internal compiler error: in do_output_reload, at reload1.c:7978'

This is due to gcc bug 90620:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90620. To avoid this, the
haproxy package has a !BR2_microblaze dependency. However, this gcc
bug 90620 only triggers when optimization is enabled, so we can work
around the issue by passing -O0, which is what we do in other
Buildroot packages to work around similar Microblaze issues.

So, this commit passes -O0 when BR2_TOOLCHAIN_HAS_GCC_BUG_90620, and
re-enables haproxy on Microblaze.

Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Giulio Benetti 2019-06-14 23:03:41 +02:00 committed by Thomas Petazzoni
parent efc53530cb
commit cff1486405
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/haproxy/Config.in
View File

@ -1,8 +1,6 @@
config BR2_PACKAGE_HAPROXY_ARCH_SUPPORTS config BR2_PACKAGE_HAPROXY_ARCH_SUPPORTS
bool bool
default y default y
# internal compiler error: in do_output_reload, at reload1.c:7978
depends on !BR2_microblaze
# src/proto_http.c:6330:1: internal compiler error: Segmentation fault # src/proto_http.c:6330:1: internal compiler error: Segmentation fault
depends on !BR2_nios2 depends on !BR2_nios2
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60040 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60040

8
package/haproxy/haproxy.mk
View File

@ -69,9 +69,15 @@ endif
HAPROXY_MAKE_OPTS += ADDLIB="$(HAPROXY_LIBS)" HAPROXY_MAKE_OPTS += ADDLIB="$(HAPROXY_LIBS)"
HAPROXY_CFLAGS = $(TARGET_CFLAGS)
ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_90620),y)
HAPROXY_CFLAGS += -O0
endif
define HAPROXY_BUILD_CMDS define HAPROXY_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
$(HAPROXY_MAKE_OPTS) -C $(@D) $(HAPROXY_MAKE_OPTS) CFLAGS="$(HAPROXY_CFLAGS)" -C $(@D)
endef endef
define HAPROXY_INSTALL_TARGET_CMDS define HAPROXY_INSTALL_TARGET_CMDS