| 32,7 → 32,7 |
|---|
| ## Setup toolchain |
| # |
| |
| LIBC_PREFIX = ../../lib/libc-shared |
| LIBC_PREFIX = ../../lib/libc |
| SOFTINT_PREFIX = ../../lib/softint |
| include $(LIBC_PREFIX)/Makefile.toolchain |
| include arch/$(ARCH)/Makefile.inc |
| 40,8 → 40,7 |
|---|
| CFLAGS += -I../../srv/kbd/include -I../../srv/console -fPIC -O0 |
| LFLAGS = -shared --no-undefined |
| |
| # LIBS = $(LIBC_PREFIX)/libc-pic.a |
| LIBS = |
| LIBS = $(LIBC_PREFIX)/libc.pic.a |
| DEFS += -DRELEASE=\"$(RELEASE)\" |
| |
| ifdef REVISION |
| 57,9 → 56,7 |
|---|
| |
| OUTPUT = rtld.so |
| GENERIC_SOURCES = \ |
| rtld.c \ |
| ulibc.c \ |
| syscall.S |
| rtld.c |
| |
| GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES))) |
| ARCH_OBJECTS := $(addsuffix .o,$(basename $(ARCH_SOURCES))) |
| 78,11 → 75,9 |
|---|
| $(CC) $(DEFS) $(CFLAGS) -M $(ARCH_SOURCES) $(GENERIC_SOURCES)> Makefile.depend |
| |
| $(OUTPUT): $(ARCH_OBJECTS) $(GENERIC_OBJECTS) $(LIBS) arch/$(ARCH)/_link.ld |
| # $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map |
| $(LD) -T arch/$(ARCH)/_link.ld $(ARCH_OBJECTS) $(GENERIC_OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map |
| |
| disasm: |
| # $(OBJDUMP) -h -r -R -t -T -D -z -s $(OUTPUT) >$(OUTPUT).disasm |
| $(OBJDUMP) -d -S -s $(OUTPUT) >$(OUTPUT).disasm |
| |
| sections: |