From 3def145413e9707c985fa9c1dfda0682be750e55 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 20 Sep 2018 12:28:09 -0700 Subject: [PATCH] ld: Add the entry symbol, _main, for LynxOS targets Add the entry symbol, _main, to fix: FAIL: ld-elf/64ksec FAIL: ld-elf/comm-data4 FAIL: ld-elf/comm-data5 FAIL: ld-elf/eh5 FAIL: ld-elf/empty FAIL: ld-elf/empty2 FAIL: ld-elf/endsym FAIL: ld-elf/exclude3a FAIL: ld-elf/linkonce2 FAIL: ld-elf/orphan3 FAIL: ld-elf/pr12851 FAIL: ld-elf/pr14156a FAIL: ld-elf/pr14156b FAIL: ld-elf/pr14926 FAIL: ld-elf/pr20513a FAIL: ld-elf/pr20513b FAIL: ld-elf/stab FAIL: ld-elf/var1 FAIL: ld-elf/warn3 FAIL: section size overflow for i386-lynxos target. * testsuite/ld-checks/over2.s: Add "_main" for LynxOS targets. * testsuite/ld-elf/comm-data4.s: Likewise. * testsuite/ld-elf/comm-data5.s: Likewise. * testsuite/ld-elf/eh5b.s: Likewise. * testsuite/ld-elf/empty.s: Likewise. * testsuite/ld-elf/empty2.s: Likewise. * testsuite/ld-elf/exclude3.s: Likewise. * testsuite/ld-elf/fini0.s: Likewise. * testsuite/ld-elf/init0.s: Likewise. * testsuite/ld-elf/linkonce1b.s: Likewise. * testsuite/ld-elf/orphan3a.s: Likewise. * testsuite/ld-elf/pr14926.s: Likewise. * testsuite/ld-elf/pr20513a.s: Likewise. * testsuite/ld-elf/sec64k.exp: Likewise. * testsuite/ld-elf/start.s: Likewise. * testsuite/ld-elf/var1.s: Likewise. --- ld/ChangeLog | 19 +++++++++++++++++++ ld/testsuite/ld-checks/over2.s | 2 ++ ld/testsuite/ld-elf/comm-data4.s | 2 ++ ld/testsuite/ld-elf/comm-data5.s | 2 ++ ld/testsuite/ld-elf/eh5b.s | 2 ++ ld/testsuite/ld-elf/empty.s | 3 +++ ld/testsuite/ld-elf/empty2.s | 3 +++ ld/testsuite/ld-elf/exclude3.s | 3 +++ ld/testsuite/ld-elf/fini0.s | 2 ++ ld/testsuite/ld-elf/init0.s | 2 ++ ld/testsuite/ld-elf/linkonce1b.s | 2 ++ ld/testsuite/ld-elf/orphan3a.s | 2 ++ ld/testsuite/ld-elf/pr14926.s | 2 ++ ld/testsuite/ld-elf/pr20513a.s | 3 +++ ld/testsuite/ld-elf/sec64k.exp | 2 ++ ld/testsuite/ld-elf/start.s | 2 ++ ld/testsuite/ld-elf/var1.s | 2 ++ 17 files changed, 55 insertions(+) diff --git a/ld/ChangeLog b/ld/ChangeLog index 1baf2b7..d754500 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,22 @@ +2018-09-20 H.J. Lu + + * testsuite/ld-checks/over2.s: Add "_main" for LynxOS targets. + * testsuite/ld-elf/comm-data4.s: Likewise. + * testsuite/ld-elf/comm-data5.s: Likewise. + * testsuite/ld-elf/eh5b.s: Likewise. + * testsuite/ld-elf/empty.s: Likewise. + * testsuite/ld-elf/empty2.s: Likewise. + * testsuite/ld-elf/exclude3.s: Likewise. + * testsuite/ld-elf/fini0.s: Likewise. + * testsuite/ld-elf/init0.s: Likewise. + * testsuite/ld-elf/linkonce1b.s: Likewise. + * testsuite/ld-elf/orphan3a.s: Likewise. + * testsuite/ld-elf/pr14926.s: Likewise. + * testsuite/ld-elf/pr20513a.s: Likewise. + * testsuite/ld-elf/sec64k.exp: Likewise. + * testsuite/ld-elf/start.s: Likewise. + * testsuite/ld-elf/var1.s: Likewise. + 2018-09-20 Kito Cheng * emulparams/elf32lriscv.sh: Correct the library search path. diff --git a/ld/testsuite/ld-checks/over2.s b/ld/testsuite/ld-checks/over2.s index dc6de0e..41ce67e 100644 --- a/ld/testsuite/ld-checks/over2.s +++ b/ld/testsuite/ld-checks/over2.s @@ -1,4 +1,6 @@ .text .globl _start _start: + .globl _main +_main: .long 0 diff --git a/ld/testsuite/ld-elf/comm-data4.s b/ld/testsuite/ld-elf/comm-data4.s index 60e0f3d..f2b608b 100644 --- a/ld/testsuite/ld-elf/comm-data4.s +++ b/ld/testsuite/ld-elf/comm-data4.s @@ -8,11 +8,13 @@ i .comm 4 .dc.a i .globl main + .globl _main .globl start .globl _start .globl __start .text main: +_main: start: _start: __start: diff --git a/ld/testsuite/ld-elf/comm-data5.s b/ld/testsuite/ld-elf/comm-data5.s index 2da32c7..e74c2eb 100644 --- a/ld/testsuite/ld-elf/comm-data5.s +++ b/ld/testsuite/ld-elf/comm-data5.s @@ -8,11 +8,13 @@ i .comm 4 .dc.a i .globl main + .globl _main .globl start .globl _start .globl __start .text main: +_main: start: _start: __start: diff --git a/ld/testsuite/ld-elf/eh5b.s b/ld/testsuite/ld-elf/eh5b.s index fa27edd..09ebf09 100644 --- a/ld/testsuite/ld-elf/eh5b.s +++ b/ld/testsuite/ld-elf/eh5b.s @@ -25,10 +25,12 @@ .cfi_endproc .globl main + .globl _main .globl start .globl _start .globl __start main: +_main: start: _start: __start: diff --git a/ld/testsuite/ld-elf/empty.s b/ld/testsuite/ld-elf/empty.s index 8c2d0e6..059f208 100644 --- a/ld/testsuite/ld-elf/empty.s +++ b/ld/testsuite/ld-elf/empty.s @@ -13,4 +13,7 @@ __start: .type main,"function" .global main main: + .type _main,"function" + .global _main +_main: .long 0 diff --git a/ld/testsuite/ld-elf/empty2.s b/ld/testsuite/ld-elf/empty2.s index deed318..46ec928 100644 --- a/ld/testsuite/ld-elf/empty2.s +++ b/ld/testsuite/ld-elf/empty2.s @@ -15,4 +15,7 @@ __start: .type main,"function" .global main main: + .type _main,"function" + .global _main +_main: .long constant diff --git a/ld/testsuite/ld-elf/exclude3.s b/ld/testsuite/ld-elf/exclude3.s index 475088f..e32ad47 100644 --- a/ld/testsuite/ld-elf/exclude3.s +++ b/ld/testsuite/ld-elf/exclude3.s @@ -11,6 +11,9 @@ __start: .type main,"function" .global main main: + .type _main,"function" + .global _main +_main: .long 0 .section .foo1,"e", %progbits .byte 0,0,0,0 diff --git a/ld/testsuite/ld-elf/fini0.s b/ld/testsuite/ld-elf/fini0.s index 45e327c..465f10c 100644 --- a/ld/testsuite/ld-elf/fini0.s +++ b/ld/testsuite/ld-elf/fini0.s @@ -7,6 +7,8 @@ _start: __start: .global main /* Used by HPPA targets. */ main: + .globl _main /* Used by LynxOS targets. */ +_main: .dc.a 0 .section .fini, "a" diff --git a/ld/testsuite/ld-elf/init0.s b/ld/testsuite/ld-elf/init0.s index 903f0b0..d7e6e1a 100644 --- a/ld/testsuite/ld-elf/init0.s +++ b/ld/testsuite/ld-elf/init0.s @@ -7,6 +7,8 @@ _start: __start: .global main /* Used by HPPA targets. */ main: + .globl _main /* Used by LynxOS targets. */ +_main: .dc.a 0 .section .init, "a" diff --git a/ld/testsuite/ld-elf/linkonce1b.s b/ld/testsuite/ld-elf/linkonce1b.s index fd45cec..266b484 100644 --- a/ld/testsuite/ld-elf/linkonce1b.s +++ b/ld/testsuite/ld-elf/linkonce1b.s @@ -1,9 +1,11 @@ .globl main + .globl _main .globl start .globl _start .globl __start .text main: +_main: start: _start: __start: diff --git a/ld/testsuite/ld-elf/orphan3a.s b/ld/testsuite/ld-elf/orphan3a.s index bc3023b..3131b1a 100644 --- a/ld/testsuite/ld-elf/orphan3a.s +++ b/ld/testsuite/ld-elf/orphan3a.s @@ -1,9 +1,11 @@ .globl main + .globl _main .globl start .globl _start .globl __start .text main: +_main: start: _start: __start: diff --git a/ld/testsuite/ld-elf/pr14926.s b/ld/testsuite/ld-elf/pr14926.s index 3d132f6..cd650e1 100644 --- a/ld/testsuite/ld-elf/pr14926.s +++ b/ld/testsuite/ld-elf/pr14926.s @@ -1,9 +1,11 @@ .text .globl main + .globl _main .globl start .globl _start .globl __start main: +_main: start: _start: __start: diff --git a/ld/testsuite/ld-elf/pr20513a.s b/ld/testsuite/ld-elf/pr20513a.s index 0f54bb1..bc882a9 100644 --- a/ld/testsuite/ld-elf/pr20513a.s +++ b/ld/testsuite/ld-elf/pr20513a.s @@ -11,4 +11,7 @@ __start: .type main,"function" .global main main: + .type _main,"function" + .global _main +_main: .long 0 diff --git a/ld/testsuite/ld-elf/sec64k.exp b/ld/testsuite/ld-elf/sec64k.exp index 3909c0e..a36a5a3 100644 --- a/ld/testsuite/ld-elf/sec64k.exp +++ b/ld/testsuite/ld-elf/sec64k.exp @@ -79,6 +79,8 @@ for { set i 0 } { $i < $max_sec / $secs_per_file } { incr i } { puts $ofd "__start:" puts $ofd " .global main" puts $ofd "main:" + puts $ofd " .global _main" + puts $ofd "_main:" puts $ofd " .global foo_0" puts $ofd "foo_0: .dc.a 0" } diff --git a/ld/testsuite/ld-elf/start.s b/ld/testsuite/ld-elf/start.s index d8655be..4d82394 100644 --- a/ld/testsuite/ld-elf/start.s +++ b/ld/testsuite/ld-elf/start.s @@ -7,4 +7,6 @@ _start: __start: .global main /* Used by HPPA targets. */ main: + .globl _main /* Used by LynxOS targets. */ +_main: .dc.a 0 diff --git a/ld/testsuite/ld-elf/var1.s b/ld/testsuite/ld-elf/var1.s index 58bc931..7fe3bcf 100644 --- a/ld/testsuite/ld-elf/var1.s +++ b/ld/testsuite/ld-elf/var1.s @@ -1,9 +1,11 @@ .globl main + .globl _main .globl start .globl _start .globl __start .text main: +_main: start: _start: __start: -- 2.7.4