Add support for armv7-*-freebsd*.

This patch is already upstreamed and can be dropped once a new GCC 6.x is
released.

PR:	221905
Submitted by:	mmel@
Approved by:	gerald@ (maintainer)
This commit is contained in:
Andreas Tobler 2017-10-10 19:17:19 +00:00
parent dd462f54eb
commit 7ead1eb866
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=451718
2 changed files with 30 additions and 2 deletions

View File

@ -14,7 +14,7 @@ COMMENT= GNU Compiler Collection 6
LICENSE= GPLv3 GPLv3RLE
LICENSE_COMB= multi
ONLY_FOR_ARCHS= aarch64 amd64 arm armv6 i386 powerpc powerpc64 sparc64
ONLY_FOR_ARCHS= aarch64 amd64 arm armv6 armv7 i386 powerpc powerpc64 sparc64
BROKEN_sparc64= fails to configure: cannot compute suffix of object files: cannot compile
LIB_DEPENDS= libgmp.so:math/gmp \
@ -73,7 +73,7 @@ CONFIGURE_ENV+= UNAME_m="powerpc64"
USE_GCC= 5 # Cannot require ourselves, needs to be at least 4.9.
.endif
.if ${ARCH} == aarch64 || ${ARCH} == armv6
.if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7
. if ${COMPILER_TYPE} == clang
. if empty(PORT_OPTIONS:MBOOTSTRAP)
MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512

View File

@ -0,0 +1,28 @@
---UTC
--- gcc/config.gcc.orig 2017-01-09 22:01:26.582656000 +0100
+++ gcc/config.gcc 2017-10-07 17:27:59.564810000 +0200
@@ -1072,6 +1072,10 @@
tm_defines="${tm_defines} TARGET_FREEBSD_ARM_HARD_FLOAT=1"
fi
;;
+ armv7*-*-freebsd*)
+ tm_defines="${tm_defines} TARGET_FREEBSD_ARMv7=1"
+ tm_defines="${tm_defines} TARGET_FREEBSD_ARM_HARD_FLOAT=1"
+ ;;
esac
with_tls=${with_tls:-gnu}
;;
--- gcc/config/arm/freebsd.h.orig 2016-06-15 21:17:15.860618000 +0200
+++ gcc/config/arm/freebsd.h 2017-10-09 21:38:03.395632000 +0200
@@ -112,7 +112,10 @@
#undef WCHAR_TYPE_SIZE
#define WCHAR_TYPE_SIZE BITS_PER_WORD
-#if defined (TARGET_FREEBSD_ARMv6)
+#if defined (TARGET_FREEBSD_ARMv7)
+#undef SUBTARGET_CPU_DEFAULT
+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_genericv7a
+#elif defined (TARGET_FREEBSD_ARMv6)
#undef SUBTARGET_CPU_DEFAULT
#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm1176jzs
#else