backport: x86-64.h: Append --32 to the assembler options when -m16 is used on non...

	Backport from mainline
	2016-12-11  Roger Pau Monné  <roger.pau@citrix.com>

	* config/i386/x86-64.h: Append --32 to the assembler options when
	-m16 is used on non-glibc systems as well.

From-SVN: r245566

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1c3c948766f2e9161438f9e92fa003f6e2eb08db..3709c40018c40979e87e497059fcac7aae0100bf 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2017-02-18  Gerald Pfeifer  <gerald@pfeifer.com>
+
+       Backport from mainline
+       2016-12-11  Roger Pau Monné  <roger.pau@citrix.com>
+
+       * 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  <julia.koval@intel.com>
 
        PR target/76731

diff --git a/gcc/config/i386/x86-64.h b/gcc/config/i386/x86-64.h
index a1e145ff29d3cea2df32ff5b196b7ad5149d5bb2..7aca2e163a0efff94260cbef0b310f4a642db403 100644 (file)
--- 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) \