diff options
| -rw-r--r-- | gas/config/tc-i386.c | 10 | ||||
| -rw-r--r-- | gas/testsuite/gas/i386/x86-64-gottpoff.d | 4 | ||||
| -rw-r--r-- | gas/testsuite/gas/i386/x86-64-gottpoff.s | 10 | ||||
| -rw-r--r-- | gold/testsuite/x86_64_ie_to_le.s | 1 | ||||
| -rwxr-xr-x | gold/testsuite/x86_64_ie_to_le.sh | 1 | ||||
| -rw-r--r-- | ld/testsuite/ld-x86-64/tlsbindesc.dd | 12 | ||||
| -rw-r--r-- | ld/testsuite/ld-x86-64/tlsbindesc.rd | 36 | ||||
| -rw-r--r-- | ld/testsuite/ld-x86-64/tlsbindesc.s | 4 |
8 files changed, 58 insertions, 20 deletions
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c index 2e19431..3b4d9ca 100644 --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -7545,8 +7545,14 @@ md_assemble (char *line) && i.base_reg && i.base_reg->reg_num == RegIP && i.tm.operand_types[0].bitfield.class == Reg - && i.tm.operand_types[2].bitfield.class == Reg) - /* Allow APX: add %reg1, foo@gottpoff(%rip), %reg2. */ + && (i.tm.operand_types[2].bitfield.class == Reg + || i.tm.operands == 2)) + /* Allow APX: + add %reg1, foo@gottpoff(%rip), %reg2 + add foo@gottpoff(%rip), %reg, %reg2 + {nf} add foo@gottpoff(%rip), %reg + {nf} add %reg1, foo@gottpoff(%rip), %reg2 + {nf} add foo@gottpoff(%rip), %reg, %reg2. */ break; /* Fall through. */ case BFD_RELOC_386_TLS_GOTIE: diff --git a/gas/testsuite/gas/i386/x86-64-gottpoff.d b/gas/testsuite/gas/i386/x86-64-gottpoff.d index 5d0dd58..8f1c10f 100644 --- a/gas/testsuite/gas/i386/x86-64-gottpoff.d +++ b/gas/testsuite/gas/i386/x86-64-gottpoff.d @@ -24,4 +24,8 @@ Disassembly of section .text: +[a-f0-9]+: 62 f4 9c 18 03 05 00 00 00 00 add 0x0\(%rip\),%rax,%r12 # 78 <_start\+0x78> 74: R_X86_64_CODE_6_GOTTPOFF foo-0x4 +[a-f0-9]+: 62 74 fc 14 01 05 00 00 00 00 \{nf\} add %r8,0x0\(%rip\),%r16 # 82 <_start\+0x82> 7e: R_X86_64_CODE_6_GOTTPOFF foo-0x4 +[a-f0-9]+: 62 f4 9c 1c 03 05 00 00 00 00 \{nf\} add 0x0\(%rip\),%rax,%r12 # 8c <_start\+0x8c> 88: R_X86_64_CODE_6_GOTTPOFF foo-0x4 + +[a-f0-9]+: 62 f4 fc 0c 03 05 00 00 00 00 \{nf\} add 0x0\(%rip\),%rax # 96 <_start\+0x96> 92: R_X86_64_CODE_6_GOTTPOFF foo-0x4 + +[a-f0-9]+: 62 e4 fc 0c 03 05 00 00 00 00 \{nf\} add 0x0\(%rip\),%r16 # a0 <_start\+0xa0> 9c: R_X86_64_CODE_6_GOTTPOFF foo-0x4 + +[a-f0-9]+: 62 f4 fc 0c 03 05 00 00 00 00 \{nf\} add 0x0\(%rip\),%rax # aa <_start\+0xaa> a6: R_X86_64_CODE_6_GOTTPOFF foo-0x4 + +[a-f0-9]+: 62 e4 fc 0c 03 05 00 00 00 00 \{nf\} add 0x0\(%rip\),%r16 # b4 <_start\+0xb4> b0: R_X86_64_CODE_6_GOTTPOFF foo-0x4 #pass diff --git a/gas/testsuite/gas/i386/x86-64-gottpoff.s b/gas/testsuite/gas/i386/x86-64-gottpoff.s index d1f5501..48d8a59 100644 --- a/gas/testsuite/gas/i386/x86-64-gottpoff.s +++ b/gas/testsuite/gas/i386/x86-64-gottpoff.s @@ -27,3 +27,13 @@ _start: add r12, rax, QWORD PTR [rip + foo@GOTTPOFF] {nf} add r16, QWORD PTR [rip + foo@GOTTPOFF], r8 {nf} add r12, rax, QWORD PTR [rip + foo@GOTTPOFF] + + .att_syntax prefix + + {nf} addq foo@GOTTPOFF(%rip), %rax + {nf} addq foo@GOTTPOFF(%rip), %r16 + + .intel_syntax noprefix + + {nf} add rax, QWORD PTR [rip + foo@GOTTPOFF] + {nf} add r16, QWORD PTR [rip + foo@GOTTPOFF] diff --git a/gold/testsuite/x86_64_ie_to_le.s b/gold/testsuite/x86_64_ie_to_le.s index 56f3dfc..4bf3f4ab 100644 --- a/gold/testsuite/x86_64_ie_to_le.s +++ b/gold/testsuite/x86_64_ie_to_le.s @@ -9,6 +9,7 @@ _start: movq foo@gottpoff(%rip), %r20 addq %r30, foo@gottpoff(%rip), %r8 addq foo@gottpoff(%rip), %rax, %r20 + {nf} addq foo@gottpoff(%rip), %r16 {nf} addq %r30, foo@gottpoff(%rip), %r8 {nf} addq foo@gottpoff(%rip), %rax, %r20 .size _start, .-_start diff --git a/gold/testsuite/x86_64_ie_to_le.sh b/gold/testsuite/x86_64_ie_to_le.sh index 2927272..10e8468 100755 --- a/gold/testsuite/x86_64_ie_to_le.sh +++ b/gold/testsuite/x86_64_ie_to_le.sh @@ -29,5 +29,6 @@ grep -q "add[ \t]\+\$0x[a-f0-9]\+,%r16" x86_64_ie_to_le.stdout grep -q "mov[ \t]\+\$0x[a-f0-9]\+,%r20" x86_64_ie_to_le.stdout grep -q "add[ \t]\+\$0x[a-f0-9]\+,%r30,%r8" x86_64_ie_to_le.stdout grep -q "add[ \t]\+\$0x[a-f0-9]\+,%rax,%r20" x86_64_ie_to_le.stdout +grep -q "\{nf\} add[ \t]\+\$0x[a-f0-9]\+,%r16" x86_64_ie_to_le.stdout grep -q "\{nf\} add[ \t]\+\$0x[a-f0-9]\+,%r30,%r8" x86_64_ie_to_le.stdout grep -q "\{nf\} add[ \t]\+\$0x[a-f0-9]\+,%rax,%r20" x86_64_ie_to_le.stdout diff --git a/ld/testsuite/ld-x86-64/tlsbindesc.dd b/ld/testsuite/ld-x86-64/tlsbindesc.dd index 7aa1b92..601dfc2 100644 --- a/ld/testsuite/ld-x86-64/tlsbindesc.dd +++ b/ld/testsuite/ld-x86-64/tlsbindesc.dd @@ -175,6 +175,9 @@ Disassembly of section .text: +[0-9a-f]+: 62 f4 fc 10 03 ([0-9a-f]{2} ){2}[ ]+add 0x[0-9a-f]+\(%rip\),%rax,%r16 +# [0-9a-f]+ <sG2> # -> R_X86_64_TPOFF64 sG2 +[0-9a-f]+: ([0-9a-f]{2} ){3} * + +[0-9a-f]+: 62 e4 fc 0c 03 ([0-9a-f]{2} ){2}[ ]+\{nf\} add 0x[0-9a-f]+\(%rip\),%r16 +# [0-9a-f]+ <sG2> +# -> R_X86_64_TPOFF64 sG2 + +[0-9a-f]+: ([0-9a-f]{2} ){3} * +[0-9a-f]+: 62 f4 fc 14 01 ([0-9a-f]{2} ){2}[ ]+\{nf\} add %rax,0x[0-9a-f]+\(%rip\),%r16 +# [0-9a-f]+ <sG2> # -> R_X86_64_TPOFF64 sG2 +[0-9a-f]+: ([0-9a-f]{2} ){3} * @@ -191,6 +194,9 @@ Disassembly of section .text: +[0-9a-f]+: 62 d4 f4 10 81 ([0-9a-f]{2} ){2}[ ]+add \$0x[0-9a-f]+,%r8,%r17 # sg1 +[0-9a-f]+: ff ff ff * + +[0-9a-f]+: 62 fc fc 0c 81 ([0-9a-f]{2} ){2}[ ]+\{nf\} add \$0x[0-9a-f]+,%r17 +# sg1 + +[0-9a-f]+: ff ff ff * +[0-9a-f]+: 62 d4 f4 14 81 ([0-9a-f]{2} ){2}[ ]+\{nf\} add \$0x[0-9a-f]+,%r8,%r17 # sg1 +[0-9a-f]+: ff ff ff * @@ -207,6 +213,9 @@ Disassembly of section .text: +[0-9a-f]+: 62 d4 fc 18 81 ([0-9a-f]{2} ){2}[ ]+add \$0x[0-9a-f]+,%r8,%rax # sl1 +[0-9a-f]+: ff ff ff * + +[0-9a-f]+: 62 fc fc 0c 81 ([0-9a-f]{2} ){2}[ ]+\{nf\} add \$0x[0-9a-f]+,%r18 +# sl1 + +[0-9a-f]+: ff ff ff * +[0-9a-f]+: 62 d4 fc 1c 81 ([0-9a-f]{2} ){2}[ ]+\{nf\} add \$0x[0-9a-f]+,%r8,%rax # sl1 +[0-9a-f]+: ff ff ff * @@ -223,6 +232,9 @@ Disassembly of section .text: +[0-9a-f]+: 62 fc bc 18 81 ([0-9a-f]{2} ){2}[ ]+add \$0x[0-9a-f]+,%r19,%r8 # sh1 +[0-9a-f]+: ff ff ff * + +[0-9a-f]+: 62 fc fc 0c 81 ([0-9a-f]{2} ){2}[ ]+\{nf\} add \$0x[0-9a-f]+,%r19 +# sh1 + +[0-9a-f]+: ff ff ff * +[0-9a-f]+: 62 fc bc 1c 81 ([0-9a-f]{2} ){2}[ ]+\{nf\} add \$0x[0-9a-f]+,%r19,%r8 # sh1 +[0-9a-f]+: ff ff ff * diff --git a/ld/testsuite/ld-x86-64/tlsbindesc.rd b/ld/testsuite/ld-x86-64/tlsbindesc.rd index 1e0348e..2fc965a 100644 --- a/ld/testsuite/ld-x86-64/tlsbindesc.rd +++ b/ld/testsuite/ld-x86-64/tlsbindesc.rd @@ -15,12 +15,12 @@ Section Headers: +\[[ 0-9]+\] .dynsym +.* +\[[ 0-9]+\] .dynstr +.* +\[[ 0-9]+\] .rela.dyn +.* - +\[[ 0-9]+\] .text +PROGBITS +0+401000 0+1000 0+2fd 00 +AX +0 +0 +4096 - +\[[ 0-9]+\] .tdata +PROGBITS +0+6012fd 0+12fd 0+60 00 WAT +0 +0 +1 - +\[[ 0-9]+\] .tbss +NOBITS +0+60135d 0+135d 0+40 00 WAT +0 +0 +1 - +\[[ 0-9]+\] .dynamic +DYNAMIC +0+601360 0+1360 0+100 10 +WA +4 +0 +8 - +\[[ 0-9]+\] .got +PROGBITS +0+601460 0+1460 0+20 08 +WA +0 +0 +8 - +\[[ 0-9]+\] .got.plt +PROGBITS +0+601480 0+1480 0+18 08 +WA +0 +0 +8 + +\[[ 0-9]+\] .text +PROGBITS +0+401000 0+1000 0+325 00 +AX +0 +0 +4096 + +\[[ 0-9]+\] .tdata +PROGBITS +0+601325 0+1325 0+60 00 WAT +0 +0 +1 + +\[[ 0-9]+\] .tbss +NOBITS +0+601385 0+1385 0+40 00 WAT +0 +0 +1 + +\[[ 0-9]+\] .dynamic +DYNAMIC +0+601388 0+1388 0+100 10 +WA +4 +0 +8 + +\[[ 0-9]+\] .got +PROGBITS +0+601488 0+1488 0+20 08 +WA +0 +0 +8 + +\[[ 0-9]+\] .got.plt +PROGBITS +0+6014a8 0+14a8 0+18 08 +WA +0 +0 +8 +\[[ 0-9]+\] .symtab +.* +\[[ 0-9]+\] .strtab +.* +\[[ 0-9]+\] .shstrtab +.* @@ -28,7 +28,7 @@ Key to Flags: #... Elf file type is EXEC \(Executable file\) -Entry point 0x401205 +Entry point 0x40122d There are [0-9]+ program headers, starting at offset [0-9]+ Program Headers: @@ -36,10 +36,10 @@ Program Headers: +PHDR.* +INTERP.* .*Requesting program interpreter.* - +LOAD +0x0+ 0x0+400000 0x0+400000 0x0+12fd 0x0+12fd R E 0x200000 - +LOAD +0x0+12fd 0x0+6012fd 0x0+6012fd 0x0+19b 0x0+19b RW +0x200000 - +DYNAMIC +0x0+1360 0x0+601360 0x0+601360 0x0+100 0x0+100 RW +0x8 - +TLS +0x0+12fd 0x0+6012fd 0x0+6012fd 0x0+60 0x0+a0 R +0x1 + +LOAD +0x0+ 0x0+400000 0x0+400000 0x0+1325 0x0+1325 R E 0x200000 + +LOAD +0x0+1325 0x0+601325 0x0+601325 0x0+19b 0x0+19b RW +0x200000 + +DYNAMIC +0x0+1388 0x0+601388 0x0+601388 0x0+100 0x0+100 RW +0x8 + +TLS +0x0+1325 0x0+601325 0x0+601325 0x0+60 0x0+a0 R +0x1 Section to Segment mapping: +Segment Sections... @@ -52,10 +52,10 @@ Program Headers: Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries: +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend -0+601460 +0+100000012 R_X86_64_TPOFF64 +0+ sG5 \+ 0 -0+601468 +0+200000012 R_X86_64_TPOFF64 +0+ sG2 \+ 0 -0+601470 +0+300000012 R_X86_64_TPOFF64 +0+ sG6 \+ 0 -0+601478 +0+400000012 R_X86_64_TPOFF64 +0+ sG1 \+ 0 +0+601488 +0+100000012 R_X86_64_TPOFF64 +0+ sG5 \+ 0 +0+601490 +0+200000012 R_X86_64_TPOFF64 +0+ sG2 \+ 0 +0+601498 +0+300000012 R_X86_64_TPOFF64 +0+ sG6 \+ 0 +0+6014a0 +0+400000012 R_X86_64_TPOFF64 +0+ sG1 \+ 0 Symbol table '\.dynsym' contains [0-9]+ entries: +Num: +Value +Size +Type +Bind +Vis +Ndx +Name @@ -88,8 +88,8 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: 0+9c +0 +TLS +LOCAL +DEFAULT +8 bl8 .* FILE +LOCAL +DEFAULT +ABS +[0-9]+: 0+a0 +0 +TLS +LOCAL +DEFAULT +7 _TLS_MODULE_BASE_ - +[0-9]+: 0+601360 +0 +OBJECT +LOCAL +DEFAULT +9 _DYNAMIC - +[0-9]+: 0+601480 +0 +OBJECT +LOCAL +DEFAULT +11 _GLOBAL_OFFSET_TABLE_ + +[0-9]+: 0+601388 +0 +OBJECT +LOCAL +DEFAULT +9 _DYNAMIC + +[0-9]+: 0+6014a8 +0 +OBJECT +LOCAL +DEFAULT +11 _GLOBAL_OFFSET_TABLE_ +[0-9]+: 0+1c +0 +TLS +GLOBAL +DEFAULT +7 sg8 +[0-9]+: 0+7c +0 +TLS +GLOBAL +DEFAULT +8 bg8 +[0-9]+: 0+74 +0 +TLS +GLOBAL +DEFAULT +8 bg6 @@ -104,7 +104,7 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: 0+58 +0 +TLS +GLOBAL +HIDDEN +7 sh7 +[0-9]+: 0+5c +0 +TLS +GLOBAL +HIDDEN +7 sh8 +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +7 sg1 - +[0-9]+: 0+401205 +0 +FUNC +GLOBAL +DEFAULT +6 _start + +[0-9]+: 0+40122d +0 +FUNC +GLOBAL +DEFAULT +6 _start +[0-9]+: 0+4c +0 +TLS +GLOBAL +HIDDEN +7 sh4 +[0-9]+: 0+78 +0 +TLS +GLOBAL +DEFAULT +8 bg7 +[0-9]+: 0+50 +0 +TLS +GLOBAL +HIDDEN +7 sh5 diff --git a/ld/testsuite/ld-x86-64/tlsbindesc.s b/ld/testsuite/ld-x86-64/tlsbindesc.s index 8aad102..39ba3bb 100644 --- a/ld/testsuite/ld-x86-64/tlsbindesc.s +++ b/ld/testsuite/ld-x86-64/tlsbindesc.s @@ -131,6 +131,7 @@ fn2: addq sG2@gottpoff(%rip), %r16 addq %rax, sG2@gottpoff(%rip), %r16 addq sG2@gottpoff(%rip), %rax, %r16 + {nf} addq sG2@gottpoff(%rip), %r16 {nf} addq %rax, sG2@gottpoff(%rip), %r16 {nf} addq sG2@gottpoff(%rip), %rax, %r16 @@ -138,6 +139,7 @@ fn2: addq sg1@gottpoff(%rip), %r17 addq %r8, sg1@gottpoff(%rip), %r17 addq sg1@gottpoff(%rip), %r8, %r17 + {nf} addq sg1@gottpoff(%rip), %r17 {nf} addq %r8, sg1@gottpoff(%rip), %r17 {nf} addq sg1@gottpoff(%rip), %r8, %r17 @@ -145,6 +147,7 @@ fn2: addq sl1@gottpoff(%rip), %r18 addq %r8, sl1@gottpoff(%rip), %rax addq sl1@gottpoff(%rip), %r8, %rax + {nf} addq sl1@gottpoff(%rip), %r18 {nf} addq %r8, sl1@gottpoff(%rip), %rax {nf} addq sl1@gottpoff(%rip), %r8, %rax @@ -152,6 +155,7 @@ fn2: addq sh1@gottpoff(%rip), %r19 addq %r19, sh1@gottpoff(%rip), %r8 addq sh1@gottpoff(%rip), %r19, %r8 + {nf} addq sh1@gottpoff(%rip), %r19 {nf} addq %r19, sh1@gottpoff(%rip), %r8 {nf} addq sh1@gottpoff(%rip), %r19, %r8 |