qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 21:00:37 +02:00
Code

move cflags default setting to target makefiles

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14866 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2009-03-14 03:17:06 +00:00
parent dce670f0f9
commit 3ce8595b78
6 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/target.mk
View File

@ -150,6 +150,13 @@ ifeq ($(DUMP),1)
# remove duplicates # remove duplicates
FEATURES:=$(sort $(FEATURES)) FEATURES:=$(sort $(FEATURES))
endif endif
DEFAULT_CFLAGS_i386=-O2 -pipe -march=i486 -funit-at-a-time
DEFAULT_CFLAGS_x86_64=-O2 -pipe -march=athlon64 -funit-at-a-time
DEFAULT_CFLAGS_mips=-Os -pipe -mips32 -mtune=mips32 -funit-at-a-time
DEFAULT_CFLAGS_mipsel=$(DEFAULT_CFLAGS_mips)
DEFAULT_CFLAGS_arm=-Os -pipe -march=armv5te -mtune=xscale -funit-at-a-time
DEFAULT_CFLAGS_armeb=$(DEFAULT_CFLAGS_arm)
DEFAULT_CFLAGS=$(if $(DEFAULT_CFLAGS_$(ARCH)),$(DEFAULT_CFLAGS_$(ARCH)),-Os -pipe -funit-at-a-time)
endif endif
define BuildTargets/DumpCurrent define BuildTargets/DumpCurrent
@ -163,6 +170,7 @@ define BuildTargets/DumpCurrent
echo 'Target-Arch: $(ARCH)'; \ echo 'Target-Arch: $(ARCH)'; \
echo 'Target-Features: $(FEATURES)'; \ echo 'Target-Features: $(FEATURES)'; \
echo 'Target-Depends: $(DEPENDS)'; \ echo 'Target-Depends: $(DEPENDS)'; \
echo 'Target-Optimization: $(if $(CFLAGS),$(CFLAGS),$(DEFAULT_CFLAGS))'; \
echo 'Linux-Version: $(LINUX_VERSION)'; \ echo 'Linux-Version: $(LINUX_VERSION)'; \
echo 'Linux-Release: $(LINUX_RELEASE)'; \ echo 'Linux-Release: $(LINUX_RELEASE)'; \
echo 'Linux-Kernel-Arch: $(LINUX_KARCH)'; \ echo 'Linux-Kernel-Arch: $(LINUX_KARCH)'; \

1
rules.mk
View File

@ -29,6 +29,7 @@ confvar=$(call merge,$(foreach v,$(1),$(if $($(v)),y,n)))
strip_last=$(patsubst %.$(lastword $(subst .,$(space),$(1))),%,$(1)) strip_last=$(patsubst %.$(lastword $(subst .,$(space),$(1))),%,$(1))
_SINGLE=export MAKEFLAGS=$(space); _SINGLE=export MAKEFLAGS=$(space);
CFLAGS:=
ARCH:=$(subst i486,i386,$(subst i586,i386,$(subst i686,i386,$(call qstrip,$(CONFIG_ARCH))))) ARCH:=$(subst i486,i386,$(subst i586,i386,$(subst i686,i386,$(call qstrip,$(CONFIG_ARCH)))))
BOARD:=$(call qstrip,$(CONFIG_TARGET_BOARD)) BOARD:=$(call qstrip,$(CONFIG_TARGET_BOARD))
TARGET_OPTIMIZATION:=$(call qstrip,$(CONFIG_TARGET_OPTIMIZATION)) TARGET_OPTIMIZATION:=$(call qstrip,$(CONFIG_TARGET_OPTIMIZATION))

13
scripts/metadata.pl
View File

