Author: fireball Date: Tue Dec 25 19:22:20 2007 New Revision: 31435
URL: http://svn.reactos.org/svn/reactos?rev=31435&view=rev Log: - 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.
Modified: trunk/reactos/ReactOS-i386.rbuild trunk/reactos/config.template.rbuild
Modified: trunk/reactos/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-i386.rbuild?rev=314... ============================================================================== --- trunk/reactos/ReactOS-i386.rbuild (original) +++ trunk/reactos/ReactOS-i386.rbuild Tue Dec 25 19:22:20 2007 @@ -15,31 +15,25 @@
<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"> - <compilerflag>-Os</compilerflag> - <compilerflag>-ftracer</compilerflag> - <compilerflag>-momit-leaf-frame-pointer</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - </if> - <if property="OPTIMIZE" value="2"> - <compilerflag>-Os</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - </if> - <if property="OPTIMIZE" value="3"> - <compilerflag>-O1</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - </if> - <if property="OPTIMIZE" value="4"> - <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 property="OPTIMIZE" value="1"> + <compilerflag>-Os</compilerflag> + <compilerflag>-ftracer</compilerflag> + <compilerflag>-momit-leaf-frame-pointer</compilerflag> + </if> + <if property="OPTIMIZE" value="2"> + <compilerflag>-Os</compilerflag> + </if> + <if property="OPTIMIZE" value="3"> + <compilerflag>-O1</compilerflag> + </if> + <if property="OPTIMIZE" value="4"> + <compilerflag>-O2</compilerflag> + </if> + <if property="OPTIMIZE" value="5"> + <compilerflag>-O3</compilerflag> </if>
+ <compilerflag>-mpreferred-stack-boundary=2</compilerflag> <compilerflag>-Wno-strict-aliasing</compilerflag> <compilerflag>-Wpointer-arith</compilerflag> <linkerflag>-enable-stdcall-fixup</linkerflag>
Modified: trunk/reactos/config.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config.template.rbuild?rev=... ============================================================================== --- trunk/reactos/config.template.rbuild (original) +++ trunk/reactos/config.template.rbuild Tue Dec 25 19:22:20 2007 @@ -31,17 +31,13 @@
<!-- - OPTIMIZE what level do you want ReactOS to be optimized at - this setting does not work if GDB is set - 0 = off - 1 = Normal compiling recommended, is default setting in official build and debug build - - warning : 2,3,4,5 is not tested on ReactOS. Change at own risk. - - 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 + What level of optimisation to use. + 0 = off (will not work) + 1 = Default option, optimize for size (-Os) with some additional options + 2 = -Os + 3 = -O1 + 4 = -O2 + 5 = -O3 --> <property name="OPTIMIZE" value="1" />