Rename --n32 to --x32.

gas/

2011-01-14  H.J. Lu  <hongjiu.lu@intel.com>

	* config/tc-i386.c (OPTION_N32): Renamed to ...
	(OPTION_X32): This.
	(md_longopts): Replace n32 with x32.
	(md_parse_option): Updated.
	(md_show_usage): Likewise.

	* doc/c-i386.texi: Replace n32 with x32.

gas/testsuite/

2011-01-14  H.J. Lu  <hongjiu.lu@intel.com>

	* gas/i386/ilp32/cfi/ilp32.exp: Replace --n32 with --x32.
	* gas/i386/ilp32/elf/ilp32.exp: Likewise.
	* gas/i386/ilp32/ilp32.exp: Likewise.
	* gas/i386/ilp32/lns/ilp32.exp: Likewise.

ld/testsuite/

2011-01-14  H.J. Lu  <hongjiu.lu@intel.com>

	* ld-x86-64/ilp32-1.d: Replace --n32 with --x32.
	* ld-x86-64/ilp32-2.d: Likewise.
	* ld-x86-64/ilp32-3.d: Likewise.
	* ld-x86-64/ilp32-4.d: Likewise.
	* ld-x86-64/ilp32-5.d: Likewise.
	* ld-x86-64/x86-64.exp: Likewise.

15 files changed, 48 insertions, 22 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 449aa73..33cf24c 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* config/tc-i386.c (OPTION_N32): Renamed to ...
+	(OPTION_X32): This.
+	(md_longopts): Replace n32 with x32.
+	(md_parse_option): Updated.
+	(md_show_usage): Likewise.
+
+	* doc/c-i386.texi: Replace n32 with x32.
+
 2011-01-11  Mingjie Xing  <mingjie.xing@gmail.com>
 
 	* config/tc-mips.c (mips_ip): Update error messages.  Take an
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index a5f9c49..5c880b7 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -8152,7 +8152,7 @@ const char *md_shortopts = "qn";
 #define OPTION_MSSE2AVX (OPTION_MD_BASE + 10)
 #define OPTION_MSSE_CHECK (OPTION_MD_BASE + 11)
 #define OPTION_MAVXSCALAR (OPTION_MD_BASE + 12)