@ -52,6 +52,7 @@ sub parse_target_metadata() {
/^Target-Features:\s*(.+)\s*$/ and $target->{features} = [ split(/\s+/, $1) ]; /^Target-Features:\s*(.+)\s*$/ and $target->{features} = [ split(/\s+/, $1) ];
/^Target-Depends:\s*(.+)\s*$/ and $target->{depends} = [ split(/\s+/, $1) ]; /^Target-Depends:\s*(.+)\s*$/ and $target->{depends} = [ split(/\s+/, $1) ];
/^Target-Description:/ and $target->{desc} = get_multiline(*FILE); /^Target-Description:/ and $target->{desc} = get_multiline(*FILE);
/^Target-Optimization:\s*(.+)\s*$/ and $target->{cflags} = $1;
/^Linux-Version:\s*(.+)\s*$/ and $target->{version} = $1; /^Linux-Version:\s*(.+)\s*$/ and $target->{version} = $1;
/^Linux-Release:\s*(.+)\s*$/ and $target->{release} = $1; /^Linux-Release:\s*(.+)\s*$/ and $target->{release} = $1;
/^Linux-Kernel-Arch:\s*(.+)\s*$/ and $target->{karch} = $1; /^Linux-Kernel-Arch:\s*(.+)\s*$/ and $target->{karch} = $1;
@ -325,6 +326,16 @@ EOF
foreach my $target (@target) { foreach my $target (@target) {
$target->{subtarget} or print "\t\tdefault \"".$target->{board}."\" if TARGET_".$target->{conf}."\n"; $target->{subtarget} or print "\t\tdefault \"".$target->{board}."\" if TARGET_".$target->{conf}."\n";
} }
print <<EOF;
config DEFAULT_TARGET_OPTIMIZATION
string
EOF
foreach my $target (@target) {
next if @{$target->{subtargets}} > 0;
print "\tdefault \"".$target->{cflags}."\" if TARGET_".$target->{conf}."\n";
}
print "\tdefault \"-Os -pipe -funit-at-a-time\"\n";
my %kver; my %kver;
foreach my $target (@target) { foreach my $target (@target) {
@ -332,8 +343,10 @@ EOF
next if $kver{$v}; next if $kver{$v};
$kver{$v} = 1; $kver{$v} = 1;
print <<EOF; print <<EOF;
config LINUX_$v config LINUX_$v
bool bool
EOF EOF
} }
foreach my $def (sort keys %defaults) { foreach my $def (sort keys %defaults) {

1
target/linux/ar71xx/Makefile
View File

@ -10,6 +10,7 @@ ARCH:=mips
BOARD:=ar71xx BOARD:=ar71xx
BOARDNAME:=Atheros AR71xx/AR913x BOARDNAME:=Atheros AR71xx/AR913x
FEATURES:=squashfs tgz FEATURES:=squashfs tgz
CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2 -funit-at-a-time
LINUX_VERSION:=2.6.28.7 LINUX_VERSION:=2.6.28.7

1
target/linux/storm/Makefile
View File

@ -10,6 +10,7 @@ ARCH:=arm
BOARD:=storm BOARD:=storm
BOARDNAME:=Storm SL3512 BOARDNAME:=Storm SL3512
FEATURES:=squashfs pci broken FEATURES:=squashfs pci broken
CFLAGS:=-Os -pipe -march=armv4 -mtune=arm9tdmi -funit-at-a-time
LINUX_VERSION:=2.6.23.17 LINUX_VERSION:=2.6.23.17

11
toolchain/Config.in
View File

@ -104,16 +104,7 @@ config SOFT_FLOAT
config TARGET_OPTIMIZATION config TARGET_OPTIMIZATION
string string
prompt "Target Optimizations" if TOOLCHAINOPTS prompt "Target Optimizations" if TOOLCHAINOPTS
default "-O2 -pipe -march=i686 -funit-at-a-time" if TARGET_x86_mediacenter default DEFAULT_TARGET_OPTIMIZATION
default "-O2 -pipe -march=i486 -funit-at-a-time" if TARGET_x86
default "-Os -pipe -march=i486 -funit-at-a-time" if TARGET_rdc
default "-Os -pipe -march=i486 -funit-at-a-time" if TARGET_uml && i386
default "-Os -pipe -march=athlon64 -funit-at-a-time" if TARGET_uml && x86_64
default "-Os -pipe -mips32r2 -mtune=mips32r2 -funit-at-a-time" if TARGET_ar71xx
default "-Os -pipe -mips32 -mtune=mips32 -funit-at-a-time" if mipsel || mips
default "-Os -pipe -march=armv5te -mtune=xscale -funit-at-a-time" if TARGET_ixp4xx || TARGET_iop32x || TARGET_pxa || TARGET_orion
default "-Os -pipe -march=armv4 -mtune=arm9tdmi -funit-at-a-time" if TARGET_storm
default "-Os -pipe -funit-at-a-time"
help help
Optimizations to use when building for the target host. Optimizations to use when building for the target host.