- Timestamp:
- 2017-10-27T18:44:07Z (8 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- d088616
- Parents:
- 0798689 (diff), f9c4bc5 (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. - Location:
- uspace
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/Makefile.common
r0798689 r9b642f92 110 110 LIBSOFTINT_PREFIX = $(LIB_PREFIX)/softint 111 111 112 STARTUP = $(LIBC_PREFIX)/arch/$(UARCH)/src/entry.o 113 112 114 LIBMATH_PREFIX = $(LIB_PREFIX)/math 113 115 LIBMATH_INCLUDES_FLAGS = \ … … 234 236 COMMON_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \ 235 237 -ffreestanding -fno-builtin -nostdlib -nostdinc -fexec-charset=UTF-8 \ 236 -finput-charset=UTF-8 -D__$(ENDIANESS)__ -fno-common 238 -finput-charset=UTF-8 -D__$(ENDIANESS)__ -fno-common \ 239 -fdebug-prefix-map=$(realpath $(ROOT_PATH))=. 237 240 238 241 GCC_CFLAGS = -ffunction-sections -Wall -Wextra -Wno-clobbered \ … … 301 304 302 305 $(BINARY): $(LINKER_SCRIPT) $(OBJECTS) $(LIBS) $(BASE_LIBS) 303 $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -M -Map $(BINARY).map -o $(BINARY) $( OBJECTS) $(LIBS) $(BASE_LIBS)306 $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -M -Map $(BINARY).map -o $(BINARY) $(STARTUP) $(OBJECTS) $(LIBS) $(BASE_LIBS) 304 307 ifeq ($(CONFIG_STRIP_BINARIES),y) 305 308 $(STRIP) $(BINARY) … … 337 340 ifneq ($(TEST_OUTPUT),) 338 341 $(TEST_OUTPUT): $(LINKER_SCRIPT) $(TEST_OBJECTS) $(TEST_OUTPUT_LIBS) 339 $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -M -Map $(TEST_OUTPUT).map -o $@ $( TEST_OBJECTS) $(TEST_OUTPUT_LIBS) $(LIBS) $(BASE_LIBS)342 $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -M -Map $(TEST_OUTPUT).map -o $@ $(STARTUP) $(TEST_OBJECTS) $(TEST_OUTPUT_LIBS) $(LIBS) $(BASE_LIBS) 340 343 ifeq ($(CONFIG_STRIP_BINARIES),y) 341 344 $(STRIP) $(TEST_OUTPUT) -
uspace/lib/c/arch/abs32le/_link.ld.in
r0798689 r9b642f92 1 STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)2 1 ENTRY(__entry) 3 2 -
uspace/lib/c/arch/amd64/_link.ld.in
r0798689 r9b642f92 1 STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)2 1 ENTRY(__entry) 3 2 -
uspace/lib/c/arch/arm32/_link.ld.in
r0798689 r9b642f92 1 STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)2 1 ENTRY(__entry) 3 2 -
uspace/lib/c/arch/ia32/_link.ld.in
r0798689 r9b642f92 1 1 #ifndef SHLIB 2 STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)3 2 ENTRY(__entry) 4 3 #endif -
uspace/lib/c/arch/ia64/_link.ld.in
r0798689 r9b642f92 1 STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)2 1 ENTRY(__entry) 3 2 -
uspace/lib/c/arch/mips32/_link.ld.in
r0798689 r9b642f92 1 STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)2 1 ENTRY(__entry) 3 2 -
uspace/lib/c/arch/ppc32/_link.ld.in
r0798689 r9b642f92 1 STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)2 1 ENTRY(__entry) 3 2 -
uspace/lib/c/arch/riscv64/_link.ld.in
r0798689 r9b642f92 1 STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)2 1 ENTRY(__entry) 3 2 -
uspace/lib/c/arch/sparc64/_link.ld.in
r0798689 r9b642f92 1 STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)2 1 ENTRY(__entry) 3 2 -
uspace/lib/pcut/Makefile
r0798689 r9b642f92 36 36 37 37 test-libpcut-%: $(OUTPUT) 38 $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -o $@ $ ^ $(OUTPUT) $(BASE_LIBS)38 $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -o $@ $(STARTUP) $^ $(OUTPUT) $(BASE_LIBS) 39 39 -
uspace/lib/pcut/update-from-master.sh
r0798689 r9b642f92 80 80 81 81 test-libpcut-%: $(OUTPUT) 82 $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -o $@ $ ^ $(OUTPUT) $(BASE_LIBS)82 $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -o $@ $(STARTUP) $^ $(OUTPUT) $(BASE_LIBS) 83 83 84 84 EOF_MAKEFILE_TAIL
Note:
See TracChangeset
for help on using the changeset viewer.