-#define OPTION_N32 (OPTION_MD_BASE + 13)
+#define OPTION_X32 (OPTION_MD_BASE + 13)
 
 struct option md_longopts[] =
 {
@@ -8162,7 +8162,7 @@ struct option md_longopts[] =
   {"64", no_argument, NULL, OPTION_64},
 #endif
 #if defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF)
-  {"n32", no_argument, NULL, OPTION_N32},
+  {"x32", no_argument, NULL, OPTION_X32},
 #endif
   {"divide", no_argument, NULL, OPTION_DIVIDE},
   {"march", required_argument, NULL, OPTION_MARCH},
@@ -8239,7 +8239,7 @@ md_parse_option (int c, char *arg)
 #endif
 
 #if defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF)
-    case OPTION_N32:
+    case OPTION_X32:
       if (IS_ELF)
 	{
 	  const char **list, **l;
@@ -8523,7 +8523,7 @@ md_show_usage (FILE *stream)
 #if (defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF) \
      || defined (TE_PE) || defined (TE_PEP))
   fprintf (stream, _("\
-  --32/--64/--n32         generate 32bit/64bit/n32bit code\n"));
+  --32/--64/--x32         generate 32bit/64bit/x32 code\n"));
 #endif
 #ifdef SVR4_COMMENT_CHARS
   fprintf (stream, _("\
diff --git a/gas/doc/c-i386.texi b/gas/doc/c-i386.texi
index 4ea33f6..d330f86 100644
--- a/gas/doc/c-i386.texi
+++ b/gas/doc/c-i386.texi
@@ -57,13 +57,13 @@ dependent options:
 @table @gcctabopt
 @cindex @samp{--32} option, i386
 @cindex @samp{--32} option, x86-64
-@cindex @samp{--n32} option, i386
-@cindex @samp{--n32} option, x86-64
+@cindex @samp{--x32} option, i386
+@cindex @samp{--x32} option, x86-64
 @cindex @samp{--64} option, i386
 @cindex @samp{--64} option, x86-64
-@item --32 | --n32 | --64
+@item --32 | --x32 | --64
 Select the word size, either 32 bits or 64 bits.  @samp{--32}
-implies Intel i386 architecture, while @samp{--n32} and @samp{--64}
+implies Intel i386 architecture, while @samp{--x32} and @samp{--64}
 imply AMD x86-64 architecture with 32-bit or 64-bit word-size
 respectively.
 
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index e63bd65..2162101 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* gas/i386/ilp32/cfi/ilp32.exp: Replace --n32 with --x32.
+	* gas/i386/ilp32/elf/ilp32.exp: Likewise.
+	* gas/i386/ilp32/ilp32.exp: Likewise.
+	* gas/i386/ilp32/lns/ilp32.exp: Likewise.
+
 2011-01-11  Mingjie Xing  <mingjie.xing@gmail.com>
 
 	* mips/loongson-3a-2.s, mips/loongson-3a-2.d: Use the real offset
diff --git a/gas/testsuite/gas/i386/ilp32/cfi/ilp32.exp b/gas/testsuite/gas/i386/ilp32/cfi/ilp32.exp
index 5ec1dfd..9593720 100644
--- a/gas/testsuite/gas/i386/ilp32/cfi/ilp32.exp
+++ b/gas/testsuite/gas/i386/ilp32/cfi/ilp32.exp
@@ -13,7 +13,7 @@ if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check] &&
 
     global ASFLAGS
     set old_ASFLAGS "$ASFLAGS"
-    set ASFLAGS "$ASFLAGS --n32"
+    set ASFLAGS "$ASFLAGS --x32"
 
     foreach test [lsort [glob -nocomplain $srcdir/$subdir/*.d]] {
 	if { [runtest_file_p $runtests $test] } {
diff --git a/gas/testsuite/gas/i386/ilp32/elf/ilp32.exp b/gas/testsuite/gas/i386/ilp32/elf/ilp32.exp
index 5ec1dfd..9593720 100644
--- a/gas/testsuite/gas/i386/ilp32/elf/ilp32.exp
+++ b/gas/testsuite/gas/i386/ilp32/elf/ilp32.exp
@@ -13,7 +13,7 @@ if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check] &&
 
     global ASFLAGS
     set old_ASFLAGS "$ASFLAGS"
-    set ASFLAGS "$ASFLAGS --n32"
+    set ASFLAGS "$ASFLAGS --x32"
 
     foreach test [lsort [glob -nocomplain $srcdir/$subdir/*.d]] {
 	if { [runtest_file_p $runtests $test] } {
diff --git a/gas/testsuite/gas/i386/ilp32/ilp32.exp b/gas/testsuite/gas/i386/ilp32/ilp32.exp
index 5ec1dfd..9593720 100644
--- a/gas/testsuite/gas/i386/ilp32/ilp32.exp
+++ b/gas/testsuite/gas/i386/ilp32/ilp32.exp
@@ -13,7 +13,7 @@ if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check] &&
 
     global ASFLAGS
     set old_ASFLAGS "$ASFLAGS"
-    set ASFLAGS "$ASFLAGS --n32"
+    set ASFLAGS "$ASFLAGS --x32"
 
     foreach test [lsort [glob -nocomplain $srcdir/$subdir/*.d]] {
 	if { [runtest_file_p $runtests $test] } {
diff --git a/gas/testsuite/gas/i386/ilp32/lns/ilp32.exp b/gas/testsuite/gas/i386/ilp32/lns/ilp32.exp
index 5ec1dfd..9593720 100644
--- a/gas/testsuite/gas/i386/ilp32/lns/ilp32.exp
+++ b/gas/testsuite/gas/i386/ilp32/lns/ilp32.exp
@@ -13,7 +13,7 @@ if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check] &&
 
     global ASFLAGS
     set old_ASFLAGS "$ASFLAGS"
-    set ASFLAGS "$ASFLAGS --n32"
+    set ASFLAGS "$ASFLAGS --x32"
 
     foreach test [lsort [glob -nocomplain $srcdir/$subdir/*.d]] {
 	if { [runtest_file_p $runtests $test] } {
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 897e3db..498de82 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,5 +1,14 @@
 2011-01-14  H.J. Lu  <hongjiu.lu@intel.com>
 
+	* ld-x86-64/ilp32-1.d: Replace --n32 with --x32.
+	* ld-x86-64/ilp32-2.d: Likewise.
+	* ld-x86-64/ilp32-3.d: Likewise.
+	* ld-x86-64/ilp32-4.d: Likewise.
+	* ld-x86-64/ilp32-5.d: Likewise.
+	* ld-x86-64/x86-64.exp: Likewise.
+
+2011-01-14  H.J. Lu  <hongjiu.lu@intel.com>
+
 	* ld-x86-64/ilp32-5.d: New.
 	* ld-x86-64/ilp32-5.s: Likewise.
 
diff --git a/ld/testsuite/ld-x86-64/ilp32-1.d b/ld/testsuite/ld-x86-64/ilp32-1.d
index 394d051..aa3b934 100644
--- a/ld/testsuite/ld-x86-64/ilp32-1.d
+++ b/ld/testsuite/ld-x86-64/ilp32-1.d
@@ -1,6 +1,6 @@
 #source: dummy.s
-#as: --n32
-#ld: -m elf32_x86_64 tmpdir/startn32.o tmpdir/foon32.o
+#as: --x32
+#ld: -m elf32_x86_64 tmpdir/startx32.o tmpdir/foox32.o
 #readelf: -h
 
 ELF Header:
diff --git a/ld/testsuite/ld-x86-64/ilp32-2.d b/ld/testsuite/ld-x86-64/ilp32-2.d
index 405d509..19fc671 100644
--- a/ld/testsuite/ld-x86-64/ilp32-2.d
+++ b/ld/testsuite/ld-x86-64/ilp32-2.d
@@ -1,4 +1,4 @@
 #source: dummy.s
-#as: --n32
-#ld: -m elf32_x86_64 tmpdir/startn32.o tmpdir/foo32.o
+#as: --x32
+#ld: -m elf32_x86_64 tmpdir/startx32.o tmpdir/foo32.o
 #error: .*i386 architecture of input file `tmpdir/foo32.o' is incompatible with i386:x64-32 output
diff --git a/ld/testsuite/ld-x86-64/ilp32-3.d b/ld/testsuite/ld-x86-64/ilp32-3.d
index d611181..fdd9065 100644
--- a/ld/testsuite/ld-x86-64/ilp32-3.d
+++ b/ld/testsuite/ld-x86-64/ilp32-3.d
@@ -1,4 +1,4 @@
 #source: dummy.s
-#as: --n32
-#ld: -m elf32_x86_64 tmpdir/startn32.o tmpdir/foo64.o
+#as: --x32
+#ld: -m elf32_x86_64 tmpdir/startx32.o tmpdir/foo64.o
 #error: .*i386:x86-64 architecture of input file `tmpdir/foo64.o' is incompatible with i386:x64-32 output
diff --git a/ld/testsuite/ld-x86-64/ilp32-4.d b/ld/testsuite/ld-x86-64/ilp32-4.d
index 24fe4c5..e7bfe4e 100644
--- a/ld/testsuite/ld-x86-64/ilp32-4.d
+++ b/ld/testsuite/ld-x86-64/ilp32-4.d
@@ -1,5 +1,5 @@
 #source: start.s
-#as: --n32
+#as: --x32
 #ld: -m elf32_x86_64 -shared
 #readelf: -d -S --wide
 
diff --git a/ld/testsuite/ld-x86-64/ilp32-5.d b/ld/testsuite/ld-x86-64/ilp32-5.d
index 8f5025e..e4673e5 100644
--- a/ld/testsuite/ld-x86-64/ilp32-5.d
+++ b/ld/testsuite/ld-x86-64/ilp32-5.d
@@ -1,4 +1,4 @@
-#as: --n32
+#as: --x32
 #ld: -m elf32_x86_64 -shared
 #readelf: -r --wide
 
diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp
index e69ade6..a82a56f 100644
--- a/ld/testsuite/ld-x86-64/x86-64.exp
+++ b/ld/testsuite/ld-x86-64/x86-64.exp
@@ -141,7 +141,7 @@ if { ![istarget "x86_64-*-linux*"] } {
     return
 }
 
-if ![ld_assemble $as "--n32 $srcdir/$subdir/start.s" tmpdir/startn32.o] { 
+if ![ld_assemble $as "--x32 $srcdir/$subdir/start.s" tmpdir/startx32.o] { 
     unresolved "Build ILP32 start.o"
     return
 }
@@ -156,7 +156,7 @@ if ![ld_assemble $as "--64 $srcdir/$subdir/start.s" tmpdir/start64.o] {
     return
 }
 
-if ![ld_assemble $as "--n32 $srcdir/$subdir/foo.s" tmpdir/foon32.o] { 
+if ![ld_assemble $as "--x32 $srcdir/$subdir/foo.s" tmpdir/foox32.o] { 
     unresolved "Build ILP32 foo.o"
     return
 }