Revision: 2748 Author: rowledge Date: 2013-07-15 14:59:10 -0700 (Mon, 15 Jul 2013) Log Message: ----------- wrap ARM specific bits in ENABLE_FAST_BLT
Modified Paths: -------------- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArm.c trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmLinux.c trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmOther.c trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimd.c trunk/platforms/Cross/plugins/BitBltPlugin/BitBltDispatch.c trunk/platforms/Cross/plugins/BitBltPlugin/BitBltGeneric.c
Modified: trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArm.c =================================================================== --- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArm.c 2013-07-12 23:30:49 UTC (rev 2747) +++ trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArm.c 2013-07-15 21:59:10 UTC (rev 2748) @@ -23,6 +23,7 @@ * */
+#if ENABLE_FAST_BLT #include "BitBltArm.h" #include "BitBltArmSimd.h"
@@ -34,3 +35,4 @@ if (armCpuFeatures & ARM_V6) addArmSimdFastPaths(); } +#endif /* ENABLE_FAST_BLT */
Modified: trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmLinux.c =================================================================== --- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmLinux.c 2013-07-12 23:30:49 UTC (rev 2747) +++ trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmLinux.c 2013-07-15 21:59:10 UTC (rev 2748) @@ -25,6 +25,7 @@ * An equivalent file will be required for other ARM platforms; see BitBtArmOther.c in this directory */
+#if ENABLE_FAST_BLT #include <unistd.h> #include <sys/types.h> #include <sys/stat.h> @@ -76,3 +77,4 @@
return features; } +#endif /* ENABLE_FAST_BLT */
Modified: trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmOther.c =================================================================== --- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmOther.c 2013-07-12 23:30:49 UTC (rev 2747) +++ trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmOther.c 2013-07-15 21:59:10 UTC (rev 2748) @@ -28,6 +28,7 @@ * see BitBtArmLinux.c in this directory as an example */
+#if ENABLE_FAST_BLT #include "BitBltArm.h"
/* There is no OS-neutral way of determining which type of ARM this is */ @@ -36,3 +37,4 @@ { return 0; } +#endif /* ENABLE_FAST_BLT */
Modified: trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimd.c =================================================================== --- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimd.c 2013-07-12 23:30:49 UTC (rev 2747) +++ trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimd.c 2013-07-15 21:59:10 UTC (rev 2748) @@ -23,6 +23,7 @@ * */
+#if ENABLE_FAST_BLT #include <stddef.h> #include <stdint.h>
@@ -261,3 +262,4 @@ { addFastPaths(fastPaths, sizeof fastPaths / sizeof *fastPaths); } +#endif /* ENABLE_FAST_BLT */
Modified: trunk/platforms/Cross/plugins/BitBltPlugin/BitBltDispatch.c =================================================================== --- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltDispatch.c 2013-07-12 23:30:49 UTC (rev 2747) +++ trunk/platforms/Cross/plugins/BitBltPlugin/BitBltDispatch.c 2013-07-15 21:59:10 UTC (rev 2748) @@ -23,6 +23,7 @@ * */
+#if ENABLE_FAST_BLT #include <stddef.h> #include<stdio.h> #include <stdlib.h> @@ -434,3 +435,4 @@ profile_record(storedCombinationRule, storedFlags, after - before); #endif } +#endif /* ENABLE_FAST_BLT */
Modified: trunk/platforms/Cross/plugins/BitBltPlugin/BitBltGeneric.c =================================================================== --- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltGeneric.c 2013-07-12 23:30:49 UTC (rev 2747) +++ trunk/platforms/Cross/plugins/BitBltPlugin/BitBltGeneric.c 2013-07-15 21:59:10 UTC (rev 2748) @@ -23,6 +23,7 @@ * */
+#if ENABLE_FAST_BLT #include <stddef.h> #include <stdio.h> #include <stdint.h> @@ -460,3 +461,4 @@ { addFastPaths(fastPaths, sizeof fastPaths / sizeof *fastPaths); } +#endif /* ENABLE_FAST_BLT */
vm-dev@lists.squeakfoundation.org