mirrors/binutils-gdb
0
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-11-28 04:25:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename --n32 to --x32.

Browse Source 
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.
This commit is contained in:
H.J. Lu 2011-01-14 23:07:11 +00:00
parent feeb563187
commit 570561f71a
15 changed files with 48 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gas/ChangeLog
View File

@ -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> 2011-01-11 Mingjie Xing <mingjie.xing@gmail.com>
* config/tc-mips.c (mips_ip): Update error messages. Take an * config/tc-mips.c (mips_ip): Update error messages. Take an

8
gas/config/tc-i386.c
View File

@ -8152,7 +8152,7 @@ const char *md_shortopts = "qn";
#define OPTION_MSSE2AVX (OPTION_MD_BASE + 10) #define OPTION_MSSE2AVX (OPTION_MD_BASE + 10)
#define OPTION_MSSE_CHECK (OPTION_MD_BASE + 11) #define OPTION_MSSE_CHECK (OPTION_MD_BASE + 11)
#define OPTION_MAVXSCALAR (OPTION_MD_BASE + 12) #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[] = struct option md_longopts[] =
{ {
@ -8162,7 +8162,7 @@ struct option md_longopts[] =
{"64", no_argument, NULL, OPTION_64}, {"64", no_argument, NULL, OPTION_64},
#endif #endif
#if defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF) #if defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF)
{"n32", no_argument, NULL, OPTION_N32}, {"x32", no_argument, NULL, OPTION_X32},
#endif #endif
{"divide", no_argument, NULL, OPTION_DIVIDE}, {"divide", no_argument, NULL, OPTION_DIVIDE},
{"march", required_argument, NULL, OPTION_MARCH}, {"march", required_argument, NULL, OPTION_MARCH},
@ -8239,7 +8239,7 @@ md_parse_option (int c, char *arg)
#endif #endif
#if defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF) #if defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF)
case OPTION_N32: case OPTION_X32:
if (IS_ELF) if (IS_ELF)
{ {
const char **list, **l; const char **list, **l;
@ -8523,7 +8523,7 @@ md_show_usage (FILE *stream)
#if (defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF) \ #if (defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF) \
|| defined (TE_PE) || defined (TE_PEP)) || defined (TE_PE) || defined (TE_PEP))
fprintf (stream, _("\ fprintf (stream, _("\
--32/--64/--n32 generate 32bit/64bit/n32bit code\n")); --32/--64/--x32 generate 32bit/64bit/x32 code\n"));
#endif #endif
#ifdef SVR4_COMMENT_CHARS #ifdef SVR4_COMMENT_CHARS
fprintf (stream, _("\ fprintf (stream, _("\

8
gas/doc/c-i386.texi
View File

@ -57,13 +57,13 @@ dependent options:
@table @gcctabopt @table @gcctabopt
@cindex @samp{--32} option, i386 @cindex @samp{--32} option, i386
@cindex @samp{--32} option, x86-64 @cindex @samp{--32} option, x86-64
@cindex @samp{--n32} option, i386 @cindex @samp{--x32} option, i386
@cindex @samp{--n32} option, x86-64 @cindex @samp{--x32} option, x86-64
@cindex @samp{--64} option, i386 @cindex @samp{--64} option, i386
@cindex @samp{--64} option, x86-64 @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} 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 imply AMD x86-64 architecture with 32-bit or 64-bit word-size
respectively. respectively.

7
gas/testsuite/ChangeLog
View File

@ -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> 2011-01-11 Mingjie Xing <mingjie.xing@gmail.com>
* mips/loongson-3a-2.s, mips/loongson-3a-2.d: Use the real offset * mips/loongson-3a-2.s, mips/loongson-3a-2.d: Use the real offset

2
gas/testsuite/gas/i386/ilp32/cfi/ilp32.exp
View File

@ -13,7 +13,7 @@ if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check] &&
global ASFLAGS global ASFLAGS
set old_ASFLAGS "$ASFLAGS" set old_ASFLAGS "$ASFLAGS"
set ASFLAGS "$ASFLAGS --n32" set ASFLAGS "$ASFLAGS --x32"
foreach test [lsort [glob -nocomplain $srcdir/$subdir/*.d]] { foreach test [lsort [glob -nocomplain $srcdir/$subdir/*.d]] {
if { [runtest_file_p $runtests $test] } { if { [runtest_file_p $runtests $test] } {

2
gas/testsuite/gas/i386/ilp32/elf/ilp32.exp
View File

@ -13,7 +13,7 @@ if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check] &&
global ASFLAGS global ASFLAGS
set old_ASFLAGS "$ASFLAGS" set old_ASFLAGS "$ASFLAGS"
set ASFLAGS "$ASFLAGS --n32" set ASFLAGS "$ASFLAGS --x32"
foreach test [lsort [glob -nocomplain $srcdir/$subdir/*.d]] { foreach test [lsort [glob -nocomplain $srcdir/$subdir/*.d]] {
if { [runtest_file_p $runtests $test] } { if { [runtest_file_p $runtests $test] } {

2
gas/testsuite/gas/i386/ilp32/ilp32.exp
View File

@ -13,7 +13,7 @@ if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check] &&
global ASFLAGS global ASFLAGS
set old_ASFLAGS "$ASFLAGS" set old_ASFLAGS "$ASFLAGS"
set ASFLAGS "$ASFLAGS --n32" set ASFLAGS "$ASFLAGS --x32"
foreach test [lsort [glob -nocomplain $srcdir/$subdir/*.d]] { foreach test [lsort [glob -nocomplain $srcdir/$subdir/*.d]] {
if { [runtest_file_p $runtests $test] } { if { [runtest_file_p $runtests $test] } {

2
gas/testsuite/gas/i386/ilp32/lns/ilp32.exp
View File

@ -13,7 +13,7 @@ if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check] &&
global ASFLAGS global ASFLAGS
set old_ASFLAGS "$ASFLAGS" set old_ASFLAGS "$ASFLAGS"
set ASFLAGS "$ASFLAGS --n32" set ASFLAGS "$ASFLAGS --x32"
foreach test [lsort [glob -nocomplain $srcdir/$subdir/*.d]] { foreach test [lsort [glob -nocomplain $srcdir/$subdir/*.d]] {
if { [runtest_file_p $runtests $test] } { if { [runtest_file_p $runtests $test] } {

9
ld/testsuite/ChangeLog
View File

@ -1,3 +1,12 @@
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> 2011-01-14 H.J. Lu <hongjiu.lu@intel.com>
* ld-x86-64/ilp32-5.d: New. * ld-x86-64/ilp32-5.d: New.

4
ld/testsuite/ld-x86-64/ilp32-1.d
View File

@ -1,6 +1,6 @@
#source: dummy.s #source: dummy.s
#as: --n32 #as: --x32
#ld: -m elf32_x86_64 tmpdir/startn32.o tmpdir/foon32.o #ld: -m elf32_x86_64 tmpdir/startx32.o tmpdir/foox32.o
#readelf: -h #readelf: -h
ELF Header: ELF Header:

4
ld/testsuite/ld-x86-64/ilp32-2.d
View File

@ -1,4 +1,4 @@
#source: dummy.s #source: dummy.s
#as: --n32 #as: --x32
#ld: -m elf32_x86_64 tmpdir/startn32.o tmpdir/foo32.o #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 #error: .*i386 architecture of input file `tmpdir/foo32.o' is incompatible with i386:x64-32 output

4
ld/testsuite/ld-x86-64/ilp32-3.d
View File

@ -1,4 +1,4 @@
#source: dummy.s #source: dummy.s
#as: --n32 #as: --x32
#ld: -m elf32_x86_64 tmpdir/startn32.o tmpdir/foo64.o #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 #error: .*i386:x86-64 architecture of input file `tmpdir/foo64.o' is incompatible with i386:x64-32 output

2
ld/testsuite/ld-x86-64/ilp32-4.d
View File

@ -1,5 +1,5 @@
#source: start.s #source: start.s
#as: --n32 #as: --x32
#ld: -m elf32_x86_64 -shared #ld: -m elf32_x86_64 -shared
#readelf: -d -S --wide #readelf: -d -S --wide

2
ld/testsuite/ld-x86-64/ilp32-5.d
View File

@ -1,4 +1,4 @@
#as: --n32 #as: --x32
#ld: -m elf32_x86_64 -shared #ld: -m elf32_x86_64 -shared
#readelf: -r --wide #readelf: -r --wide

4
ld/testsuite/ld-x86-64/x86-64.exp
View File

@ -141,7 +141,7 @@ if { ![istarget "x86_64-*-linux*"] } {
return 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" unresolved "Build ILP32 start.o"
return return
} }
@ -156,7 +156,7 @@ if ![ld_assemble $as "--64 $srcdir/$subdir/start.s" tmpdir/start64.o] {
return 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" unresolved "Build ILP32 foo.o"
return return
} }