summaryrefslogtreecommitdiff
authorkergoth <kergoth>2002-11-06 22:46:03 (UTC)
committer kergoth <kergoth>2002-11-06 22:46:03 (UTC)
commitb6a55a339cf2d5829a9f13bf0bd50899c811f54d (patch) (unidiff)
tree30fc7cecfa669a18ef10fd9168678b020b40e101
parente44cdb16632a4c904d8c43471fea1f8e790c7651 (diff)
downloadopie-b6a55a339cf2d5829a9f13bf0bd50899c811f54d.zip
opie-b6a55a339cf2d5829a9f13bf0bd50899c811f54d.tar.gz
opie-b6a55a339cf2d5829a9f13bf0bd50899c811f54d.tar.bz2
Use optimizations
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile.test6
-rw-r--r--config.in.in11
2 files changed, 17 insertions, 0 deletions
diff --git a/Makefile.test b/Makefile.test
index 11fec40..209eef3 100644
--- a/Makefile.test
+++ b/Makefile.test
@@ -1,105 +1,111 @@
1#!/usr/bin/make -f 1#!/usr/bin/make -f
2export OPIEDIR:=$(shell pwd) 2export OPIEDIR:=$(shell pwd)
3export TOPDIR:=$(OPIEDIR) 3export TOPDIR:=$(OPIEDIR)
4export QMAKE:=$(OPIEDIR)/qmake/qmake 4export QMAKE:=$(OPIEDIR)/qmake/qmake
5 5
6export QMAKESPECSDIR=$(OPIEDIR)/mkspecs 6export QMAKESPECSDIR=$(OPIEDIR)/mkspecs
7 7
8noconfig_targets := xconfig menuconfig config oldconfig randconfig \ 8noconfig_targets := xconfig menuconfig config oldconfig randconfig \
9 defconfig allyesconfig allnoconfig allmodconfig 9 defconfig allyesconfig allnoconfig allmodconfig
10 10
11configs += $(TOPDIR)/core/applets/restartapplet2/config.in $(TOPDIR)/core/applets/config.in $(TOPDIR)/core/apps/config.in $(TOPDIR)/core/multimedia/config.in $(TOPDIR)/core/pim/config.in $(TOPDIR)/core/pim/today/plugins/config.in $(TOPDIR)/core/settings/config.in $(TOPDIR)/core/config.in $(TOPDIR)/development/config.in $(TOPDIR)/inputmethods/config.in $(TOPDIR)/libopie/ofileselector/config.in $(TOPDIR)/libopie/pim/config.in $(TOPDIR)/libsql/config.in $(TOPDIR)/noncore/applets/config.in $(TOPDIR)/noncore/apps/opie-console/test/config.in $(TOPDIR)/noncore/apps/config.in $(TOPDIR)/noncore/comm/config.in $(TOPDIR)/noncore/decorations/config.in $(TOPDIR)/noncore/games/config.in $(TOPDIR)/noncore/graphics/config.in $(TOPDIR)/noncore/multimedia/config.in $(TOPDIR)/noncore/net/config.in $(TOPDIR)/noncore/net/opietooth/config.in $(TOPDIR)/noncore/settings/config.in $(TOPDIR)/noncore/styles/config.in $(TOPDIR)/noncore/tools/calc2/config.in $(TOPDIR)/noncore/tools/config.in $(TOPDIR)/noncore/unsupported/opiemail/ifaces/config.in $(TOPDIR)/noncore/unsupported/config.in $(TOPDIR)/noncore/config.in $(TOPDIR)/noncore/todayplugins/config.in $(TOPDIR)/config.in 11configs += $(TOPDIR)/core/applets/restartapplet2/config.in $(TOPDIR)/core/applets/config.in $(TOPDIR)/core/apps/config.in $(TOPDIR)/core/multimedia/config.in $(TOPDIR)/core/pim/config.in $(TOPDIR)/core/pim/today/plugins/config.in $(TOPDIR)/core/settings/config.in $(TOPDIR)/core/config.in $(TOPDIR)/development/config.in $(TOPDIR)/inputmethods/config.in $(TOPDIR)/libopie/ofileselector/config.in $(TOPDIR)/libopie/pim/config.in $(TOPDIR)/libsql/config.in $(TOPDIR)/noncore/applets/config.in $(TOPDIR)/noncore/apps/opie-console/test/config.in $(TOPDIR)/noncore/apps/config.in $(TOPDIR)/noncore/comm/config.in $(TOPDIR)/noncore/decorations/config.in $(TOPDIR)/noncore/games/config.in $(TOPDIR)/noncore/graphics/config.in $(TOPDIR)/noncore/multimedia/config.in $(TOPDIR)/noncore/net/config.in $(TOPDIR)/noncore/net/opietooth/config.in $(TOPDIR)/noncore/settings/config.in $(TOPDIR)/noncore/styles/config.in $(TOPDIR)/noncore/tools/calc2/config.in $(TOPDIR)/noncore/tools/config.in $(TOPDIR)/noncore/unsupported/opiemail/ifaces/config.in $(TOPDIR)/noncore/unsupported/config.in $(TOPDIR)/noncore/config.in $(TOPDIR)/noncore/todayplugins/config.in $(TOPDIR)/config.in
12 12
13# $(TOPDIR)/.config depends on .depends.cfgs, as it depends on $(configs) 13# $(TOPDIR)/.config depends on .depends.cfgs, as it depends on $(configs)
14# in order to have a full set of config.in files. 14# in order to have a full set of config.in files.
15# .depends depends on $(TOPDIR)/.config 15# .depends depends on $(TOPDIR)/.config
16# everything else depends on .depends, to ensure the dependencies are 16# everything else depends on .depends, to ensure the dependencies are
17# intact. 17# intact.
18# 18#
19# NOTE: The order in which things happen in this makefile is 19# NOTE: The order in which things happen in this makefile is
20 # -critical-. Do not rearrange this! 20 # -critical-. Do not rearrange this!
21 21
22all : $(TOPDIR)/.config 22all : $(TOPDIR)/.config
23 23
24$(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs 24$(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs
25 25
26all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs 26all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs
27 27
28clean-configs : $(TOPDIR)/.depends.cfgs 28clean-configs : $(TOPDIR)/.depends.cfgs
29 @echo "Wiping generated config.in files..." 29 @echo "Wiping generated config.in files..."
30 @-rm -f $(configs) 30 @-rm -f $(configs)
31 31
32-include $(TOPDIR)/.depends.cfgs 32-include $(TOPDIR)/.depends.cfgs
33 33
34all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs) 34all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs)
35 35
36$(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs) 36$(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs)
37 $(call descend,scripts/kconfig,conf) 37 $(call descend,scripts/kconfig,conf)
38 @if [ ! -e $@ ]; then \ 38 @if [ ! -e $@ ]; then \
39 cp $(TOPDIR)/def-configs/opie $@; \ 39 cp $(TOPDIR)/def-configs/opie $@; \
40 fi; 40 fi;
41 @$(MAKE) -C scripts/kconfig conf; 41 @$(MAKE) -C scripts/kconfig conf;
42 ./scripts/kconfig/conf -s ./config.in 42 ./scripts/kconfig/conf -s ./config.in
43 43
44# config rules must have the $(configs) var defined 44# config rules must have the $(configs) var defined
45# at the time that they run. we must ensure that .depends.cfgs 45# at the time that they run. we must ensure that .depends.cfgs
46# is built and included by the time we reach this point. 46# is built and included by the time we reach this point.
47 47
48xconfig : 48xconfig :
49 $(call descend,scripts/kconfig,qconf) 49 $(call descend,scripts/kconfig,qconf)
50 LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(TOPDIR)/scripts/kconfig \ 50 LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(TOPDIR)/scripts/kconfig \
51 ./scripts/kconfig/qconf ./config.in 51 ./scripts/kconfig/qconf ./config.in
52 52
53menuconfig : scripts/lxdialog/lxdialog 53menuconfig : scripts/lxdialog/lxdialog
54 $(call descend,scripts/kconfig,mconf) 54 $(call descend,scripts/kconfig,mconf)
55 ./scripts/kconfig/mconf ./config.in 55 ./scripts/kconfig/mconf ./config.in
56 56
57config : 57config :
58 $(call descend,scripts/kconfig,conf) 58 $(call descend,scripts/kconfig,conf)
59 ./scripts/kconfig/conf ./config.in 59 ./scripts/kconfig/conf ./config.in
60 60
61oldconfig : 61oldconfig :
62 $(call descend,scripts/kconfig,conf) 62 $(call descend,scripts/kconfig,conf)
63 ./scripts/kconfig/conf -o ./config.in 63 ./scripts/kconfig/conf -o ./config.in
64 64
65randconfig : 65randconfig :
66 $(call descend,scripts/kconfig,conf) 66 $(call descend,scripts/kconfig,conf)
67 ./scripts/kconfig/conf -r ./config.in 67 ./scripts/kconfig/conf -r ./config.in
68 68
69allyesconfig : 69allyesconfig :
70 $(call descend,scripts/kconfig,conf) 70 $(call descend,scripts/kconfig,conf)
71 ./scripts/kconfig/conf -y ./config.in 71 ./scripts/kconfig/conf -y ./config.in
72 72
73allnoconfig : 73allnoconfig :
74 $(call descend,scripts/kconfig,conf) 74 $(call descend,scripts/kconfig,conf)
75 ./scripts/kconfig/conf -n ./config.in 75 ./scripts/kconfig/conf -n ./config.in
76 76
77defconfig : 77defconfig :
78 $(call descend,scripts/kconfig,conf) 78 $(call descend,scripts/kconfig,conf)
79 ./scripts/kconfig/conf -d ./config.in 79 ./scripts/kconfig/conf -d ./config.in
80 80
81 81
82export 82export
83 83
84ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) 84ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
85 85
86export include-config := 1 86export include-config := 1
87 87
88-include $(TOPDIR)/.config 88-include $(TOPDIR)/.config
89-include $(TOPDIR)/.depends 89-include $(TOPDIR)/.depends
90 90
91endif 91endif
92 92
93-include $(TOPDIR)/..config.cmd 93-include $(TOPDIR)/..config.cmd
94 94
95export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE)) 95export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE))
96 96
97ifdef CONFIG_OPTIMIZATIONS
98export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS))
99export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE))
100$(warning CFLAGS_RELEASE is $(CFLAGS_RELEASE))
101endif
102
97all clean: $(subdir-y) 103all clean: $(subdir-y)
98 104
99$(subdir-y) : $(if $(CONFIG_LIBQPE),$(TOPDIR)/stamp-headers) \ 105$(subdir-y) : $(if $(CONFIG_LIBQPE),$(TOPDIR)/stamp-headers) \
100 $(if $(CONFIG_LIBQPE-X11),$(TOPDIR)/stamp-headers-x11) \ 106 $(if $(CONFIG_LIBQPE-X11),$(TOPDIR)/stamp-headers-x11) \
101 $(TOPDIR)/library/custom.h 107 $(TOPDIR)/library/custom.h
102 108
103clean : $(TOPDIR)/.config 109clean : $(TOPDIR)/.config
104 110
105include $(TOPDIR)/Rules.make 111include $(TOPDIR)/Rules.make
diff --git a/config.in.in b/config.in.in
index 7af1f17..679292f 100644
--- a/config.in.in
+++ b/config.in.in
@@ -1,62 +1,73 @@
1mainmenu "Opie Configuration" 1mainmenu "Opie Configuration"
2menu "Build Parameters" 2menu "Build Parameters"
3 3
4#choice 4#choice
5# prompt "Build Processor family" 5# prompt "Build Processor family"
6# default BUILD_X86 6# default BUILD_X86
7# help 7# help
8# Please select the architecture of the machine you will be 8# Please select the architecture of the machine you will be
9# building the OpenZaurus buildroot on. 9# building the OpenZaurus buildroot on.
10# 10#
11# config BUILD_X86 11# config BUILD_X86
12# boolean "X86 Architecture" 12# boolean "X86 Architecture"
13# 13#
14#endchoice 14#endchoice
15 15
16choice 16choice
17 prompt "Target Machine" 17 prompt "Target Machine"
18 default TARGET_X86 18 default TARGET_X86
19 help 19 help
20 Please select the architecture of the machine you will be 20 Please select the architecture of the machine you will be
21 building the OpenZaurus buildroot for. 21 building the OpenZaurus buildroot for.
22 22
23 config TARGET_X86 23 config TARGET_X86
24 boolean "Intel X86" 24 boolean "Intel X86"
25 25
26 config TARGET_SHARP 26 config TARGET_SHARP
27 boolean "Sharp Zaurus SL-5x00 - stock" 27 boolean "Sharp Zaurus SL-5x00 - stock"
28 28
29# config TARGET_OZ 29# config TARGET_OZ
30# boolean "Sharp Zaurus SL-5x00 - OpenZaurus" 30# boolean "Sharp Zaurus SL-5x00 - OpenZaurus"
31 31
32 config TARGET_IPAQ 32 config TARGET_IPAQ
33 boolean "Ipaq" 33 boolean "Ipaq"
34 34
35endchoice 35endchoice
36 36
37config OPTIMIZE
38 boolean "Use optimizations"
39 default "y" if ! TARGET_X86
40
37config SPECFILE 41config SPECFILE
38 string 42 string
39 default "qws/linux-generic-g++" if TARGET_X86 && (! X11) 43 default "qws/linux-generic-g++" if TARGET_X86 && (! X11)
40 default "linux-g++" if TARGET_X86 && X11 44 default "linux-g++" if TARGET_X86 && X11
41 default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11) 45 default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11)
42 default "linux-g++" if TARGET_SHARP && X11 46 default "linux-g++" if TARGET_SHARP && X11
43# default "linux-oz-g++" if TARGET_OZ 47# default "linux-oz-g++" if TARGET_OZ
44 default "qws/linux-ipaq-g++" if TARGET_IPAQ && (! X11) 48 default "qws/linux-ipaq-g++" if TARGET_IPAQ && (! X11)
45 default "linux-g++" if TARGET_IPAQ && X11 49 default "linux-g++" if TARGET_IPAQ && X11
46 50
47config CUSTOMFILE 51config CUSTOMFILE
48 string 52 string
49 default "custom-ipaq.h" if TARGET_IPAQ 53 default "custom-ipaq.h" if TARGET_IPAQ
50 default "custom-sharp.h" if TARGET_SHARP 54 default "custom-sharp.h" if TARGET_SHARP
51 55
56
57config OPTIMIZATIONS
58 string "Optimization flags"
59 depends OPTIMIZE
60 default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_IPAQ
61 default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SHARP
62
52#config CROSS 63#config CROSS
53# string "Crosscompilation prefix" 64# string "Crosscompilation prefix"
54# default "arm-linux-" 65# default "arm-linux-"
55# help 66# help
56# Crosscompilation prefix is the prefix which will be prepended 67# Crosscompilation prefix is the prefix which will be prepended
57# to all compilation commands. For example, a crosscompilation prefix 68# to all compilation commands. For example, a crosscompilation prefix
58# of arm-linux-, results in the build calling arm-linux-gcc as its CC. 69# of arm-linux-, results in the build calling arm-linux-gcc as its CC.
59 70
60endmenu 71endmenu
61 72
62@sources@ 73@sources@