Ignore:
Timestamp:
2010-01-10T12:16:59Z (15 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
c77a64f
Parents:
309ede1 (diff), 1ac3a52 (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.
Message:

Merge mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/libc/arch/ia64/Makefile.inc

    r309ede1 r5f70118  
    3636        arch/$(UARCH)/src/fibril.S \
    3737        arch/$(UARCH)/src/tls.c \
    38         arch/$(UARCH)/src/ddi.c
     38        arch/$(UARCH)/src/ddi.c \
     39        arch/$(UARCH)/src/stacktrace.S
    3940
    40 CFLAGS += -fno-unwind-tables
     41GCC_CFLAGS += -fno-unwind-tables
    4142LFLAGS += -N $(SOFTINT_PREFIX)/libsoftint.a
    4243
Note: See TracChangeset for help on using the changeset viewer.