Changeset 8e2154e7 in mainline


Ignore:
Timestamp:
2018-07-05T21:41:25Z (7 years ago)
Author:
Dzejrou <dzejrou@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
74aee0c
Parents:
a37eeb9
git-author:
Dzejrou <dzejrou@…> (2018-06-28 17:36:35)
git-committer:
Dzejrou <dzejrou@…> (2018-07-05 21:41:25)
Message:

cpp: restructured build system to fix ia64 errors, renamed CPP* macros to CXX* macros to avoid possible conflicts with preprocessor macros

Files:
6 edited

Legend:

Unmodified
Added
Removed

  • tools/autotool.py

    ra37eeb9 r8e2154e7  
    323323
    324324        common['GCC'] = "%sgcc" % prefix
    325         common['GPP'] = "%sg++" % prefix
     325        common['GXX'] = "%sg++" % prefix
    326326
    327327        if (not path is None):
    328328                common['GCC'] = "%s/%s" % (path, common['GCC'])
    329                 common['GPP'] = "%s/%s" % (path, common['GPP'])
     329                common['GXX'] = "%s/%s" % (path, common['GXX'])
    330330
    331331        check_app([common['GCC'], "--version"], "GNU GCC", details)
    … …  
    616616                        common['CC_AUTOGEN'] = common['CC']
    617617
    618                         check_common(common, "GPP")
    619                         common['CPP'] = common['GPP']
     618                        check_common(common, "GXX")
     619                        common['CXX'] = common['GXX']
    620620
    621621                if (config['COMPILER'] == "gcc_native"):

  • uspace/Makefile.common

    ra37eeb9 r8e2154e7  
    237237
    238238# Flags for the compilation of C++ code.
    239 CPPFLAGS = $(LIBCPP_INCLUDES_FLAGS) $(INCLUDES_FLAGS) -O$(OPTIMIZATION) $(CPP_ARCHSPEC) \
     239CXX_BASE_LIBS = $(LIBCPP_PREFIX)/libcpp.a $(BASE_LIBS)
     240CXXFLAGS = $(LIBCPP_INCLUDES_FLAGS) $(INCLUDES_FLAGS) -O$(OPTIMIZATION) $(COMMON_CFLAGS) \
    240241        -imacros $(CONFIG_HEADER) \
    241242        -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
    … …  
    322323endif
    323324
     325ifneq ($(CXX_BINARY),)
     326$(CXX_BINARY): $(LINKER_SCRIPT) $(OBJECTS) $(LIBTAGS) $(CXX_BASE_LIBS)
     327        $(CXX) $(CXXFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) -T $(LINKER_SCRIPT) -Wl,-Map,$@.map -o $@ $(OBJECTS) $(LIBARGS) $(CXX_BASE_LIBS)
     328endif
     329
    324330ifneq ($(TEST_BINARY),)
    325331$(TEST_BINARY): $(LINKER_SCRIPT) $(TEST_OBJECTS) $(TEST_BINARY_LIBS) $(LIBTAGS) $(BASE_LIBS)
    … …  
    357363
    358364%.o: %.cpp | depend
    359         $(CPP) $(CPPFLAGS) $(EXTRA_CPPFLAGS) -c $< -o $@
     365        $(CXX) $(CXXFLAGS) $(EXTRA_CXXFLAGS) -c $< -o $@
    360366
    361367%.test.o: %.c | depend
    … …  
    372378
    373379%.lo: %.cpp | depend
    374         $(CPP) $(CPPFLAGS) $(EXTRA_CPPFLAGS) -c $< -o $@
     380        $(CXX) $(CXXFLAGS) $(EXTRA_CXXFLAGS) -c $< -o $@
    375381
    376382-include $(DEPENDS)

  • uspace/app/cpptest/Makefile

    ra37eeb9 r8e2154e7  
    2929USPACE_PREFIX = ../..
    3030
    31 # TODO: Force linker to link libcpp by default when linking cpp apps?
    32 LIBS = cpp
    33 
    34 BINARY = cpptest
     31CXX_BINARY = cpptest
    3532
    3633SOURCES = \

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

    ra37eeb9 r8e2154e7  
    3030COMMON_CFLAGS += -ffixed-r9 -mtp=soft -fno-omit-frame-pointer -mapcs-frame \
    3131        -march=$(subst _,-,$(PROCESSOR_ARCH))
    32 CPP_ARCHSPEC= -ffixed-r9 -mtp=soft -fno-omit-frame-pointer -mapcs-frame \
    33         -march=$(subst _,-,$(PROCESSOR_ARCH))
    3432
    3533LDFLAGS += -Wl,--gc-sections
    … …  
    3735ifeq ($(CONFIG_FPU),y)
    3836        COMMON_CFLAGS += -mfloat-abi=hard
    39         CPP_ARCHSPEC += -mfloat-abi=hard
    4037endif
    4138

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

    ra37eeb9 r8e2154e7  
    2828
    2929COMMON_CFLAGS += -msoft-float -mabi=32
    30 CPP_ARCHSPEC = -msoft-float -mabi=32
    3130AS_PROLOG = .module softfloat;.abicalls;
    3231LDFLAGS += -Wl,--gc-sections

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

    ra37eeb9 r8e2154e7  
    2828
    2929COMMON_CFLAGS += -msoft-float -mabi=32
    30 CPP_ARCHSPEC = -msoft-float -mabi=32
    3130AS_PROLOG = .module softfloat;.abicalls;
    3231LDFLAGS += -Wl,--gc-sections
Note: See TracChangeset for help on using the changeset viewer.