Changeset c028b22 in mainline for tools/autotool.py

Timestamp:

2011-07-08T17:01:01Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

cc1a727

Parents:

4e36219 (diff), 026793d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• tools/autotool.py (modified) (6 diffs)

tools/autotool.py

@@ -243 +243 @@
         outf.close()
         
-        args = [common['CC'], "-S", "-o", PROBE_OUTPUT, PROBE_SOURCE]
+        args = [common['CC']]
+        args.extend(common['CC_ARGS'])
+        args.extend(["-S", "-o", PROBE_OUTPUT, PROBE_SOURCE])
         
         try:
@@ -361 +363 @@
                 typedefs.append({'oldtype': "signed %s" % probe['signed_sizes'][b], 'newtype': "int%u_t" % (b * 8)})
                 
+                macros.append({'oldmacro': "unsigned %s" % probe['unsigned_sizes'][b], 'newmacro': "UINT%u_T" % (b * 8)})
+                macros.append({'oldmacro': "signed %s" % probe['signed_sizes'][b], 'newmacro': "INT%u_T" % (b * 8)})
+                
                 macros.append({'oldmacro': "\"%so\"" % probe['unsigned_strcs'][b], 'newmacro': "PRIo%u" % (b * 8)})
                 macros.append({'oldmacro': "\"%su\"" % probe['unsigned_strcs'][b], 'newmacro': "PRIu%u" % (b * 8)})
@@ -523 +528 @@
                 
                 # Compiler
+                common['CC_ARGS'] = []
                 if (config['COMPILER'] == "gcc_cross"):
                         if (config['PLATFORM'] == "abs32le"):
@@ -536 +542 @@
                                 if (config['CROSS_TARGET'] == "mips32"):
                                         gnu_target = "mipsel-linux-gnu"
+                                        common['CC_ARGS'].append("-mabi=32")
                         
                         if (config['PLATFORM'] == "amd64"):
@@ -555 +562 @@
                         if (config['PLATFORM'] == "mips32"):
                                 check_config(config, "MACHINE")
+                                common['CC_ARGS'].append("-mabi=32")
                                 
                                 if ((config['MACHINE'] == "lgxemul") or (config['MACHINE'] == "msim")):
@@ -563 +571 @@
                                         target = "mips32eb"
                                         gnu_target = "mips-linux-gnu"
+                        
+                        if (config['PLATFORM'] == "mips64"):
+                                check_config(config, "MACHINE")
+                                common['CC_ARGS'].append("-mabi=64")
+                                
+                                if (config['MACHINE'] == "msim"):
+                                        target = config['PLATFORM']
+                                        gnu_target = "mips64el-linux-gnu"
                         
                         if (config['PLATFORM'] == "ppc32"):