Changeset 009c485 in mainline for uspace


Ignore:
Timestamp:
2018-05-01T19:02:23Z (7 years ago)
Author:
Jiří Zárevúcky <jiri.zarevucky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
742fc98e
Parents:
5261062
Message:

Always use CC for linking.

Location:
uspace
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile.common

    r5261062 r009c485  
    115115
    116116AFLAGS = --fatal-warnings
    117 LFLAGS = --fatal-warnings --warn-common
     117LDFLAGS = -Wl,--fatal-warnings,--warn-common
    118118
    119119ifeq ($(STATIC_NEEDED),y)
    … …  
    141141
    142142ifeq ($(LINK_DYNAMIC),y)
    143         LFLAGS += -Bdynamic
    144143        LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld
    145144else
     145        LDFLAGS += -static
    146146        LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld
    147147endif
    … …  
    245245
    246246ifeq ($(CONFIG_STRIP_BINARIES),y)
    247         LFLAGS += --strip-all
     247        LDFLAGS += -s
    248248endif
    249249
    250250LIB_CFLAGS = $(CFLAGS) -fPIC
    251 LIB_LFLAGS = $(LFLAGS) -shared -soname $(LSONAME)
     251LIB_LDFLAGS = $(LDFLAGS) -shared -Wl,-soname,$(LSONAME)
    252252
    253253AS_CFLAGS := $(addprefix -Xassembler ,$(AFLAGS))
    254 LD_CFLAGS := $(addprefix -Xlinker ,$(LFLAGS))
    255254
    256255OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    … …  
    303302ifneq ($(BINARY),)
    304303$(BINARY): $(LINKER_SCRIPT) $(OBJECTS) $(LIBTAGS) $(BASE_LIBS)
    305         $(LD) $(LFLAGS) $(EXTRA_LFLAGS) -T $(LINKER_SCRIPT) -Map $@.map -o $@ $(OBJECTS) $(LIBARGS) $(BASE_LIBS)
     304        $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) -T $(LINKER_SCRIPT) -Wl,-Map,$@.map -o $@ $(OBJECTS) $(LIBARGS) $(BASE_LIBS)
    306305endif
    307306
    308307ifneq ($(TEST_BINARY),)
    309308$(TEST_BINARY): $(LINKER_SCRIPT) $(TEST_OBJECTS) $(TEST_BINARY_LIBS) $(LIBTAGS) $(BASE_LIBS)
    310         $(LD) $(LFLAGS) $(EXTRA_LFLAGS) -T $(LINKER_SCRIPT) -Map $@.map -o $@ $(TEST_OBJECTS) $(TEST_BINARY_LIBS) $(LIBARGS) $(BASE_LIBS)
     309        $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) -T $(LINKER_SCRIPT) -Wl,-Map,$@.map -o $@ $(TEST_OBJECTS) $(TEST_BINARY_LIBS) $(LIBARGS) $(BASE_LIBS)
    311310endif
    312311
    … …  
    325324
    326325$(SLIBRARY): $(LIB_LINKER_SCRIPT) $(LIBRARY).la
    327         $(LD) $(LIB_LFLAGS) $(EXTRA_LFLAGS) -T $(LIB_LINKER_SCRIPT) -Map $@.map -o $@ --whole-archive $(LIBRARY).la --no-whole-archive
     326        $(CC) $(CFLAGS) $(LIB_LDFLAGS) $(EXTRA_LDFLAGS) -T $(LIB_LINKER_SCRIPT) -Wl,-Map,$@.map -o $@ -Wl,--whole-archive $(LIBRARY).la -Wl,--no-whole-archive
    328327
    329328$(LSONAME):

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

    r5261062 r009c485  
    3636endif
    3737
    38 LFLAGS += --gc-sections
     38LDFLAGS += -Wl,--gc-sections
    3939
    4040ENDIANESS = LE

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

    r5261062 r009c485  
    3131        -march=$(subst _,-,$(PROCESSOR_ARCH))
    3232
    33 LFLAGS += --gc-sections
     33LDFLAGS += -Wl,--gc-sections
    3434
    3535ifeq ($(CONFIG_FPU),y)

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

    r5261062 r009c485  
    3434
    3535COMMON_CFLAGS += -mno-tls-direct-seg-refs -fno-omit-frame-pointer
    36 LFLAGS += --gc-sections
     36LDFLAGS += -Wl,--gc-sections
    3737
    3838ENDIANESS = LE

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

    r5261062 r009c485  
    2929COMMON_CFLAGS += -msoft-float -mabi=32
    3030AS_PROLOG = .module softfloat;.abicalls;
    31 LFLAGS += --gc-sections
     31LDFLAGS += -Wl,--gc-sections
    3232
    3333ENDIANESS = LE

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

    r5261062 r009c485  
    2929COMMON_CFLAGS += -msoft-float -mabi=32
    3030AS_PROLOG = .module softfloat;.abicalls;
    31 LFLAGS += --gc-sections
     31LDFLAGS += -Wl,--gc-sections
    3232
    3333ENDIANESS = BE

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

    r5261062 r009c485  
    3535COMMON_CFLAGS += -mcpu=powerpc -m$(FLOATS)-float -m32
    3636AFLAGS += -a32
    37 LFLAGS += --gc-sections
     37LDFLAGS += -Wl,--gc-sections
    3838
    3939ENDIANESS = BE

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

    r5261062 r009c485  
    3535COMMON_CFLAGS += -m64 -mcmodel=medlow
    3636
    37 LFLAGS += -no-check-sections --gc-sections
     37LDFLAGS += -Wl,-no-check-sections,--gc-sections
    3838
    3939ENDIANESS = BE

  • uspace/lib/pcut/Makefile

    r5261062 r009c485  
    3636
    3737test-libpcut-%: $(LIBRARY).a
    38         $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -o $@ $(STARTUP) $^ $(LIBRARY).a $(BASE_LIBS)
     38        $(CC) $(CFLAGS) $(LDFLAGS) -T $(LINKER_SCRIPT) -o $@ $(STARTUP) $^ $(LIBRARY).a $(BASE_LIBS)
    3939

  • uspace/lib/pcut/update-from-master.sh

    r5261062 r009c485  
    8080
    8181test-libpcut-%: $(LIBRARY).a
    82         $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -o $@ $(STARTUP) $^ $(LIBRARY).a $(BASE_LIBS)
     82        $(CC) $(CFLAGS) $(LDFLAGS) -T $(LINKER_SCRIPT) -o $@ $(STARTUP) $^ $(LIBRARY).a $(BASE_LIBS)
    8383
    8484EOF_MAKEFILE_TAIL

  • uspace/srv/loader/Makefile

    r5261062 r009c485  
    3030USPACE_PREFIX = ../..
    3131
    32 EXTRA_LFLAGS = -Ttext-segment=0x70000000
     32EXTRA_LDFLAGS = -Wl,-Ttext-segment=0x70000000
    3333
    3434BINARY = loader
Note: See TracChangeset for help on using the changeset viewer.