From cb69bfec92a22e100fb2bc89d0f86f41dfe88d59 Mon Sep 17 00:00:00 2001 From: NicJA Date: Mon, 15 Apr 2019 22:01:53 +0000 Subject: [PATCH] make.tmpl - fix a typo and remove the additional strips. target.cfg.in - move the kernel/target definitions into their own sections. add kernel isa flags. configure(.in) - expose the kernel isa flags. git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@56264 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- config/make.tmpl | 12 +++---- config/target.cfg.in | 100 ++++++++++++++++++++++++++++++--------------------- configure | 8 +++-- configure.in | 7 ++-- 4 files changed, 76 insertions(+), 51 deletions(-) diff --git a/config/make.tmpl b/config/make.tmpl index 577792ece8..0ad4588a65 100644 --- a/config/make.tmpl +++ b/config/make.tmpl @@ -3551,10 +3551,10 @@ else endif ifeq (%(compiler),host) - BD_LDFLAGS := $(strip -L$(CROSSTOOLSDIR)/lib $(USER_LDFLAGS) %(extraldflags)) - BD_CFLAGS := $(strip $(HOST_CFLAGS) -I$(CROSSTOOLSDIR)/include %(extracflags)) - BD_CXXFLAGS := $(strip $(HOST_CXXFLAGS) -I$(CROSSTOOLSDIR)/include %(extracxxflags)) - BD_CPPFLAGS := $(strip $(HOST_CPPFLAGS) %(extracppflags)) + BD_LDFLAGS := -L$(CROSSTOOLSDIR)/lib $(USER_LDFLAGS) %(extraldflags) + BD_CFLAGS := $(HOST_CFLAGS) -I$(CROSSTOOLSDIR)/include %(extracflags) + BD_CXXFLAGS := $(HOST_CXXFLAGS) -I$(CROSSTOOLSDIR)/include %(extracxxflags) + BD_CPPFLAGS := $(HOST_CPPFLAGS) %(extracppflags) %(mmake)-cmake_opts := -DCMAKE_INSTALL_PREFIX=$(%(mmake)-prefix) -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER="$(strip $(HOST_DEF_CC))" ifeq (%(usecflags),yes) %(mmake)-cmake_opts += -DCMAKE_C_FLAGS="$(strip $(BD_CFLAGS))" @@ -3563,7 +3563,7 @@ ifeq (%(compiler),host) %(mmake)-cmake_opts += -DCMAKE_CPP_FLAGS="$(strip $(BD_CPPFLAGS))" endif %(mmake)-cmake_opts += -DCMAKE_CXX_COMPILER="$(strip $(HOST_CXX))" - ifeq (%(usecflags),yes) + ifeq (%(usecxxflags),yes) %(mmake)-cmake_opts += -DCMAKE_CXX_FLAGS="$(strip $(BD_CXXFLAGS))" endif ifeq (%(package),) @@ -3583,7 +3583,7 @@ else ifeq (%(usecppflags),yes) %(mmake)-cmake_opts += -DCMAKE_CPP_FLAGS="$(strip $(BD_CPPFLAGS))" endif - ifeq (%(usecflags),yes) + ifeq (%(usecxxflags),yes) %(mmake)-cmake_opts += -DCMAKE_CXX_FLAGS="$(strip $(BD_CXXFLAGS))" endif %(mmake)-cmake_opts += -DCMAKE_EXE_LINKER_FLAGS="$(strip $(BD_LDFLAGS))" diff --git a/config/target.cfg.in b/config/target.cfg.in index 413971ab99..9cb4a35cb4 100644 --- a/config/target.cfg.in +++ b/config/target.cfg.in @@ -5,33 +5,84 @@ # # -------------------------------------------------------------------------- -# TARGET SECTION +# TARGET CONFIG SECTION # -------------------------------------------------------------------------- + FAMILY := @aros_target_family@ FLAVOUR := @aros_flavour@ SHARED_MOD := @aros_shared_default@ +# MMU flags +USE_MMU := @aros_enable_mmu@ + +# Defined as 'yes' if we can build our own toolchain. +# This is a prerequisite for ObjectiveC and C++ support, +# since they depend on the AROS C Library +AROS_TARGET_TOOLCHAIN := @aros_target_toolchain@ + +# The toolchain family to build +AROS_TOOLCHAIN := @aros_toolchain@ + TARGET_BINUTILS_VER := @target_binutils_version@ TARGET_GCC_VER := @target_gcc_version@ -TARGET_CPP := @aros_target_cpp@ +# Bootloader to use on platforms that support it +AROS_TARGET_BOOTLOADER := @aros_target_bootloader@ + +PCI_HIDD_TARGET := @pci_hidd_target@ +CROSSTOOLS_TARGET := @crosstools_target@ +OBJC_TARGET := @objc_target@ +JAVA_TARGET := @java_target@ +@aros_target_options@ +ENABLE_DBUS := @ENABLE_DBUS@ + +# -------------------------------------------------------------------------- +# KERNEL TOOLCHAIN SECTION +# -------------------------------------------------------------------------- + KERNEL_CPP := @aros_kernel_cpp@ -TARGET_CC := $(CC_PREFIX) @aros_target_cc@ KERNEL_CC := @aros_kernel_cc@ -TARGET_CXX := @aros_target_cxx@ KERNEL_CXX := @aros_target_cxx@ +KERNEL_LD := @aros_kernel_ld@ + +KERNEL_RESCOMP := @aros_kernel_rescomp@ + +KERNEL_SYSROOT = @aros_kernel_sysroot@ + +KERNEL_CPPFLAGS = @aros_kernel_cppflags@ +KERNEL_CFLAGS = @aros_kernel_cflags@ +KERNEL_OBJCFLAGS := @aros_kernel_objcflags@ +KERNEL_INCLUDES := @aros_kernel_includes@ +KERNEL_LDFLAGS := @aros_kernel_ldflags@ + +KERNEL_ISA_FLAGS = @aros_kernel_isa_flags@ +KERNEL_ISA_CFLAGS = $(KERNEL_ISA_FLAGS) +KERNEL_ISA_CXXFLAGS = $(KERNEL_ISA_FLAGS) +KERNEL_ISA_OBJCFLAGS = $(KERNEL_ISA_FLAGS) +KERNEL_ISA_AFLAGS = $(KERNEL_ISA_FLAGS) + +KERNEL_IQUOTE = @kernel_cflags_iquote@ +KERNEL_IQUOTE_END = @kernel_cflags_iquote_end@ + +KERNEL_AR := @aros_kernel_ar@ +KERNEL_RANLIB := @aros_kernel_ranlib@ + +# -------------------------------------------------------------------------- +# TARGET TOOLCHAIN SECTION +# -------------------------------------------------------------------------- + +TARGET_CPP := @aros_target_cpp@ +TARGET_CC := $(CC_PREFIX) @aros_target_cc@ +TARGET_CXX := @aros_target_cxx@ TARGET_AS := @aros_target_as@ TARGET_LD := @aros_target_ld@ SHARED_LD := @aros_shared_ld@ -KERNEL_LD := @aros_kernel_ld@ GENMAP := @aros_target_genmap@ TARGET_OBJCOPY := @aros_target_objcopy@ TARGET_DEF_STRIP := @aros_target_strip@ @aros_target_strip_flags@ TARGET_OBJDUMP := @aros_target_objdump@ -KERNEL_RESCOMP := @aros_kernel_rescomp@ - CONFIG_NOWARN_CFLAGS = $(foreach nowarn,@aros_nowarn_flags@,$($(nowarn))) CONFIG_WARN_CFLAGS := @aros_warn_flags@ @@ -39,7 +90,6 @@ CONFIG_NOWARN_CXXFLAGS = $(foreach nowarn,$(subst NOWARN_POINTER_SIGN,,@a CONFIG_WARN_CXXFLAGS := $(subst -Werror-implicit-function-declaration,,@aros_warn_flags@) TARGET_SYSROOT = $(COMPILER_SYSROOT) -KERNEL_SYSROOT = @aros_kernel_sysroot@ CONFIG_BASE_CFLAGS = @aros_config_cflags@ $(CONFIG_NOWARN_CFLAGS) CONFIG_BASE_CXXFLAGS = @aros_config_cxxflags@ $(CONFIG_NOWARN_CXXFLAGS) CONFIG_BASE_CPPFLAGS = @aros_config_cppflags@ @@ -51,11 +101,6 @@ CONFIG_LDFLAGS := @aros_config_ldflags@ SHARED_CFLAGS := @aros_shared_cflags@ SHARED_AFLAGS := @aros_shared_aflags@ SHARED_LDFLAGS := @aros_shared_ldflags@ -KERNEL_CPPFLAGS = @aros_kernel_cppflags@ -KERNEL_CFLAGS = @aros_kernel_cflags@ -KERNEL_OBJCFLAGS := @aros_kernel_objcflags@ -KERNEL_INCLUDES := @aros_kernel_includes@ -KERNEL_LDFLAGS := @aros_kernel_ldflags@ TARGET_CFLAGS = $(OPTIMIZATION_CFLAGS) $(CONFIG_CFLAGS) $(USER_CFLAGS) TARGET_CXXFLAGS = $(OPTIMIZATION_CFLAGS) $(CONFIG_CXXFLAGS) $(USER_CXXFLAGS) TARGET_CPPFLAGS = $(USER_INCLUDES) $(CONFIG_CPPFLAGS) $(USER_CPPFLAGS) @@ -70,6 +115,7 @@ OPTIMIZATION_CFLAGS := @aros_optimization_cflags@ TARGET_ISA_CFLAGS = $(ISA_FLAGS) TARGET_ISA_CXXFLAGS = $(ISA_FLAGS) +TARGET_ISA_OBJCFLAGS = $(TARGET_ISA_CFLAGS) TARGET_ISA_AFLAGS = $(ISA_FLAGS) TARGET_LIBATOMIC = @use_libatomic@ @@ -82,8 +128,6 @@ FUNCINSTR_FLAGS = $(CFLAGS_INSTR_FUNCTIONS) FUNCINSTR_LIBS = instrfunc NOSTDINC_CFLAGS := @aros_target_nostdinc_cflags@ -KERNEL_IQUOTE = @kernel_cflags_iquote@ -KERNEL_IQUOTE_END = @kernel_cflags_iquote_end@ NOSTARTUP_LDFLAGS := @aros_target_nostartup_ldflags@ NIX_LDFLAGS := @aros_target_nix_ldflags@ DETACH_LDFLAGS := @aros_target_detach_ldflags@ @@ -91,9 +135,7 @@ NOSTDLIB_LDFLAGS := @aros_target_nostdlib_ldflags@ AR := @aros_target_ar@ AR_PLAIN := @aros_plain_ar@ -KERNEL_AR := @aros_kernel_ar@ RANLIB := @aros_target_ranlib@ -KERNEL_RANLIB := @aros_kernel_ranlib@ NM := @aros_target_nm@ NM_PLAIN := @aros_plain_nm@ OBJCOPY := @aros_target_objcopy@ @@ -114,27 +156,3 @@ CPU := $(AROS_TARGET_CPU) CPU_MODE := $(AROS_TARGET_CPU_MODE) CC := $(TARGET_CC) AS := $(TARGET_AS) - -# MMU flags -USE_MMU := @aros_enable_mmu@ - -# -------------------------------------------------------------------------- -# Optional components - -# Defined as 'yes' if we can build our own toolchain. -# This is a prerequisite for ObjectiveC and C++ support, -# since they depend on the AROS C Library -AROS_TARGET_TOOLCHAIN := @aros_target_toolchain@ - -# The toolchain family to build -AROS_TOOLCHAIN := @aros_toolchain@ - -# Bootloader to use on platforms that support it -AROS_TARGET_BOOTLOADER := @aros_target_bootloader@ - -PCI_HIDD_TARGET := @pci_hidd_target@ -CROSSTOOLS_TARGET := @crosstools_target@ -OBJC_TARGET := @objc_target@ -JAVA_TARGET := @java_target@ -@aros_target_options@ -ENABLE_DBUS := @ENABLE_DBUS@ diff --git a/configure b/configure index 011b0e43f7..ff5ea7b7d7 100755 --- a/configure +++ b/configure @@ -669,6 +669,7 @@ crosstools_cxx_target crosstools_target aros_isa_flags aros_isa_extra +aros_kernel_isa_flags aros_optimization_cflags aros_config_coverage aros_config_lto @@ -7800,6 +7801,7 @@ aros_elf_translate= aros_warn_flags= aros_isa_extra= aros_isa_flags= +aros_kernel_isaflags= aros_config_cppflags= aros_config_cflags= aros_config_cxxflags= @@ -14273,7 +14275,7 @@ fi if test "$kernel_tool_prefix" = "none" ; then # No kernel tools specified - # Assume target tools == kernel tools with ELF wrapper + # Assume kernel tools == target tools with ELF wrapper aros_kernel_cc=$orig_target_cc aros_kernel_cxx=$orig_target_cxx aros_kernel_cpp=$orig_target_cpp @@ -14285,6 +14287,7 @@ if test "$kernel_tool_prefix" = "none" ; then aros_kernel_strip=$orig_target_strip aros_kernel_objcopy=$orig_target_objcopy aros_kernel_objdump=$orig_target_objdump + aros_kernel_isa_flags=$aros_isa_flags use_kernel_cc_wrapper=yes fi @@ -15763,6 +15766,7 @@ fi + # Native version related @@ -15833,7 +15837,7 @@ fi -#X11 related +#SDL related diff --git a/configure.in b/configure.in index ce4dd3b39b..95e2df3c96 100644 --- a/configure.in +++ b/configure.in @@ -726,6 +726,7 @@ aros_elf_translate= aros_warn_flags= aros_isa_extra= aros_isa_flags= +aros_kernel_isaflags= aros_config_cppflags= aros_config_cflags= aros_config_cxxflags= @@ -2446,7 +2447,7 @@ fi if test "$kernel_tool_prefix" = "none" ; then # No kernel tools specified - # Assume target tools == kernel tools with ELF wrapper + # Assume kernel tools == target tools with ELF wrapper aros_kernel_cc=$orig_target_cc aros_kernel_cxx=$orig_target_cxx aros_kernel_cpp=$orig_target_cpp @@ -2458,6 +2459,7 @@ if test "$kernel_tool_prefix" = "none" ; then aros_kernel_strip=$orig_target_strip aros_kernel_objcopy=$orig_target_objcopy aros_kernel_objdump=$orig_target_objdump + aros_kernel_isa_flags=$aros_isa_flags use_kernel_cc_wrapper=yes fi @@ -3187,6 +3189,7 @@ AC_SUBST(aros_target_strip_flags) AC_SUBST(aros_config_lto) AC_SUBST(aros_config_coverage) AC_SUBST(aros_optimization_cflags) +AC_SUBST(aros_kernel_isa_flags) AC_SUBST(aros_isa_extra) AC_SUBST(aros_isa_flags) @@ -3271,7 +3274,7 @@ AC_SUBST(DO_VIDMODE_SUPPORT) AC_SUBST(aros_host_x11_cflags) AC_SUBST(aros_host_x11_ldflags) -#X11 related +#SDL related AC_SUBST(aros_host_sdl_cflags) AC_SUBST(aros_host_sdl_libs) -- 2.11.4.GIT