Changeset 0aa06cbe in mainline for uspace/lib


Ignore:
Timestamp:
2018-03-06T20:48:12Z (8 years ago)
Author:
GitHub <noreply@…>
Parents:
fd57cf17 (diff), 0c793e2 (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:
Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-06 20:48:12)
git-committer:
GitHub <noreply@…> (2018-03-06 20:48:12)
Message:

Merge 0c793e2e9c4358a2bb2521d35eb36b273cf0283b into fd57cf17d12bbe3b41626a0b8708f075134a073e

Location:
uspace/lib/c
Files:
8 added
8 deleted
13 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/Makefile

    rfd57cf17 r0aa06cbe  
    4848-include arch/$(UARCH)/Makefile.inc
    4949
    50 ARCH_AUTOGENS_H := $(addsuffix .h,$(basename $(ARCH_AUTOGENS_AG)))
    51 ARCH_AUTOGENS_PROBE_C := $(addsuffix .ag.probe.c,$(basename $(ARCH_AUTOGENS_AG)))
    52 ARCH_AUTOGENS_PROBE_S := $(addsuffix .ag.probe.s,$(basename $(ARCH_AUTOGENS_AG)))
    53 
    54 PRE_DEPEND += $(ARCH_AUTOGENS_H)
    55 EXTRA_CLEAN += $(ARCH_AUTOGENS_H) $(ARCH_AUTOGENS_PROBE_C) $(ARCH_AUTOGENS_PROBE_S)
     50ARCH_AUTOGENS_PROBE_C := $(ARCH_AUTOGENS_AG:%.ag.h=.ag.c)
     51ARCH_AUTOGENS_PROBE_S := $(ARCH_AUTOGENS_AG:%.ag.h=.ag.s)
     52
     53PRE_DEPEND += $(ARCH_AUTOGENS_AG)
     54EXTRA_CLEAN += $(ARCH_AUTOGENS_AG) $(ARCH_AUTOGENS_PROBE_C) $(ARCH_AUTOGENS_PROBE_S)
    5655
    5756GENERIC_SOURCES = \
    … …  
    194193include $(USPACE_PREFIX)/Makefile.common
    195194
    196 %.h: %.ag
    197         $(AUTOGEN) probe $< >$<.probe.c
    198         $(CC_AUTOGEN) $(DEFS) $(CFLAGS) -S -o $<.probe.s $<.probe.c
    199         $(AUTOGEN) generate $< <$<.probe.s >$@
    200 
    201195$(LIBC_PREFIX)/arch/$(UARCH)/_link.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
    202196        $(CC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -E -x c $< | grep -v "^\#" > $@

  • uspace/lib/c/arch/amd64/Makefile.inc

    rfd57cf17 r0aa06cbe  
    3737
    3838ARCH_AUTOGENS_AG = \
    39         arch/$(UARCH)/include/libarch/istate_struct.ag \
    40         arch/$(UARCH)/include/libarch/fibril_context.ag
     39        arch/$(UARCH)/include/libarch/fibril_context.ag.h
    4140
    4241EXTRA_OUTPUT += arch/$(UARCH)/src/entry.o

  • uspace/lib/c/arch/amd64/src/fibril.S

    rfd57cf17 r0aa06cbe  
    2828
    2929#include <abi/asmtool.h>
    30 #include <libarch/fibril_context.h>
     30#include <libarch/fibril_context.ag.h>
    3131
    3232.text

  • uspace/lib/c/arch/arm32/Makefile.inc

    rfd57cf17 r0aa06cbe  
    3838        arch/$(UARCH)/src/stacktrace_asm.S
    3939
    40 ARCH_AUTOGENS_AG = \
    41         arch/$(UARCH)/include/libarch/istate_struct.ag \
    42         arch/$(UARCH)/include/libarch/fibril_context.ag
    43 
    4440EXTRA_OUTPUT += arch/$(UARCH)/src/entry.o
    4541

  • uspace/lib/c/arch/ia32/Makefile.inc

    rfd57cf17 r0aa06cbe  
    3939
    4040ARCH_AUTOGENS_AG = \
    41         arch/$(UARCH)/include/libarch/istate_struct.ag \
    42         arch/$(UARCH)/include/libarch/fibril_context.ag
     41        arch/$(UARCH)/include/libarch/fibril_context.ag.h
    4342
    4443EXTRA_OUTPUT += arch/$(UARCH)/src/entry.o

  • uspace/lib/c/arch/ia32/src/fibril.S

    rfd57cf17 r0aa06cbe  
    2828
    2929#include <abi/asmtool.h>
    30 #include <libarch/fibril_context.h>
     30#include <libarch/fibril_context.ag.h>
    3131
    3232.text

  • uspace/lib/c/arch/ia64/Makefile.inc

    rfd57cf17 r0aa06cbe  
    3838
    3939ARCH_AUTOGENS_AG = \
    40         arch/$(UARCH)/include/libarch/istate_struct.ag \
    41         arch/$(UARCH)/include/libarch/fibril_context.ag
     40        arch/$(UARCH)/include/libarch/fibril_context.ag.h
    4241
    4342EXTRA_OUTPUT += arch/$(UARCH)/src/entry.o

  • uspace/lib/c/arch/ia64/src/fibril.S

    rfd57cf17 r0aa06cbe  
    2828
    2929#include <abi/asmtool.h>
    30 #include <libarch/fibril_context.h>
     30#include <libarch/fibril_context.ag.h>
    3131
    3232.text

  • uspace/lib/c/arch/mips32/Makefile.inc

    rfd57cf17 r0aa06cbe  
    3737
    3838ARCH_AUTOGENS_AG = \
    39         arch/$(UARCH)/include/libarch/istate_struct.ag \
    40         arch/$(UARCH)/include/libarch/fibril_context.ag
     39        arch/$(UARCH)/include/libarch/fibril_context.ag.h
    4140
    4241EXTRA_OUTPUT += arch/$(UARCH)/src/entry.o

  • uspace/lib/c/arch/mips32eb/Makefile.inc

    rfd57cf17 r0aa06cbe  
    3737
    3838ARCH_AUTOGENS_AG = \
    39         arch/$(UARCH)/include/libarch/istate_struct.ag \
    40         arch/$(UARCH)/include/libarch/fibril_context.ag
     39        arch/$(UARCH)/include/libarch/fibril_context.ag.h
    4140
    4241EXTRA_OUTPUT += arch/$(UARCH)/src/entry.o

  • uspace/lib/c/arch/ppc32/Makefile.inc

    rfd57cf17 r0aa06cbe  
    3737
    3838ARCH_AUTOGENS_AG = \
    39         arch/$(UARCH)/include/libarch/istate_struct.ag \
    40         arch/$(UARCH)/include/libarch/fibril_context.ag
     39        arch/$(UARCH)/include/libarch/fibril_context.ag.h
    4140
    4241EXTRA_OUTPUT += arch/$(UARCH)/src/entry.o

  • uspace/lib/c/arch/riscv64/Makefile.inc

    rfd57cf17 r0aa06cbe  
    3636
    3737ARCH_AUTOGENS_AG = \
    38         arch/$(UARCH)/include/libarch/istate_struct.ag \
    39         arch/$(UARCH)/include/libarch/fibril_context.ag
     38        arch/$(UARCH)/include/libarch/fibril_context.ag.h
    4039
    4140EXTRA_OUTPUT += arch/$(UARCH)/src/entry.o

  • uspace/lib/c/arch/sparc64/Makefile.inc

    rfd57cf17 r0aa06cbe  
    3636
    3737ARCH_AUTOGENS_AG = \
    38         arch/$(UARCH)/include/libarch/istate_struct.ag \
    39         arch/$(UARCH)/include/libarch/fibril_context.ag
     38        arch/$(UARCH)/include/libarch/fibril_context.ag.h
    4039
    4140EXTRA_OUTPUT += arch/$(UARCH)/src/entry.o
Note: See TracChangeset for help on using the changeset viewer.