svn commit: r441906 - in head/lang/gcc6: . files

[Gerald Pfeifer]

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é  <roger.pau at citrix.com>
+
+	* 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) \