[src/trunk]: src/lib/libc/arch/riscv Adapt to new assembler. jump->tail[call...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f6c223210fab
branches:  trunk
changeset: 336939:f6c223210fab
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Mar 27 23:23:14 2015 +0000

description:
Adapt to new assembler.  jump->tail[call]  auipc/lo12 changes.

diffstat:

 lib/libc/arch/riscv/gen/__sigsetjmp14.S |  12 ++++++------
 lib/libc/arch/riscv/gen/swapcontext.S   |   6 +++---
 lib/libc/arch/riscv/sys/__clone.S       |   6 +++---
 lib/libc/arch/riscv/sys/brk.S           |   8 ++++----
 lib/libc/arch/riscv/sys/cerror.S        |   6 +++---
 lib/libc/arch/riscv/sys/sbrk.S          |   6 +++---
 6 files changed, 22 insertions(+), 22 deletions(-)

diffs (161 lines):

diff -r 601cc53d20d3 -r f6c223210fab lib/libc/arch/riscv/gen/__sigsetjmp14.S
--- a/lib/libc/arch/riscv/gen/__sigsetjmp14.S   Fri Mar 27 23:22:20 2015 +0000
+++ b/lib/libc/arch/riscv/gen/__sigsetjmp14.S   Fri Mar 27 23:23:14 2015 +0000
@@ -1,21 +1,21 @@
-/*     $NetBSD: __sigsetjmp14.S,v 1.1 2014/09/19 17:36:25 matt Exp $   */
+/*     $NetBSD: __sigsetjmp14.S,v 1.2 2015/03/27 23:23:14 matt Exp $   */
 
 #include "SYS.h"
 #include "assym.h"
 
 #if defined(LIBC_SCCS)
-__RCSID("$NetBSD: __sigsetjmp14.S,v 1.1 2014/09/19 17:36:25 matt Exp $")
+__RCSID("$NetBSD: __sigsetjmp14.S,v 1.2 2015/03/27 23:23:14 matt Exp $")
 #endif
 
 ENTRY(__sigsetjmp14)
        bnez    a1, 1f
-       jump    PLT(_C_LABEL(_setjmp))
-1:     jump    PLT(_C_LABEL(__setjmp14))
+       tail    PLT(_C_LABEL(_setjmp))
+1:     tail    PLT(_C_LABEL(__setjmp14))
 END(__sigsetjmp14)
 
 ENTRY(__siglongjmp14)
        REG_L   a2, JB_MAGIC(a0)
        bnez    a2, 1f
-       jump    PLT(_C_LABEL(_longjmp))
-1:     jump    PLT(_C_LABEL(__longjmp14))
+       tail    PLT(_C_LABEL(_longjmp))
+1:     tail    PLT(_C_LABEL(__longjmp14))
 END(__siglongjmp14)
diff -r 601cc53d20d3 -r f6c223210fab lib/libc/arch/riscv/gen/swapcontext.S
--- a/lib/libc/arch/riscv/gen/swapcontext.S     Fri Mar 27 23:22:20 2015 +0000
+++ b/lib/libc/arch/riscv/gen/swapcontext.S     Fri Mar 27 23:23:14 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: swapcontext.S,v 1.2 2015/03/27 06:44:28 matt Exp $     */
+/*     $NetBSD: swapcontext.S,v 1.3 2015/03/27 23:23:14 matt Exp $     */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include "SYS.h"
 #include "assym.h"
 
-__RCSID("$NetBSD: swapcontext.S,v 1.2 2015/03/27 06:44:28 matt Exp $")
+__RCSID("$NetBSD: swapcontext.S,v 1.3 2015/03/27 23:23:14 matt Exp $")
 
 #define        CALLFRAME_UCP   CALLFRAME_S1
 #define        CALLFRAME_OUCP  CALLFRAME_S0
@@ -56,7 +56,7 @@
        REG_S   ra, UC_GREGS_PC(a1)             # pc <- ra
        REG_S   sp, UC_GREGS_SP(a1)             # adjust sp
 
-       jump    PLT(_C_LABEL(setcontext))       # setcontext(ucp)
+       tail    PLT(_C_LABEL(setcontext))       # setcontext(ucp)
 
 1:     ret                                     # simply return
 END(swapcontext)
diff -r 601cc53d20d3 -r f6c223210fab lib/libc/arch/riscv/sys/__clone.S
--- a/lib/libc/arch/riscv/sys/__clone.S Fri Mar 27 23:22:20 2015 +0000
+++ b/lib/libc/arch/riscv/sys/__clone.S Fri Mar 27 23:23:14 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: __clone.S,v 1.2 2015/03/27 06:44:28 matt Exp $ */
+/*     $NetBSD: __clone.S,v 1.3 2015/03/27 23:23:14 matt Exp $ */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
 #include "SYS.h"
 
 #if defined(SYSLIBC_SCCS) && !defined(lint)
-       RCSID("$NetBSD: __clone.S,v 1.2 2015/03/27 06:44:28 matt Exp $");
+       RCSID("$NetBSD: __clone.S,v 1.3 2015/03/27 23:23:14 matt Exp $");
 #endif /* SYSLIBC_SCCS and not lint */
 
 #ifdef WEAK_ALIAS
@@ -92,7 +92,7 @@
        jalr            t0
 
        /* Pass the return value to _exit. */
-       jump            _C_LABEL(_exit)
+       tail            _C_LABEL(_exit)
 
        /* NOTREACHED */
 END(__clone)
diff -r 601cc53d20d3 -r f6c223210fab lib/libc/arch/riscv/sys/brk.S
--- a/lib/libc/arch/riscv/sys/brk.S     Fri Mar 27 23:22:20 2015 +0000
+++ b/lib/libc/arch/riscv/sys/brk.S     Fri Mar 27 23:23:14 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: brk.S,v 1.2 2015/03/27 06:44:28 matt Exp $     */
+/*     $NetBSD: brk.S,v 1.3 2015/03/27 23:23:14 matt Exp $     */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include "SYS.h"
 
 #if defined(LIBC_SCCS) && !defined(lint)
-       RCSID("$NetBSD: brk.S,v 1.2 2015/03/27 06:44:28 matt Exp $")
+       RCSID("$NetBSD: brk.S,v 1.3 2015/03/27 23:23:14 matt Exp $")
 #endif /* LIBC_SCCS and not lint */
 
        .hidden _C_LABEL(__minbrk)
@@ -55,8 +55,8 @@
        .text
 
 ENTRY(_brk)
-       auipc   t1, %pcrel_hi(_C_LABEL(__minbrk))
-       addi    t1, t1, %pcrel_lo(_C_LABEL(__minbrk))
+.L0:   auipc   t1, %pcrel_hi(_C_LABEL(__minbrk))
+       addi    t1, t1, %pcrel_lo(.L0)
        PTR_L   t5, 0(t1)
        bgeu    a0, t5, 1f
        move    a0, t5          # dont allow break < minbrk
diff -r 601cc53d20d3 -r f6c223210fab lib/libc/arch/riscv/sys/cerror.S
--- a/lib/libc/arch/riscv/sys/cerror.S  Fri Mar 27 23:22:20 2015 +0000
+++ b/lib/libc/arch/riscv/sys/cerror.S  Fri Mar 27 23:23:14 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cerror.S,v 1.2 2015/03/27 06:44:28 matt Exp $  */
+/*     $NetBSD: cerror.S,v 1.3 2015/03/27 23:23:14 matt Exp $  */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -35,7 +35,7 @@
 #include "SYS.h"
 
 #if defined(LIBC_SCCS) && !defined(lint)
-       RCSID("$NetBSD: cerror.S,v 1.2 2015/03/27 06:44:28 matt Exp $")
+       RCSID("$NetBSD: cerror.S,v 1.3 2015/03/27 23:23:14 matt Exp $")
 #endif /* LIBC_SCCS and not lint */
 
        .protected      _C_LABEL(__cerror)
@@ -55,7 +55,7 @@
        addi            sp, sp, CALLFRAME_SIZ
 #else
        aiupc           a1, %hi(_C_LABEL(errno))
-       sw              a0, %lo(_C_LABEL(errno))(a1)
+       INT_S           a0, %lo(_C_LABEL(errno))(a1)
 #endif /* _REENTRANT */
        li              a0, -1
        li              a1, -1
diff -r 601cc53d20d3 -r f6c223210fab lib/libc/arch/riscv/sys/sbrk.S
--- a/lib/libc/arch/riscv/sys/sbrk.S    Fri Mar 27 23:22:20 2015 +0000
+++ b/lib/libc/arch/riscv/sys/sbrk.S    Fri Mar 27 23:23:14 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sbrk.S,v 1.2 2015/03/27 06:44:28 matt Exp $    */
+/*     $NetBSD: sbrk.S,v 1.3 2015/03/27 23:23:14 matt Exp $    */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -40,8 +40,8 @@
 #endif
 
 ENTRY(_sbrk)
-       auipc           t1, %pcrel_hi(_C_LABEL(__curbrk))
-       addi            t1, t1, %pcrel_lo(_C_LABEL(__curbrk))
+.L0:   auipc           t1, %pcrel_hi(_C_LABEL(__curbrk))
+       addi            t1, t1, %pcrel_lo(.L0)
        PTR_L           t2, 0(t1)
        add             a0, a0, t2      // compute current break
        SYSTRAP(break)