- Move preferred stack boundary = 2^2 out of the OPTIMIZE switch, because it's always defined.

- Remove assumption that GDB=1 automatically means -O0. This is wrong, optimization and debugger should be controlled independently.
- Cleanup blah-blah from config.template.rbuild.

svn path=/trunk/; revision=31435
This commit is contained in:
Aleksey Bragin 2007-12-25 16:22:20 +00:00
parent 36e97b472a
commit c9c1def2a8
2 changed files with 24 additions and 34 deletions

View file

@ -15,31 +15,25 @@
<property name="NTOSKRNL_SHARED" value="-Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -shared"/> <property name="NTOSKRNL_SHARED" value="-Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -shared"/>
<if property="GDB" value="0"> <if property="OPTIMIZE" value="1">
<if property="OPTIMIZE" value="1"> <compilerflag>-Os</compilerflag>
<compilerflag>-Os</compilerflag> <compilerflag>-ftracer</compilerflag>
<compilerflag>-ftracer</compilerflag> <compilerflag>-momit-leaf-frame-pointer</compilerflag>
<compilerflag>-momit-leaf-frame-pointer</compilerflag> </if>
<compilerflag>-mpreferred-stack-boundary=2</compilerflag> <if property="OPTIMIZE" value="2">
</if> <compilerflag>-Os</compilerflag>
<if property="OPTIMIZE" value="2"> </if>
<compilerflag>-Os</compilerflag> <if property="OPTIMIZE" value="3">
<compilerflag>-mpreferred-stack-boundary=2</compilerflag> <compilerflag>-O1</compilerflag>
</if> </if>
<if property="OPTIMIZE" value="3"> <if property="OPTIMIZE" value="4">
<compilerflag>-O1</compilerflag> <compilerflag>-O2</compilerflag>
<compilerflag>-mpreferred-stack-boundary=2</compilerflag> </if>
</if> <if property="OPTIMIZE" value="5">
<if property="OPTIMIZE" value="4"> <compilerflag>-O3</compilerflag>
<compilerflag>-O2</compilerflag>
<compilerflag>-mpreferred-stack-boundary=2</compilerflag>
</if>
<if property="OPTIMIZE" value="5">
<compilerflag>-O3</compilerflag>
<compilerflag>-mpreferred-stack-boundary=2</compilerflag>
</if>
</if> </if>
<compilerflag>-mpreferred-stack-boundary=2</compilerflag>
<compilerflag>-Wno-strict-aliasing</compilerflag> <compilerflag>-Wno-strict-aliasing</compilerflag>
<compilerflag>-Wpointer-arith</compilerflag> <compilerflag>-Wpointer-arith</compilerflag>
<linkerflag>-enable-stdcall-fixup</linkerflag> <linkerflag>-enable-stdcall-fixup</linkerflag>

View file

@ -31,17 +31,13 @@
<!-- <!--
OPTIMIZE what level do you want ReactOS to be optimized at What level of optimisation to use.
this setting does not work if GDB is set 0 = off (will not work)
0 = off 1 = Default option, optimize for size (-Os) with some additional options
1 = Normal compiling recommended, is default setting in official build and debug build 2 = -Os
3 = -O1
warning : 2,3,4,5 is not tested on ReactOS. Change at own risk. 4 = -O2
5 = -O3
2 = gcc -Oz with -mpreferred-stack-boundary=2
3 = gcc -O1 with -mpreferred-stack-boundary=2
4 = gcc -O2 with -mpreferred-stack-boundary=2
5 = gcc -O3 with -mpreferred-stack-boundary=2
--> -->
<property name="OPTIMIZE" value="1" /> <property name="OPTIMIZE" value="1" />