Changeset 009c485 in mainline


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.

Files:
1 deleted
19 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile.build

    r5261062 r009c485  
    3737
    3838AFLAGS = --fatal-warnings
    39 LFLAGS = --fatal-warnings --warn-common
     39LDFLAGS = -Wl,--fatal-warnings,--warn-common
    4040
    4141COMMON_CFLAGS = $(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
    … …  
    8282
    8383$(RAW): $(OBJECTS) $(LINK)
    84         $(LD) -n $(LFLAGS) -T $(LINK) -M -Map $(MAP) -o $@ $(OBJECTS)
     84        $(CC) $(CFLAGS) -Wl,-n $(LDFLAGS) -T $(LINK) -Wl,-M,-Map,$(MAP) -o $@ $(OBJECTS)
    8585
    8686$(LINK): | depend

  • boot/arch/mips32/src/Makefile.build

    r5261062 r009c485  
    6262
    6363$(RAW): $(OBJECTS) $(COMPONENT_OBJECTS) $(LINK)
    64         $(LD) -no-check-sections -N -T $(LINK) $(COMPONENT_OBJECTS) $(OBJECTS) -o $@
     64        $(CC) $(CFLAGS) -Wl,-no-check-sections,-N -T $(LINK) $(COMPONENT_OBJECTS) $(OBJECTS) -o $@
    6565
    6666%.o: %.S $(DEPEND)

  • kernel/Makefile

    r5261062 r009c485  
    116116endif
    117117
    118 #
    119 # Mind the mutual ordering with the inclusion of the arch Makefile.inc.
    120 # AFLAGS and LFLAGS must be initialized before the inclusion.
    121 #
    122 AFLAGS = --fatal-warnings
    123 LFLAGS = -n -T $(LINK) -M --fatal-warnings --warn-common
     118AFLAGS += --fatal-warnings
     119LDFLAGS += -Wl,-n -T $(LINK) -Wl,-M,--fatal-warnings,--warn-common
    124120
    125121ifeq ($(CONFIG_STRIP_BINARIES),y)
    126         LFLAGS += --strip-all
    127 endif
    128 
    129 #
    130 # Mind the mutual ordering with the initialization of AFLAGS and LFLAGS.
    131 # The arch Makefile.inc must be included after the initialization.
    132 #
     122        LDFLAGS += -s
     123endif
     124
    133125-include arch/$(KARCH)/Makefile.inc
    134126-include genarch/Makefile.inc
    … …  
    358350
    359351AS_CFLAGS := $(addprefix -Xassembler ,$(AFLAGS))
    360 LD_CFLAGS := $(addprefix -Xlinker ,$(LFLAGS))
    361352
    362353-include $(GENERIC_DEPENDS)
    … …  
    385376
    386377$(RAW): $(LINK) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(SYMTAB_OBJECTS)
    387 ifeq ($(CONFIG_LTO),y)
    388         $(CC) $(DEFS) $(CFLAGS) $(LD_CFLAGS) -Xlinker -Map -Xlinker $(MAP) -o $@ $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) $(SYMTAB_OBJECTS)
    389 else
    390         $(LD) $(LFLAGS) -Map $(MAP) -o $@ $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) $(SYMTAB_OBJECTS)
    391 endif
     378        $(CC) $(DEFS) $(CFLAGS) $(LDFLAGS) -Wl,-Map,$(MAP) -o $@ $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) $(SYMTAB_OBJECTS)
    392379
    393380$(LINK): $(LINK).in
    … …  
    411398$(REAL_MAP).bin: $(LINK) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS)
    412399        echo "$(AS_PROLOG)""$(SYMTAB_SECTION)" | $(CC) $(CFLAGS) $(AS_CFLAGS) -x assembler -c -o $(EMPTY_MAP) -
    413 ifeq ($(CONFIG_LTO),y)
    414         $(CC) $(DEFS) $(CFLAGS) $(LD_CFLAGS) -Xlinker -Map -Xlinker $(MAP_PREV) -o $@ $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) $(EMPTY_MAP)
    415 else
    416         $(LD) $(LFLAGS) -Map $(MAP_PREV) -o $@ $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) $(EMPTY_MAP)
    417 endif
     400        $(CC) $(DEFS) $(CFLAGS) $(LDFLAGS) -Wl,-Map,$(MAP_PREV) -o $@ $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) $(EMPTY_MAP)
    418401        $(OBJDUMP) -t $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) > $(DUMP)
    419402        $(GENMAP) $(MAP_PREV) $(DUMP) $@
    … …  
    423406
    424407        echo "$(AS_PROLOG)""$(SYMTAB_SECTION)"" .incbin \"$@\"" | $(CC) $(CFLAGS) $(AS_CFLAGS) -x assembler -c -o $(SIZEOK_MAP) -
    425 ifeq ($(CONFIG_LTO),y)
    426         $(CC) $(DEFS) $(CFLAGS) $(LD_CFLAGS) -Xlinker -Map -Xlinker $(MAP_PREV) -o $@ $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) $(SIZEOK_MAP)
    427 else
    428         $(LD) $(LFLAGS) -Map $(MAP_PREV) -o $@ $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) $(SIZEOK_MAP)
    429 endif
     408        $(CC) $(DEFS) $(CFLAGS) $(LDFLAGS) -Wl,-Map,$(MAP_PREV) -o $@ $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) $(SIZEOK_MAP)
    430409        $(OBJDUMP) -t $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) > $(DUMP)
    431410        $(GENMAP) $(MAP_PREV) $(DUMP) $@

  • kernel/arch/ia64/Makefile.inc

    r5261062 r009c485  
    3333
    3434AFLAGS += -mconstant-gp
    35 LFLAGS += -EL
     35LDFLAGS += -Wl,-EL
    3636
    3737BITS = 64

  • kernel/arch/ppc32/Makefile.inc

    r5261062 r009c485  
    3333COMMON_CFLAGS += -mcpu=powerpc -msoft-float -m32
    3434AFLAGS += -a32
    35 LFLAGS += -no-check-sections
     35LDFLAGS += -Wl,-no-check-sections
    3636
    3737BITS = 32

  • kernel/arch/sparc64/Makefile.inc

    r5261062 r009c485  
    3333COMMON_CFLAGS += -m64 -mcpu=ultrasparc -mcmodel=medlow -mno-fpu
    3434
    35 LFLAGS += -no-check-sections
     35LDFLAGS += -Wl,-no-check-sections
    3636
    3737BITS = 64

  • tools/xcw/bin/helenos-bld-config

    r5261062 r009c485  
    4747case ".$1" in
    4848(.--cc) extract_field "CC" "$MAKEFILE_COMMON";;
    49 (.--ld) extract_field "LD" "$MAKEFILE_COMMON";;
    5049(.--uarch) extract_field "UARCH" "$MAKEFILE_CONFIG";;
    5150(.--endian)

  • tools/xcw/demo/Makefile

    r5261062 r009c485  
    4343
    4444CC = helenos-cc
    45 LD = helenos-ld
    4645CFLAGS = -std=gnu99 -Wall `helenos-pkg-config --cflags libgui libdraw libmath`
    4746LIBS = `helenos-pkg-config --libs libgui libdraw libmath`
    … …  
    5655
    5756$(output): $(objects)
    58         $(LD) -o $@ $^ $(LIBS)
     57        $(CC) -o $@ $^ $(LIBS)
    5958
    6059%.o: %.c

  • 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.