Switch from GCC to Clang.

BUG=18470793

Change-Id: I850fdd6314f0932c052e334f60ad4e272de51398
Reviewed-on: https://swiftshader-review.googlesource.com/1463
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>

diff --git a/src/Common/Debug.hpp b/src/Common/Debug.hpp
index c0e30dd..8d61583 100644 (file)
--- a/src/Common/Debug.hpp
+++ b/src/Common/Debug.hpp
@@ -21,7 +21,7 @@
 void trace(const char *format, ...);\r
 \r
 #ifndef NDEBUG\r
-       #define TRACE(format, ...) trace("[0x%0.8X]%s("format")\n", this, __FUNCTION__, ##__VA_ARGS__)\r
+       #define TRACE(format, ...) trace("[0x%0.8X]%s(" format ")\n", this, __FUNCTION__, ##__VA_ARGS__)\r
 #else\r
        #define TRACE(...) ((void)0)\r
 #endif\r
@@ -33,7 +33,7 @@ void trace(const char *format, ...);
 #endif\r
 \r
 #ifndef NDEBUG\r
-       #define ASSERT(expression) {if(!(expression)) trace("\t! Assert failed in %s(%d): "#expression"\n", __FUNCTION__, __LINE__); assert(expression);}\r
+       #define ASSERT(expression) {if(!(expression)) trace("\t! Assert failed in %s(%d): " #expression "\n", __FUNCTION__, __LINE__); assert(expression);}\r
 #else\r
        #define ASSERT assert\r
 #endif\r

diff --git a/src/LLVM/LLVM.cbp b/src/LLVM/LLVM.cbp
index 6f88cc6..b64d88d 100644 (file)
--- a/src/LLVM/LLVM.cbp
+++ b/src/LLVM/LLVM.cbp
@@ -4,14 +4,14 @@
        <Project>
                <Option title="LLVM" />
                <Option pch_mode="2" />
-               <Option compiler="gcc" />
+               <Option compiler="clang" />
                <Build>
                        <Target title="Debug x86">
                                <Option output="bin/x86/Debug/LLVM" prefix_auto="1" extension_auto="1" />
                                <Option working_dir="" />
                                <Option object_output="obj/x86/Debug/" />
                                <Option type="2" />
-                               <Option compiler="gcc" />
+                               <Option compiler="clang" />
                                <Option createDefFile="1" />
                                <Compiler>
                                        <Add option="-Wall" />
@@ -27,7 +27,7 @@
                                <Option working_dir="" />
                                <Option object_output="obj/x86/Release/" />
                                <Option type="2" />
-                               <Option compiler="gcc" />
+                               <Option compiler="clang" />
                                <Option createDefFile="1" />
                                <Compiler>
                                        <Add option="-march=i686" />
@@ -49,7 +49,7 @@
                                <Option working_dir="" />
                                <Option object_output="obj/x64/Debug/" />
                                <Option type="2" />
-                               <Option compiler="gcc" />
+                               <Option compiler="clang" />
                                <Option createDefFile="1" />
                                <Compiler>
                                        <Add option="-Wall" />
@@ -66,7 +66,7 @@
                                <Option working_dir="" />
                                <Option object_output="obj/x64/Release/" />
                                <Option type="2" />
-                               <Option compiler="gcc" />
+                               <Option compiler="clang" />
                                <Option createDefFile="1" />
                                <Compiler>
                                        <Add option="-march=core2" />
@@ -86,8 +86,8 @@
                        </Target>
                </Build>
                <Compiler>
-                       <Add option="-std=c++11" />
                        <Add option="-Wall" />
+                       <Add option="-std=c++11" />
                        <Add option="-fexceptions" />
                        <Add option="-fno-operator-names" />
                        <Add option="-msse2" />

