Set -msse2/-maltivec as needed on things that depend on the SIMD wrapper. Bug 264

3 files changed, 20 insertions, 5 deletions

diff --git a/configure.py b/configure.py
index 86753ba4c..f3125d77e 100755
--- a/configure.py
+++ b/configure.py
@@ -1099,10 +1099,23 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo):
             flags.append(cc.isa_flags[isa])
         return '' if len(flags) == 0 else (' ' + ' '.join(sorted(list(flags))))
 
+    def simd_dependencies():
+        simd_re = re.compile('simd_(.*)')
+        for mod in modules:
+            if simd_re.match(mod.basename):
+                for isa in mod.need_isa:
+                    yield isa
+
     def isa_specific_flags(cc, src):
+
         for mod in modules:
             if src in mod.sources():
-                return get_isa_specific_flags(cc, mod.need_isa)
+                isas = mod.need_isa
+                if 'simd' in mod.dependencies():
+                    isas += list(simd_dependencies())
+
+                return get_isa_specific_flags(cc, isas)
+
         return ''
 
     def all_isa_specific_flags():
@@ -1428,7 +1441,7 @@ def choose_modules_to_use(modules, archinfo, options):
 
     logging.info('Loading modules %s', ' '.join(sorted(to_load)))
 
-    return [modules[mod] for mod in to_load]
+    return to_load
 
 """
 Load the info files about modules, targets, etc
@@ -1903,15 +1916,15 @@ def main(argv = None):
             logging.info('Disabling assembly code, cannot use in amalgamation')
             options.asm_ok = False
 
-    modules_to_use = choose_modules_to_use(modules,
-                                           archinfo[options.arch],
-                                           options)
+    loaded_mods = choose_modules_to_use(modules, archinfo[options.arch], options)
 
     if not osinfo[options.os].build_shared:
         if options.build_shared_lib:
             logging.info('Disabling shared lib on %s' % (options.os))
             options.build_shared_lib = False
 
+    modules_to_use = [modules[m] for m in loaded_mods]
+
     build_config = BuildConfigurationInformation(options, modules_to_use)
     build_config.public_headers.append(
         os.path.join(build_config.build_dir, 'build.h'))
diff --git a/src/build-data/cc/clang.txt b/src/build-data/cc/clang.txt
index d68d9a167..8cbe1a731 100644
--- a/src/build-data/cc/clang.txt
+++ b/src/build-data/cc/clang.txt
@@ -41,6 +41,7 @@ aesni  -> "-maes"
 clmul  -> "-mpclmul"
 rdrand -> "-mrdrnd"
 sha    -> "-msha"
+altivec -> "-maltivec"
 </isa_flags>
 
 <mach_opt>
diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt
index 94cb48c94..8a3e45461 100644
--- a/src/build-data/cc/gcc.txt
+++ b/src/build-data/cc/gcc.txt
@@ -48,6 +48,7 @@ aesni  -> "-maes"
 clmul  -> "-mpclmul"
 rdrand -> "-mrdrnd"
 sha    -> "-msha"
+altivec -> "-maltivec"
 </isa_flags>
 
 <mach_opt>