author | kergoth <kergoth> | 2002-11-06 22:46:03 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-11-06 22:46:03 (UTC) |
commit | b6a55a339cf2d5829a9f13bf0bd50899c811f54d (patch) (unidiff) | |
tree | 30fc7cecfa669a18ef10fd9168678b020b40e101 | |
parent | e44cdb16632a4c904d8c43471fea1f8e790c7651 (diff) | |
download | opie-b6a55a339cf2d5829a9f13bf0bd50899c811f54d.zip opie-b6a55a339cf2d5829a9f13bf0bd50899c811f54d.tar.gz opie-b6a55a339cf2d5829a9f13bf0bd50899c811f54d.tar.bz2 |
Use optimizations
-rw-r--r-- | Makefile.test | 6 | ||||
-rw-r--r-- | config.in.in | 11 |
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 | |||
@@ -65,41 +65,47 @@ oldconfig : | |||
65 | randconfig : | 65 | randconfig : |
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 | ||
69 | allyesconfig : | 69 | allyesconfig : |
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 | ||
73 | allnoconfig : | 73 | allnoconfig : |
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 | ||
77 | defconfig : | 77 | defconfig : |
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 | ||
82 | export | 82 | export |
83 | 83 | ||
84 | ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) | 84 | ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) |
85 | 85 | ||
86 | export include-config := 1 | 86 | export include-config := 1 |
87 | 87 | ||
88 | -include $(TOPDIR)/.config | 88 | -include $(TOPDIR)/.config |
89 | -include $(TOPDIR)/.depends | 89 | -include $(TOPDIR)/.depends |
90 | 90 | ||
91 | endif | 91 | endif |
92 | 92 | ||
93 | -include $(TOPDIR)/..config.cmd | 93 | -include $(TOPDIR)/..config.cmd |
94 | 94 | ||
95 | export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE)) | 95 | export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE)) |
96 | 96 | ||
97 | ifdef CONFIG_OPTIMIZATIONS | ||
98 | export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS)) | ||
99 | export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE)) | ||
100 | $(warning CFLAGS_RELEASE is $(CFLAGS_RELEASE)) | ||
101 | endif | ||
102 | |||
97 | all clean: $(subdir-y) | 103 | all 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 | ||
103 | clean : $(TOPDIR)/.config | 109 | clean : $(TOPDIR)/.config |
104 | 110 | ||
105 | include $(TOPDIR)/Rules.make | 111 | include $(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 | |||
@@ -5,58 +5,69 @@ menu "Build Parameters" | |||
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 | ||
16 | choice | 16 | choice |
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 | ||
35 | endchoice | 35 | endchoice |
36 | 36 | ||
37 | config OPTIMIZE | ||
38 | boolean "Use optimizations" | ||
39 | default "y" if ! TARGET_X86 | ||
40 | |||
37 | config SPECFILE | 41 | config 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 | ||
47 | config CUSTOMFILE | 51 | config 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 | |||
57 | config 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 | ||
60 | endmenu | 71 | endmenu |
61 | 72 | ||
62 | @sources@ | 73 | @sources@ |