diff --git a/src/OpenGL/libEGL/libEGL.cbp b/src/OpenGL/libEGL/libEGL.cbp
index 9f14a2e..73f44aa 100644 (file)
--- a/src/OpenGL/libEGL/libEGL.cbp
+++ b/src/OpenGL/libEGL/libEGL.cbp
@@ -4,13 +4,13 @@
        <Project>
                <Option title="libEGL" />
                <Option pch_mode="2" />
-               <Option compiler="gcc" />
+               <Option compiler="clang" />
                <Build>
                        <Target title="Debug x86">
                                <Option output="./../../../lib/Debug_x86/libEGL.so.1" prefix_auto="0" extension_auto="0" />
                                <Option object_output="obj/x86/Debug/" />
                                <Option type="3" />
-                               <Option compiler="gcc" />
+                               <Option compiler="clang" />
                                <Option createDefFile="1" />
                                <Option createStaticLib="1" />
                                <Compiler>
@@ -28,7 +28,7 @@
                                <Option output="./../../../lib/Release_x86/libEGL.so.1" prefix_auto="0" extension_auto="0" />
                                <Option object_output="obj/x86/Release/" />
                                <Option type="3" />
-                               <Option compiler="gcc" />
+                               <Option compiler="clang" />
                                <Option createDefFile="1" />
                                <Option createStaticLib="1" />
                                <Compiler>
@@ -49,7 +49,7 @@
                                <Option output="./../../../lib/Debug_x64/libEGL.so.1" prefix_auto="0" extension_auto="0" />
                                <Option object_output="obj/x64/Debug/" />
                                <Option type="3" />
-                               <Option compiler="gcc" />
+                               <Option compiler="clang" />
                                <Option createDefFile="1" />
                                <Option createStaticLib="1" />
                                <Compiler>
@@ -68,7 +68,7 @@
                                <Option output="./../../../lib/Release_x64/libEGL.so.1" prefix_auto="0" extension_auto="0" />
                                <Option object_output="obj/x64/Release/" />
                                <Option type="3" />
-                               <Option compiler="gcc" />
+                               <Option compiler="clang" />
                                <Option createDefFile="1" />
                                <Option createStaticLib="1" />
                                <Compiler>
@@ -89,8 +89,8 @@
                        </Target>
                </Build>
                <Compiler>
-                       <Add option="-std=c++11" />
                        <Add option="-Wall" />
+                       <Add option="-std=c++11" />
                        <Add option="-fexceptions" />
                        <Add directory="./../include/" />
                        <Add directory="./../" />

diff --git a/src/OpenGL/libGLESv2/libGLESv2.cbp b/src/OpenGL/libGLESv2/libGLESv2.cbp
index c7a4d1b..423a6fd 100644 (file)
--- a/src/OpenGL/libGLESv2/libGLESv2.cbp
+++ b/src/OpenGL/libGLESv2/libGLESv2.cbp
@@ -4,13 +4,13 @@
        <Project>
                <Option title="libGLESv2" />
                <Option pch_mode="2" />
-               <Option compiler="gcc" />
+               <Option compiler="clang" />
                <Build>
                        <Target title="Debug x86">
                                <Option output="./../../../lib/Debug_x86/libGLESv2.so.2" prefix_auto="0" extension_auto="0" />
                                <Option object_output="obj/x86/Debug/" />
                                <Option type="3" />
-                               <Option compiler="gcc" />
+                               <Option compiler="clang" />
                                <Option createDefFile="1" />
                                <Option createStaticLib="1" />
                                <Compiler>
@@ -29,7 +29,7 @@
                                <Option output="./../../../lib/Release_x86/libGLESv2.so.2" prefix_auto="0" extension_auto="0" />
                                <Option object_output="obj/x86/Release/" />
                                <Option type="3" />
-                               <Option compiler="gcc" />
+                               <Option compiler="clang" />
                                <Option createDefFile="1" />
                                <Option createStaticLib="1" />
                                <Compiler>
