Changeset 4241683 in mainline


Ignore:
Timestamp:
2006-03-14T20:45:36Z (19 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
56972c81
Parents:
7d1562e9
Message:

Integrate softint.a into ia64 building process.

Files:
5 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    r7d1562e9 r4241683  
    3333
    3434DIRS = \
     35        softint \
     36        softfloat \
    3537        libc \
    3638        libipc \
    37         init \
    38         softfloat \
    39         softint
     39        init
    4040
    4141BUILDS := $(addsuffix .build,$(DIRS))

  • init/Makefile

    r7d1562e9 r4241683  
    5959
    6060$(OUTPUT): $(OBJECTS)
    61         $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(LFLAGS) $(OBJECTS) $(LIBC_PREFIX)/libc.a $(LIBIPC_PREFIX)/libipc.a -o $@ -Map $(OUTPUT).map
     61        $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld  $(OBJECTS) $(LIBC_PREFIX)/libc.a $(LIBIPC_PREFIX)/libipc.a $(LFLAGS) -o $@ -Map $(OUTPUT).map
    6262
    6363disasm:

  • init/init.c

    r7d1562e9 r4241683  
    3535
    3636/*
    37 extern char _heap;
    38 void test_mremap(void)
     37static void test_mremap(void)
    3938{
    4039        printf("Writing to good memory\n");
    … …  
    5251*/
    5352/*
    54 extern char _heap;
    5553static void test_sbrk(void)
    5654{
    … …  
    6967}
    7068*/
    71 
    7269/*
    73 extern char _heap;
    7470static void test_malloc(void)
    7571{

  • libc/arch/ia64/Makefile.inc

    r7d1562e9 r4241683  
    3333TOOLCHAIN_DIR = /usr/local/ia64/bin
    3434CFLAGS += -fno-unwind-tables
    35 LFLAGS += -N
     35LFLAGS += -N ../softint/softint.a
    3636AFLAGS +=
    3737

  • softint/Makefile

    r7d1562e9 r4241683  
    3030#
    3131
    32 SOFTINT_PREFIX = .
     32LIBC_PREFIX = ../libc
    3333## Setup toolchain
    3434#
    3535
    36 include $(SOFTINT_PREFIX)/Makefile.toolchain
     36include $(LIBC_PREFIX)/Makefile.toolchain
     37
     38CFLAGS += -Iinclude
    3739
    3840## Sources
    … …  
    4345
    4446GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES)))
    45 ARCH_OBJECTS := $(addsuffix .o,$(basename $(ARCH_SOURCES)))
    4647
    4748.PHONY: all clean depend
    … …  
    5657
    5758depend:
    58         $(CC) $(DEFS) $(CFLAGS) -M $(ARCH_SOURCES) $(GENERIC_SOURCES) > Makefile.depend
     59        $(CC) $(DEFS) $(CFLAGS) -M $(GENERIC_SOURCES) > Makefile.depend
    5960
    6061softint.a: depend $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
Note: See TracChangeset for help on using the changeset viewer.