Attachment #187024 for bug #221905

Lines 14-20 Link Here

(-)Makefile (-2 / +2 lines)
14	LICENSE= GPLv3 GPLv3RLE	14	LICENSE= GPLv3 GPLv3RLE
15	LICENSE_COMB= multi	15	LICENSE_COMB= multi
16		16
17	ONLY_FOR_ARCHS= aarch64 amd64 arm armv6 i386 powerpc powerpc64 sparc64	17	ONLY_FOR_ARCHS= aarch64 amd64 arm armv6 armv7 i386 powerpc powerpc64 sparc64
18	BROKEN_sparc64= fails to configure: cannot compute suffix of object files: cannot compile	18	BROKEN_sparc64= fails to configure: cannot compute suffix of object files: cannot compile
19		19
20	LIB_DEPENDS= libgmp.so:math/gmp \	20	LIB_DEPENDS= libgmp.so:math/gmp \
Lines 73-79 Link Here
73	USE_GCC= 5 # Cannot require ourselves, needs to be at least 4.9.	73	USE_GCC= 5 # Cannot require ourselves, needs to be at least 4.9.
74	.endif	74	.endif
75		75
76	.if ${ARCH} == aarch64 \|\| ${ARCH} == armv6	76	.if ${ARCH} == aarch64 \|\| ${ARCH} == armv6 \|\| ${ARCH} == armv7
77	. if ${COMPILER_TYPE} == clang	77	. if ${COMPILER_TYPE} == clang
78	. if empty(PORT_OPTIONS:MBOOTSTRAP)	78	. if empty(PORT_OPTIONS:MBOOTSTRAP)
79	MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512	79	MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512




--- gcc/config.gcc.orig	2017-10-08 11:57:29 UTC
+++ gcc/config.gcc
@@ -1072,6 +1072,9 @@ arm*-*-freebsd*)                # ARM FreeBSD EABI
                tm_defines="${tm_defines} TARGET_FREEBSD_ARM_HARD_FLOAT=1"
             fi
 	    ;;
+	armv7*-*-freebsd*)
+	    tm_defines="${tm_defines} TARGET_FREEBSD_ARMv7=1 TARGET_FREEBSD_ARM_HARD_FLOAT=1"
+	    ;;
 	esac
 	with_tls=${with_tls:-gnu}
 	;;




--- gcc/config/arm/freebsd.h.orig	2017-10-08 12:00:05 UTC
+++ gcc/config/arm/freebsd.h
@@ -112,10 +112,12 @@
 #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
 #undef  SUBTARGET_CPU_DEFAULT
 #define SUBTARGET_CPU_DEFAULT   TARGET_CPU_arm9
 #endif

Return to bug 221905

Line 0 Link Here

(-)files/patch-gcc_config.gcc (+12 lines)
	1	--- gcc/config.gcc.orig 2017-10-08 11:57:29 UTC
	2	+++ gcc/config.gcc
	3	@@ -1072,6 +1072,9 @@ arm--freebsd*) # ARM FreeBSD EABI
	4	tm_defines="${tm_defines} TARGET_FREEBSD_ARM_HARD_FLOAT=1"
	5	fi
	6	;;
	7	+ armv7--freebsd*)
	8	+ tm_defines="${tm_defines} TARGET_FREEBSD_ARMv7=1 TARGET_FREEBSD_ARM_HARD_FLOAT=1"
	9	+ ;;
	10	esac
	11	with_tls=${with_tls:-gnu}
	12	;;

Line 0 Link Here

(-)files/patch-gcc_config_arm_freebsd.h (+17 lines)
	1	--- gcc/config/arm/freebsd.h.orig 2017-10-08 12:00:05 UTC
	2	+++ gcc/config/arm/freebsd.h
	3	@@ -112,10 +112,12 @@
	4	#undef WCHAR_TYPE_SIZE
	5	#define WCHAR_TYPE_SIZE BITS_PER_WORD
	6
	7	-#if defined (TARGET_FREEBSD_ARMv6)
	8	+#if defined (TARGET_FREEBSD_ARMv7)
	9	#undef SUBTARGET_CPU_DEFAULT
	10	+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_genericv7a
	11	+#elif defined (TARGET_FREEBSD_ARMv6)
	12	+#undef SUBTARGET_CPU_DEFAULT
	13	#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm1176jzs
	14	-#else
	15	#undef SUBTARGET_CPU_DEFAULT
	16	#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9
	17	#endif