From owner-svn-ports-all@freebsd.org Sun May 28 10:34:13 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id ED825D85A69; Sun, 28 May 2017 10:34:13 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A57301A7D; Sun, 28 May 2017 10:34:13 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4SAYC05041496; Sun, 28 May 2017 10:34:12 GMT (envelope-from gerald@FreeBSD.org) Received: (from gerald@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4SAYCgI041494; Sun, 28 May 2017 10:34:12 GMT (envelope-from gerald@FreeBSD.org) Message-Id: <201705281034.v4SAYCgI041494@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gerald set sender to gerald@FreeBSD.org using -f From: Gerald Pfeifer Date: Sun, 28 May 2017 10:34:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r441906 - in head/lang/gcc6: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 May 2017 10:34:14 -0000 Author: gerald Date: Sun May 28 10:34:12 2017 New Revision: 441906 URL: https://svnweb.freebsd.org/changeset/ports/441906 Log: Forward port files/patch-x86-64-fix-m16 from lang/gcc5. This has been in gcc6-devel for a while, but the next GCC 6 release has been taking longer than expected, so let's put this in temporarily. PR: 219291 Added: head/lang/gcc6/files/patch-x86-64-fix-m16 - copied unchanged from r441900, head/lang/gcc5/files/patch-x86-64-fix-m16 Modified: head/lang/gcc6/Makefile Modified: head/lang/gcc6/Makefile ============================================================================== --- head/lang/gcc6/Makefile Sun May 28 09:31:40 2017 (r441905) +++ head/lang/gcc6/Makefile Sun May 28 10:34:12 2017 (r441906) @@ -3,7 +3,7 @@ PORTNAME= gcc PORTVERSION= 6.3.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang java MASTER_SITES= GCC/releases/gcc-${DISTVERSION} PKGNAMESUFFIX= ${SUFFIX} Copied: head/lang/gcc6/files/patch-x86-64-fix-m16 (from r441900, head/lang/gcc5/files/patch-x86-64-fix-m16) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/gcc6/files/patch-x86-64-fix-m16 Sun May 28 10:34:12 2017 (r441906, copy of r441900, head/lang/gcc5/files/patch-x86-64-fix-m16) @@ -0,0 +1,25 @@ +At the moment the -m16 option only passes the "--32" parameter to the +assembler on glibc OSes, while on other OSes the assembler is called +without any specific flag. This is wrong and causes the assembler to +fail. Fix it by adding support for the -m16 option to x86-64.h. + +2016-07-06 Roger Pau Monné + + * x86-64.h: append --32 to the assembler options when -m16 is used + even on non-glibc OSes. + +This should be backported to all stable branches up to 4.9 (when -m16 was +introduced). + +--- UTC +--- gcc/config/i386/x86-64.h ++++ gcc/config/i386/x86-64.h +@@ -49,7 +49,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + #define WCHAR_TYPE_SIZE 32 + + #undef ASM_SPEC +-#define ASM_SPEC "%{m32:--32} %{m64:--64} %{mx32:--x32}" ++#define ASM_SPEC "%{m16|m32:--32} %{m64:--64} %{mx32:--x32}" + + #undef ASM_OUTPUT_ALIGNED_BSS + #define ASM_OUTPUT_ALIGNED_BSS(FILE, DECL, NAME, SIZE, ALIGN) \