support other arch rather than x86, remove x86 spcified arguments for gc...

src/blade/blade_platform.py

@@ -152,8 +152,13 @@ def set_cpp_str(self, cpp_str):
 
     def get_flags_except_warning(self):
         """Get the flags that are not warning flags. """
-        flags_except_warning = ['-m%s' % self.options.m, '-mcx16', '-pipe']
-        linkflags = ['-m%s' % self.options.m]
+        flags_except_warning = ['-pipe']
+        linkflags = []
+
+        if self.options.arch == 'x86':
+            flags_except_warning += ['-m%s' % self.options.m, '-mcx16']
+            linkflags += ['-m%s' % self.options.m]
+
         if self.options.profile == 'debug':
             flags_except_warning += ['-ggdb3', '-fstack-protector']
         elif self.options.profile == 'release':

src/blade/cc_targets.py

@@ -288,9 +288,10 @@ def _get_as_flags(self):
 
         """
         options = self.blade.get_options()
-        as_flags = ["--" + options.m]
-        return as_flags
-
+        if options.arch == 'x86':
+            return ["--" + options.m]
+        else:
+            return []
 
     def _dep_is_library(self, dep):
         """_dep_is_library.

src/blade/command_args.py

@@ -114,6 +114,7 @@ def _check_plat_and_profile_options(self):
             self.options.profile != 'release'):
             console.error_exit('--profile must be "debug" or "release".')
 
+        self.options.arch = self._arch()
         if self.options.m is None:
             self.options.m = self._arch_bits()
         else:
@@ -377,12 +378,20 @@ def _cmd_parse(self):
         return arg_parser.parse_known_args()
 
     def _arch_bits(self):
-        """Platform arch."""
-        if 'x86_64' == platform.machine():
+        """Platform arch bit."""
+        if '64bit' == platform.architecture()[0]:
             return '64'
         else:
             return '32'
 
+    def _arch(self):
+        """Platform arch name."""
+        arch = platform.machine()
+        if arch in ['i386', 'i686', 'x86_64']:
+            return 'x86'
+        else:
+            return arch
+
     def get_command(self):
         """Return blade command. """
         return self.options.command

src/blade/load_build_files.py

@@ -49,10 +49,13 @@ def bits(self):
 
     @property
     def arch(self):
-        if self._options.m == '32':
-            return 'i386'
+        if self._options.arch == 'x86':
+            if self._options.m == '32':
+                return 'i386'
+            else:
+                return 'x86_64'
         else:
-            return 'x86_64'
+            return self._options.arch
 
     def is_debug(self):
         return self._options.profile == 'debug'

src/blade/rules_generator.py

@@ -54,7 +54,7 @@ def __init__(self, options, build_dir, gcc_version,
         self.version_cpp_compile_template = string.Template("""
 env_version = Environment(ENV = os.environ)
 env_version.Append(SHCXXCOMSTR = '%s$updateinfo%s' % (colors('cyan'), colors('end')))
-env_version.Append(CPPFLAGS = '-m$m')
+env_version.Append(CPPFLAGS = '$m')
 version_obj = env_version.SharedObject('$filename')
 """)
         self.blade_config = configparse.blade_config
@@ -140,9 +140,11 @@ def generate_version_file(self):
         version_cpp.close()
 
         self._add_rule('VariantDir("%s", ".", duplicate=0)' % self.build_dir)
+
+        # todo - may not work in python 2.4
         self._add_rule(self.version_cpp_compile_template.substitute(
             updateinfo='Updating version information',
-            m=self.options.m,
+            m='-m%s' % self.options.m if self.options.arch == 'x86' else '',
             filename='%s/version.cpp' % self.build_dir))
 
     def generate_imports_functions(self, blade_path):

src/test/blade_test.py

@@ -39,6 +39,7 @@ def doSetUp(self, path, target='...', full_targets=None,
         self.current_building_path = 'build64_release'
         self.current_source_dir = '.'
         options = {
+                'arch': 'x86',
                 'm': '64',
                 'profile': 'release',
                 'generate_dynamic': True,

src/test/java_jar_test.py

@@ -119,11 +119,13 @@ def testGenerateRules(self):
         self.assertTrue('poppy_client_javawrap.cxx' in com_swig_java)
 
         self.assertTrue('-fno-omit-frame-pointer' in com_swig_python_cxx)
-        self.assertTrue('-mcx16 -pipe -g' in com_swig_python_cxx)
+        self.assertTrue('-mcx16 -g' in com_swig_python_cxx)
+        self.assertTrue('-pipe' in com_swig_python_cxx)
         self.assertTrue('-DNDEBUG -D_FILE_OFFSET_BITS' in com_swig_python_cxx)
 
         self.assertTrue('-fno-omit-frame-pointer' in com_swig_java_cxx)
-        self.assertTrue('-mcx16 -pipe -g' in com_swig_java_cxx)
+        self.assertTrue('-mcx16 -g' in com_swig_java_cxx)
+        self.assertTrue('-pipe' in com_swig_java_cxx)
         self.assertTrue('-DNDEBUG -D_FILE_OFFSET_BITS' in com_swig_java_cxx)
 
         self.assertTrue(java_com_line)