diff options
| author | gerald <gerald@FreeBSD.org> | 2017-05-28 18:34:12 +0800 |
|---|---|---|
| committer | gerald <gerald@FreeBSD.org> | 2017-05-28 18:34:12 +0800 |
| commit | 5684221e15e317f7f641e81483e77d148b5a3f83 (patch) | |
| tree | 9476fe842257a651326120fce1305ea851026b04 /lang | |
| parent | 2b244947bfc3bdd055cb8325d69de9d8e7bf7166 (diff) | |
| download | freebsd-ports-gnome-5684221e15e317f7f641e81483e77d148b5a3f83.tar.gz freebsd-ports-gnome-5684221e15e317f7f641e81483e77d148b5a3f83.tar.zst freebsd-ports-gnome-5684221e15e317f7f641e81483e77d148b5a3f83.zip | |
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
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/gcc6/Makefile | 2 | ||||
| -rw-r--r-- | lang/gcc6/files/patch-x86-64-fix-m16 | 25 |
2 files changed, 26 insertions, 1 deletions
diff --git a/lang/gcc6/Makefile b/lang/gcc6/Makefile index a5c64ea10e01..e47216529229 100644 --- a/lang/gcc6/Makefile +++ b/lang/gcc6/Makefile @@ -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} diff --git a/lang/gcc6/files/patch-x86-64-fix-m16 b/lang/gcc6/files/patch-x86-64-fix-m16 new file mode 100644 index 000000000000..515c0952a29d --- /dev/null +++ b/lang/gcc6/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@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) \ |