diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile index bce6421..a3e0855 100644 --- a/toolchain/binutils/Makefile +++ b/toolchain/binutils/Makefile @@ -9,6 +9,12 @@ config_opts += --target=$(tgt) config_opts += --disable-nls config_opts += --disable-werror +ifeq ($(arch), armv6) +config_opts += --with-arch=armv6 +config_opts += --with-fpu=vfp +config_opts += --with-float=hard +endif + ifeq ($(arch), x86_64) install: | $(tooldir)/lib64 else ifeq ($(arch), riscv64) diff --git a/toolchain/gcc-pass1/Makefile b/toolchain/gcc-pass1/Makefile index d0e5988..3b35c01 100644 --- a/toolchain/gcc-pass1/Makefile +++ b/toolchain/gcc-pass1/Makefile @@ -32,6 +32,12 @@ config_opts += --disable-libvtv config_opts += --disable-libstdcxx config_opts += --enable-languages=c,c++ +ifeq ($(arch), armv6) +config_opts += --with-arch=armv6 +config_opts += --with-fpu=vfp +config_opts += --with-float=hard +endif + include targets.mk $(config_tgt): | $(srcdirs) diff --git a/world/gcc/Makefile b/world/gcc/Makefile index af62f67..32443ab 100644 --- a/world/gcc/Makefile +++ b/world/gcc/Makefile @@ -26,10 +26,6 @@ ifeq ($(build_objcxx),1) objcxx = ,obj-c++ endif -ifeq ($(arch), armv6) -config_opts += --disable-libsanitizer -endif - define pre_configure [ -d $(srcdir)/gmp ] && rm -rf $(srcdir)/gmp || true [ -d $(srcdir)/mpc ] && rm -rf $(srcdir)/mpc || true @@ -47,6 +43,13 @@ config_opts += --with-system-zlib # for musl #config_opts += --disable-libsanitizer +ifeq ($(arch), armv6) +config_opts += --with-arch=armv6 +config_opts += --with-fpu=vfp +config_opts += --with-float=hard +config_opts += --disable-libsanitizer +endif + post_install = ln -sf gcc $(DESTDIR)/usr/bin/cc include targets.mk