svn commit: r475290 - in head/devel: amd64-gcc powerpc64-gcc

[John Baldwin]

Author: jhb (src,doc committer)
Date: Wed Jul 25 00:50:53 2018
New Revision: 475290
URL: https://svnweb.freebsd.org/changeset/ports/475290

Log:
  Drop builtin float.h for amd64-gcc.
  
  GCC's builtin <float.h> header is not compatible with
  sys/x86/include/float.h.  Drop the builtin header for now.  If at
  some point GCC's notion of floating point constants for i386 can
  converge with sys/x86/include/float.h this can be restored.
  
  Reviewed by:	bapt
  Differential Revision:	https://reviews.freebsd.org/D16073

Modified:
  head/devel/amd64-gcc/pkg-plist
  head/devel/powerpc64-gcc/Makefile

Modified: head/devel/amd64-gcc/pkg-plist
==============================================================================
--- head/devel/amd64-gcc/pkg-plist	Wed Jul 25 00:45:06 2018	(r475289)
+++ head/devel/amd64-gcc/pkg-plist	Wed Jul 25 00:50:53 2018	(r475290)
@@ -35,7 +35,6 @@ lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/cpuid.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/cross-stdarg.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/emmintrin.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/f16cintrin.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/float.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/fma4intrin.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/fmaintrin.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/fxsrintrin.h

Modified: head/devel/powerpc64-gcc/Makefile
==============================================================================
--- head/devel/powerpc64-gcc/Makefile	Wed Jul 25 00:45:06 2018	(r475289)
+++ head/devel/powerpc64-gcc/Makefile	Wed Jul 25 00:50:53 2018	(r475290)
@@ -2,7 +2,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	6.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	GCC/releases/gcc-${DISTVERSION}
 PKGNAMEPREFIX?=	powerpc64-
@@ -105,6 +105,10 @@ post-install:
 	@${RM} ${STAGEDIR}${PREFIX}/man/man7/*
 .if empty(PKGNAMEPREFIX:M*-*-)
 	@${RM} -r ${STAGEDIR}${PREFIX}/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include-fixed
+.endif
+.if ${TARGETARCH} == "amd64"
+	# Conflicts with sys/x86/include/float.h
+	${RM} ${STAGEDIR}${PREFIX}/lib/gcc/${GCC_TARGET$}/${PORTVERSION}/include/float.h
 .endif
 
 # This port and all its slave ports fail on aarch64 -- but not all