From e56c09f53ab5a8f55b0c08a3d9d3f11cc041c7a9 Mon Sep 17 00:00:00 2001 From: Gerald Pfeifer Date: Sat, 18 Feb 2017 22:58:48 +0000 Subject: [PATCH] backport: x86-64.h: Append --32 to the assembler options when -m16 is used on non-glibc systems as well. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Backport from mainline 2016-12-11 Roger Pau Monné * config/i386/x86-64.h: Append --32 to the assembler options when -m16 is used on non-glibc systems as well. From-SVN: r245566 --- gcc/ChangeLog | 8 ++++++++ gcc/config/i386/x86-64.h | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1c3c948766f2..3709c40018c4 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2017-02-18 Gerald Pfeifer + + Backport from mainline + 2016-12-11 Roger Pau Monné + + * config/i386/x86-64.h: Append --32 to the assembler options when + -m16 is used on non-glibc systems as well. + 2017-02-17 Julia Koval PR target/76731 diff --git a/gcc/config/i386/x86-64.h b/gcc/config/i386/x86-64.h index a1e145ff29d3..7aca2e163a0e 100644 --- a/gcc/config/i386/x86-64.h +++ b/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) \ -- 2.47.2