Changeset 874ed210 in mainline for uspace


Ignore:
Timestamp:
2019-06-24T16:13:58Z (6 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
59d8235
Parents:
d86393c8
Message:

Fold assembler flags into cflags, for consistent behavior

This way —fatal-warning applies to custom assembly in C files as well,
e.g. inline asm, and to some of the attributes that change emitted
assembly.

Location:
uspace
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile.common

    rd86393c8 r874ed210  
    109109START_FILES = $(LIBC_PREFIX)/crt0.o $(LIBC_PREFIX)/crt1.o
    110110
    111 AFLAGS = --fatal-warnings
    112111LDFLAGS = -Wl,--fatal-warnings,--warn-common
    113112
    … …  
    194193        -Werror-implicit-function-declaration \
    195194        -Wsystem-headers \
    196         -Wunknown-pragmas
     195        -Wunknown-pragmas \
     196        -Wa,--fatal-warnings
    197197
    198198# XXX: -fno-builtin-strftime is for a seemingly spurious format warning.
    … …  
    299299LIB_LDFLAGS = $(LDFLAGS) -shared -Wl,-soname,$(LSONAME) -Wl,--no-undefined,--no-allow-shlib-undefined
    300300
    301 AS_CFLAGS := $(addprefix -Xassembler ,$(AFLAGS))
    302 
    303301OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    304302LOBJECTS := $(addsuffix .lo,$(basename $(SOURCES)))
    … …  
    386384
    387385%.o: %.S | depend
    388         $(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(AS_CFLAGS)
     386        $(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS)
    389387
    390388%.o: %.s | depend
    391         $(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(AS_CFLAGS)
     389        $(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS)
    392390
    393391%.o: %.c | depend
    … …  
    407405
    408406%.lo: %.S | depend
    409         $(CC_JOB) -c -MD -MP $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS) $(AS_CFLAGS)
     407        $(CC_JOB) -c -MD -MP $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS)
    410408
    411409%.lo: %.s | depend
    412         $(CC_JOB) -c -MD -MP $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS) $(AS_CFLAGS)
     410        $(CC_JOB) -c -MD -MP $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS)
    413411
    414412%.lo: %.c | depend

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

    rd86393c8 r874ed210  
    3333endif
    3434
    35 COMMON_CFLAGS += -mcpu=powerpc -m$(FLOATS)-float -m32 -Wl,-z,max-page-size=0x1000
    36 AFLAGS += -a32
    37 LDFLAGS += -Wl,--gc-sections
     35COMMON_CFLAGS += -mcpu=powerpc -m$(FLOATS)-float -m32 -Wa,-a32
     36LDFLAGS += -Wl,--gc-sections -Wl,-z,max-page-size=0x1000
    3837
    3938ENDIANESS = BE
Note: See TracChangeset for help on using the changeset viewer.