scons: ppc support.

diff --git a/SConstruct b/SConstruct
index c1dc62465191eb1794a076e3f4d0c756f2ad66e5..8c96817daefc04264a0a2863f2d1a02b9577272b 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -70,12 +70,14 @@ platform = env['platform']
 
 # derived options
 x86 = machine == 'x86'
+ppc = machine == 'ppc'
 gcc = platform in ('linux', 'freebsd', 'darwin')
 msvc = platform in ('windows', 'winddk')
 
 Export([
        'debug', 
        'x86', 
+       'ppc', 
        'dri', 
        'llvm',
        'platform',

diff --git a/common.py b/common.py
index dd64e0f434de0c6e9b8475cc174f95db43e0aa4e..cc2582f1a4ed5c713a46587423e462939cbc0ced 100644 (file)
--- a/common.py
+++ b/common.py
@@ -24,6 +24,7 @@ _machine_map = {
        'i486': 'x86',
        'i586': 'x86',
        'i686': 'x86',
+       'ppc' : 'ppc',
        'x86_64': 'x86_64',
 }
 if 'PROCESSOR_ARCHITECTURE' in os.environ:
@@ -56,7 +57,7 @@ def AddOptions(opts):
        opts.Add(BoolOption('profile', 'profile build', 'no'))
        #opts.Add(BoolOption('quiet', 'quiet command lines', 'no'))
        opts.Add(EnumOption('machine', 'use machine-specific assembly code', default_machine,
-                                                                                        allowed_values=('generic', 'x86', 'x86_64')))
+                                                                                        allowed_values=('generic', 'ppc', 'x86', 'x86_64')))
        opts.Add(EnumOption('platform', 'target platform', default_platform,
                                                                                         allowed_values=('linux', 'cell', 'windows', 'winddk', 'wince')))
        opts.Add(BoolOption('llvm', 'use LLVM', 'no'))

diff --git a/scons/gallium.py b/scons/gallium.py
index 3631607e666334770c58e2d9c110ac7d506db49b..2a42bdf2bb9def8a4c21e340704e4a6d0c8e8476 100644 (file)
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -175,6 +175,7 @@ def generate(env):
     machine = env['machine']
     platform = env['platform']
     x86 = env['machine'] == 'x86'
+    ppc = env['machine'] == 'ppc'
     gcc = env['platform'] in ('linux', 'freebsd', 'darwin')
     msvc = env['platform'] in ('windows', 'winddk', 'wince')
 

diff --git a/src/gallium/auxiliary/draw/SConscript b/src/gallium/auxiliary/draw/SConscript
index 544a04918b65027347faf933189a8c90781ef322..5f05aa324a5bcf7099f1ce34974c8e2b71786e6e 100644 (file)
--- a/src/gallium/auxiliary/draw/SConscript
+++ b/src/gallium/auxiliary/draw/SConscript
@@ -38,6 +38,7 @@ draw = env.ConvenienceLibrary(
                'draw_vs_aos_machine.c',
                'draw_vs_exec.c',
                'draw_vs_llvm.c',
+               'draw_vs_ppc.c',
                'draw_vs_sse.c',
                'draw_vs_varient.c'
        ])

diff --git a/src/gallium/auxiliary/rtasm/SConscript b/src/gallium/auxiliary/rtasm/SConscript
index 8ea25922aa1646011e0ce9a1cb6f2b4cb5165f8d..eb48368accbe880eccb628924d5f7d6e59853d4d 100644 (file)
--- a/src/gallium/auxiliary/rtasm/SConscript
+++ b/src/gallium/auxiliary/rtasm/SConscript
@@ -6,6 +6,7 @@ rtasm = env.ConvenienceLibrary(
                'rtasm_cpu.c',
                'rtasm_execmem.c',
                'rtasm_x86sse.c',
+               'rtasm_ppc.c',
                'rtasm_ppc_spe.c',
        ])
 

diff --git a/src/gallium/auxiliary/tgsi/SConscript b/src/gallium/auxiliary/tgsi/SConscript
index 45bf3f6d57751e41401b62ce1fff38d4b071a615..8200cce42f57cdd36d0717ea9176255f21ac9dd5 100644 (file)
--- a/src/gallium/auxiliary/tgsi/SConscript
+++ b/src/gallium/auxiliary/tgsi/SConscript
@@ -12,6 +12,7 @@ tgsi = env.ConvenienceLibrary(
                'tgsi_parse.c',
                'tgsi_sanity.c',
                'tgsi_scan.c',
+               'tgsi_ppc.c',
                'tgsi_sse2.c',
                'tgsi_text.c',
                'tgsi_transform.c',

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index af8dfcb4930c5eb67123e4b690ccd00ec403adcd..89b98b37ab0353f901030b4f11730f901f2218e7 100644 (file)
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -283,6 +283,10 @@ if env['platform'] != 'winddk':
                        'x86-64/glapi_x86-64.S'
                ]
        elif gcc and env['machine'] == 'ppc':
+               env.Append(CPPDEFINES = [
+                       'USE_PPC_ASM', 
+                       'USE_VMX_ASM', 
+               ])
                mesa_sources += [
                        'ppc/common_ppc.c',
                ]