Ignore:
Timestamp:
2019-09-23T12:49:29Z (7 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, topic/msim-upgrade, topic/simplify-dev-export
Children:
9be2358
Parents:
9259d20 (diff), 1a4ec93f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)
git-committer:
Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)
Message:

Merge changes from master, especially Meson build

File:
1 moved

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/arch/arm64/src/stacktrace_asm.S

    r9259d20 r3e828ea  
    11#
    2 # Copyright (c) 2014 Martin Sucha
     2# Copyright (c) 2015 Petr Pavlu
    33# All rights reserved.
    44#
     
    2727#
    2828
    29 USPACE_PREFIX = ../..
     29#include <abi/asmtool.h>
    3030
    31 # TODO: Should be just "gui", rest is transitive dependencies.
    32 LIBS = gui draw softrend compress math
     31.text
    3332
    34 BINARY = fontviewer
     33FUNCTION_BEGIN(stacktrace_prepare)
     34        ret
     35FUNCTION_END(stacktrace_prepare)
    3536
    36 SOURCES = \
    37         fontviewer.c
     37FUNCTION_BEGIN(stacktrace_fp_get)
     38        mov x0, x29
     39        ret
     40FUNCTION_END(stacktrace_fp_get)
    3841
    39 include $(USPACE_PREFIX)/Makefile.common
     42FUNCTION_BEGIN(stacktrace_pc_get)
     43        mov x0, x30
     44        ret
     45FUNCTION_END(stacktrace_pc_get)
Note: See TracChangeset for help on using the changeset viewer.