mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 23:42:43 +00:00
build: include the cpu type as part of the toolchain/target directory name
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 38214
This commit is contained in:
parent
0db9125157
commit
e0189ccef4
@ -254,6 +254,7 @@ define BuildTargets/DumpCurrent
|
||||
echo 'Target-Features: $(FEATURES)'; \
|
||||
echo 'Target-Depends: $(DEPENDS)'; \
|
||||
echo 'Target-Optimization: $(if $(CFLAGS),$(CFLAGS),$(DEFAULT_CFLAGS))'; \
|
||||
echo 'CPU-Type: $(CPU_TYPE)$(if $(CPU_SUBTYPE),+$(CPU_SUBTYPE))'; \
|
||||
echo 'Linux-Version: $(LINUX_VERSION)'; \
|
||||
echo 'Linux-Release: $(LINUX_RELEASE)'; \
|
||||
echo 'Linux-Kernel-Arch: $(LINUX_KARCH)'; \
|
||||
|
15
rules.mk
15
rules.mk
@ -54,22 +54,15 @@ endif
|
||||
|
||||
HOST_FPIC:=-fPIC
|
||||
|
||||
ARCH_SUFFIX:=
|
||||
ARCH_SUFFIX:=$(call qstrip,$(CONFIG_CPU_TYPE))
|
||||
GCC_ARCH:=
|
||||
|
||||
ifneq ($(ARCH_SUFFIX),)
|
||||
ARCH_SUFFIX:=_$(ARCH_SUFFIX)
|
||||
endif
|
||||
ifneq ($(filter -march=armv%,$(TARGET_OPTIMIZATION)),)
|
||||
ARCH_SUFFIX:=_$(patsubst -march=arm%,%,$(filter -march=armv%,$(TARGET_OPTIMIZATION)))
|
||||
GCC_ARCH:=$(patsubst -march=%,%,$(filter -march=armv%,$(TARGET_OPTIMIZATION)))
|
||||
endif
|
||||
ifneq ($(filter -mips%r2,$(TARGET_OPTIMIZATION)),)
|
||||
ARCH_SUFFIX:=_r2
|
||||
endif
|
||||
ifneq ($(filter -mdsp,$(TARGET_OPTIMIZATION)),)
|
||||
ARCH_SUFFIX:=$(ARCH_SUFFIX)_dsp
|
||||
endif
|
||||
ifneq ($(filter -mdspr2,$(TARGET_OPTIMIZATION)),)
|
||||
ARCH_SUFFIX:=$(ARCH_SUFFIX)_dspr2
|
||||
endif
|
||||
ifdef CONFIG_HAS_SPE_FPU
|
||||
TARGET_SUFFIX:=$(TARGET_SUFFIX)spe
|
||||
endif
|
||||
|
@ -53,6 +53,7 @@ sub parse_target_metadata() {
|
||||
/^Target-Depends:\s*(.+)\s*$/ and $target->{depends} = [ split(/\s+/, $1) ];
|
||||
/^Target-Description:/ and $target->{desc} = get_multiline(*FILE);
|
||||
/^Target-Optimization:\s*(.+)\s*$/ and $target->{cflags} = $1;
|
||||
/^CPU-Type:\s*(.+)\s*$/ and $target->{cputype} = $1;
|
||||
/^Linux-Version:\s*(.+)\s*$/ and $target->{version} = $1;
|
||||
/^Linux-Release:\s*(.+)\s*$/ and $target->{release} = $1;
|
||||
/^Linux-Kernel-Arch:\s*(.+)\s*$/ and $target->{karch} = $1;
|
||||
@ -372,6 +373,16 @@ EOF
|
||||
print "\tdefault \"".$target->{cflags}."\" if TARGET_".$target->{conf}."\n";
|
||||
}
|
||||
print "\tdefault \"-Os -pipe -funit-at-a-time\"\n";
|
||||
print <<EOF;
|
||||
|
||||
config CPU_TYPE
|
||||
string
|
||||
EOF
|
||||
foreach my $target (@target) {
|
||||
next if @{$target->{subtargets}} > 0;
|
||||
print "\tdefault \"".$target->{cputype}."\" if TARGET_".$target->{conf}."\n";
|
||||
}
|
||||
print "\tdefault \"\"\n";
|
||||
|
||||
my %kver;
|
||||
foreach my $target (@target) {
|
||||
|
Loading…
Reference in New Issue
Block a user