From 3e301ce0b54002d92808f6bba08b8f793a5cdfa5 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Mon, 3 May 2021 13:27:47 +0200 Subject: [PATCH] x86: use UNIX EOL in secrel testcase For some reason these were using Windows EOL. --- gas/ChangeLog | 5 + gas/testsuite/gas/i386/secrel.d | 88 ++++++++--------- gas/testsuite/gas/i386/secrel.s | 162 ++++++++++++++++---------------- 3 files changed, 130 insertions(+), 125 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 2743889493f..9442a3ea49f 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2021-05-03 Jan Beulich + + * testsuite/gas/i386/secrel.d, testsuite/gas/i386/secrel.s: + Convert Windows to UNIX EOL. + 2021-05-03 Jan Beulich * config/tc-i386.c (lex_got): Adjust surrounding #if. Fold TE_PE diff --git a/gas/testsuite/gas/i386/secrel.d b/gas/testsuite/gas/i386/secrel.d index ac23301f7ea..17530866546 100644 --- a/gas/testsuite/gas/i386/secrel.d +++ b/gas/testsuite/gas/i386/secrel.d @@ -1,44 +1,44 @@ -#objdump: -rs -#name: i386 secrel reloc - -.*: +file format pe-i386 - -RELOCATION RECORDS FOR \[\.data\]: -OFFSET[ ]+TYPE[ ]+VALUE -0+24 secrel32 \.text -0+29 secrel32 \.text -0+2e secrel32 \.text -0+33 secrel32 \.text -0+44 secrel32 \.data -0+49 secrel32 \.data -0+4e secrel32 \.data -0+53 secrel32 \.data -0+64 secrel32 \.rdata -0+69 secrel32 \.rdata -0+6e secrel32 \.rdata -0+73 secrel32 \.rdata -0+84 secrel32 ext24 -0+89 secrel32 ext2d -0+8e secrel32 ext36 -0+93 secrel32 ext3f -0+a2 secrel32 bar - -Contents of section \.text: - 0000 3e3e3e3e 3c3c3c3c 3e3e3e3e 3e3c3c3c >>>><<<<>>>>><<< - 0010 3e3e3e3e 3e3e3c3c 3e3e3e3e 3e3e3e3c >>>>>><<>>>>>>>< -Contents of section \.data: - 0000 3e3e3e3e 3c3c3c3c 3e3e3e3e 3e3c3c3c >>>><<<<>>>>><<< - 0010 3e3e3e3e 3e3e3c3c 3e3e3e3e 3e3e3e3c >>>>>><<>>>>>>>< - 0020 3e3e3e3e 04000000 110d0000 00111600 >>>>............ - 0030 0000111f 00000011 3c3c3c3c 3c3c3c3c ........<<<<<<<< - 0040 3e3e3e3e 04000000 110d0000 00111600 >>>>............ - 0050 0000111f 00000011 3c3c3c3c 3c3c3c3c ........<<<<<<<< - 0060 3e3e3e3e 04000000 110d0000 00111600 >>>>............ - 0070 0000111f 00000011 3c3c3c3c 3c3c3c3c ........<<<<<<<< - 0080 3e3e3e3e 00000000 11000000 00110000 >>>>............ - 0090 00001100 00000011 3c3c3c3c 3c3c3c3c ........<<<<<<<< - 00a0 8d902c00 00000000 ..,..... -Contents of section \.rdata: - 0000 3e3e3e3e 3c3c3c3c 3e3e3e3e 3e3c3c3c >>>><<<<>>>>><<< - 0010 3e3e3e3e 3e3e3c3c 3e3e3e3e 3e3e3e3c >>>>>><<>>>>>>>< - 0020 3e3e3e3e 00000000 00000000 00000000 >>>>............ +#objdump: -rs +#name: i386 secrel reloc + +.*: +file format pe-i386 + +RELOCATION RECORDS FOR \[\.data\]: +OFFSET[ ]+TYPE[ ]+VALUE * +0+24 secrel32 \.text +0+29 secrel32 \.text +0+2e secrel32 \.text +0+33 secrel32 \.text +0+44 secrel32 \.data +0+49 secrel32 \.data +0+4e secrel32 \.data +0+53 secrel32 \.data +0+64 secrel32 \.rdata +0+69 secrel32 \.rdata +0+6e secrel32 \.rdata +0+73 secrel32 \.rdata +0+84 secrel32 ext24 +0+89 secrel32 ext2d +0+8e secrel32 ext36 +0+93 secrel32 ext3f +0+a2 secrel32 bar + +Contents of section \.text: + 0000 3e3e3e3e 3c3c3c3c 3e3e3e3e 3e3c3c3c >>>><<<<>>>>><<< + 0010 3e3e3e3e 3e3e3c3c 3e3e3e3e 3e3e3e3c >>>>>><<>>>>>>>< +Contents of section \.data: + 0000 3e3e3e3e 3c3c3c3c 3e3e3e3e 3e3c3c3c >>>><<<<>>>>><<< + 0010 3e3e3e3e 3e3e3c3c 3e3e3e3e 3e3e3e3c >>>>>><<>>>>>>>< + 0020 3e3e3e3e 04000000 110d0000 00111600 >>>>............ + 0030 0000111f 00000011 3c3c3c3c 3c3c3c3c ........<<<<<<<< + 0040 3e3e3e3e 04000000 110d0000 00111600 >>>>............ + 0050 0000111f 00000011 3c3c3c3c 3c3c3c3c ........<<<<<<<< + 0060 3e3e3e3e 04000000 110d0000 00111600 >>>>............ + 0070 0000111f 00000011 3c3c3c3c 3c3c3c3c ........<<<<<<<< + 0080 3e3e3e3e 00000000 11000000 00110000 >>>>............ + 0090 00001100 00000011 3c3c3c3c 3c3c3c3c ........<<<<<<<< + 00a0 8d902c00 00000000 ..,..... * +Contents of section \.rdata: + 0000 3e3e3e3e 3c3c3c3c 3e3e3e3e 3e3c3c3c >>>><<<<>>>>><<< + 0010 3e3e3e3e 3e3e3c3c 3e3e3e3e 3e3e3e3c >>>>>><<>>>>>>>< + 0020 3e3e3e3e 00000000 00000000 00000000 >>>>............ diff --git a/gas/testsuite/gas/i386/secrel.s b/gas/testsuite/gas/i386/secrel.s index 2fc5a257f63..e7de6780581 100644 --- a/gas/testsuite/gas/i386/secrel.s +++ b/gas/testsuite/gas/i386/secrel.s @@ -1,81 +1,81 @@ -.text - - .ascii ">>>>" -pre04: .ascii "<<<<" - .ascii ">>>>>" -pre0d: .ascii "<<<" - .ascii ">>>>>>" -pre16: .ascii "<<" - .ascii ">>>>>>>" -pre1f: .ascii "<" - -.data - - .ascii ">>>>" -sam04: .ascii "<<<<" - .ascii ">>>>>" -sam0d: .ascii "<<<" - .ascii ">>>>>>" -sam16: .ascii "<<" - .ascii ">>>>>>>" -sam1f: .ascii "<" - - .ascii ">>>>" - .secrel32 pre04 - .byte 0x11 - .secrel32 pre0d - .byte 0x11 - .secrel32 pre16 - .byte 0x11 - .secrel32 pre1f - .byte 0x11 - .ascii "<<<<<<<<" - - .ascii ">>>>" - .secrel32 sam04 - .byte 0x11 - .secrel32 sam0d - .byte 0x11 - .secrel32 sam16 - .byte 0x11 - .secrel32 sam1f - .byte 0x11 - .ascii "<<<<<<<<" - - .ascii ">>>>" - .secrel32 nex04 - .byte 0x11 - .secrel32 nex0d - .byte 0x11 - .secrel32 nex16 - .byte 0x11 - .secrel32 nex1f - .byte 0x11 - .ascii "<<<<<<<<" - - .ascii ">>>>" - .secrel32 ext24 - .byte 0x11 - .secrel32 ext2d - .byte 0x11 - .secrel32 ext36 - .byte 0x11 - .secrel32 ext3f - .byte 0x11 - .ascii "<<<<<<<<" - - leal bar@SECREL32+44(%eax), %edx - -.section .rdata - - .ascii ">>>>" -nex04: .ascii "<<<<" - .ascii ">>>>>" -nex0d: .ascii "<<<" - .ascii ">>>>>>" -nex16: .ascii "<<" - .ascii ">>>>>>>" -nex1f: .ascii "<" - .ascii ">>>>" - - .p2align 4,0 +.text + + .ascii ">>>>" +pre04: .ascii "<<<<" + .ascii ">>>>>" +pre0d: .ascii "<<<" + .ascii ">>>>>>" +pre16: .ascii "<<" + .ascii ">>>>>>>" +pre1f: .ascii "<" + +.data + + .ascii ">>>>" +sam04: .ascii "<<<<" + .ascii ">>>>>" +sam0d: .ascii "<<<" + .ascii ">>>>>>" +sam16: .ascii "<<" + .ascii ">>>>>>>" +sam1f: .ascii "<" + + .ascii ">>>>" + .secrel32 pre04 + .byte 0x11 + .secrel32 pre0d + .byte 0x11 + .secrel32 pre16 + .byte 0x11 + .secrel32 pre1f + .byte 0x11 + .ascii "<<<<<<<<" + + .ascii ">>>>" + .secrel32 sam04 + .byte 0x11 + .secrel32 sam0d + .byte 0x11 + .secrel32 sam16 + .byte 0x11 + .secrel32 sam1f + .byte 0x11 + .ascii "<<<<<<<<" + + .ascii ">>>>" + .secrel32 nex04 + .byte 0x11 + .secrel32 nex0d + .byte 0x11 + .secrel32 nex16 + .byte 0x11 + .secrel32 nex1f + .byte 0x11 + .ascii "<<<<<<<<" + + .ascii ">>>>" + .secrel32 ext24 + .byte 0x11 + .secrel32 ext2d + .byte 0x11 + .secrel32 ext36 + .byte 0x11 + .secrel32 ext3f + .byte 0x11 + .ascii "<<<<<<<<" + + leal bar@SECREL32+44(%eax), %edx + +.section .rdata + + .ascii ">>>>" +nex04: .ascii "<<<<" + .ascii ">>>>>" +nex0d: .ascii "<<<" + .ascii ">>>>>>" +nex16: .ascii "<<" + .ascii ">>>>>>>" +nex1f: .ascii "<" + .ascii ">>>>" + + .p2align 4,0 -- 2.30.2