diff options
Diffstat (limited to 'package/assimp')
| -rw-r--r-- | package/assimp/Config.in | 5 | ||||
| -rw-r--r-- | package/assimp/assimp.mk | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/package/assimp/Config.in b/package/assimp/Config.in index 8fa6429da0..93020f7238 100644 --- a/package/assimp/Config.in +++ b/package/assimp/Config.in @@ -4,11 +4,6 @@ config BR2_PACKAGE_ASSIMP # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71124, that # cause an infinite loop in gcc when building this package. depends on !BR2_microblaze - # The ADI Blackfin toolchain does not build assimp properly, - # fails with "internal compiler error: in simplify_subreg, at - # simplify-rtx.c:5001". It builds fine with a mainline gcc for - # Blackfin. - depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_ZLIB help diff --git a/package/assimp/assimp.mk b/package/assimp/assimp.mk index 08893fff00..acd3701a38 100644 --- a/package/assimp/assimp.mk +++ b/package/assimp/assimp.mk @@ -16,6 +16,14 @@ ifeq ($(BR2_m68k),y) ASSIMP_CXXFLAGS += -mxgot endif +# workaround SuperH compiler failure when static linking (i.e -fPIC is +# not passed) in gcc versions 5.x or older. The -Os optimization level +# causes a "unable to find a register to spill in class +# ‘GENERAL_REGS’" error. -O2 works fine. +ifeq ($(BR2_sh):$(BR2_STATIC_LIBS):$(BR2_TOOLCHAIN_GCC_AT_LEAST_6),y:y:) +ASSIMP_CXXFLAGS += -O2 +endif + ASSIMP_CONF_OPTS += -DASSIMP_BUILD_TESTS=OFF \ -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(ASSIMP_CXXFLAGS)" |