@@ -56,7 +56,7 @@
                                <Option output="./../../../lib/Debug_x64/libGLESv2.so.2" prefix_auto="0" extension_auto="0" />
                                <Option object_output="obj/x64/Debug/" />
                                <Option type="3" />
-                               <Option compiler="gcc" />
+                               <Option compiler="clang" />
                                <Option createDefFile="1" />
                                <Option createStaticLib="1" />
                                <Compiler>
@@ -76,7 +76,7 @@
                                <Option output="./../../../lib/Release_x64/libGLESv2.so.2" prefix_auto="0" extension_auto="0" />
                                <Option object_output="obj/x64/Release/" />
                                <Option type="3" />
-                               <Option compiler="gcc" />
+                               <Option compiler="clang" />
                                <Option createDefFile="1" />
                                <Option createStaticLib="1" />
                                <Compiler>
@@ -102,8 +102,8 @@
                        </Target>
                </Build>
                <Compiler>
-                       <Add option="-std=c++11" />
                        <Add option="-Wall" />
+                       <Add option="-std=c++11" />
                        <Add option="-fexceptions" />
                        <Add option="-fno-operator-names" />
                        <Add option="-msse2" />

diff --git a/tests/third_party/PowerVR/Examples/Beginner/01_HelloAPI/OGLES2/Build/OGLES2HelloAPI.cbp b/tests/third_party/PowerVR/Examples/Beginner/01_HelloAPI/OGLES2/Build/OGLES2HelloAPI.cbp
index 2cef791..1ab802f 100644 (file)
--- a/tests/third_party/PowerVR/Examples/Beginner/01_HelloAPI/OGLES2/Build/OGLES2HelloAPI.cbp
+++ b/tests/third_party/PowerVR/Examples/Beginner/01_HelloAPI/OGLES2/Build/OGLES2HelloAPI.cbp
@@ -4,13 +4,13 @@
        <Project>
                <Option title="OGLES2HelloAPI" />
                <Option pch_mode="2" />
-               <Option compiler="gcc" />
+               <Option compiler="clang" />
                <Build>
                        <Target title="Debug x86">
                                <Option output="bin/Debug_x86/OGLES2HelloAPI" prefix_auto="1" extension_auto="1" />
                                <Option object_output="obj/Debug_x86/" />
                                <Option type="1" />
-                               <Option compiler="gcc" />
+                               <Option compiler="clang" />
                                <Compiler>
                                        <Add option="-g" />
                                        <Add option="-m32" />
@@ -24,7 +24,7 @@
                                <Option output="bin/Release_x86/OGLES2HelloAPI" prefix_auto="1" extension_auto="1" />
                                <Option object_output="obj/Release_x86/" />
                                <Option type="1" />
-                               <Option compiler="gcc" />
+                               <Option compiler="clang" />
                                <Compiler>
                                        <Add option="-O2" />
                                        <Add option="-m32" />
@@ -40,7 +40,7 @@
                                <Option working_dir="../../../../../../../../lib/Debug_x64" />
                                <Option object_output="obj/Debug_x64/" />
                                <Option type="1" />
-                               <Option compiler="gcc" />
+                               <Option compiler="clang" />
                                <Compiler>
                                        <Add option="-g" />
                                </Compiler>
@@ -52,7 +52,7 @@
                                <Option output="bin/Release_x64/OGLES2HelloAPI" prefix_auto="1" extension_auto="1" />
                                <Option object_output="obj/Release_x64/" />
                                <Option type="1" />
-                               <Option compiler="gcc" />
+                               <Option compiler="clang" />
                                <Compiler>
                                        <Add option="-O2" />
                                </Compiler>
@@ -63,8 +63,8 @@
                        </Target>
                </Build>
                <Compiler>
-                       <Add option="-std=c++11" />
                        <Add option="-Wall" />
+                       <Add option="-std=c++11" />
                        <Add option="-fexceptions" />
                        <Add directory="../../../../../Builds/Include" />
                </Compiler>