Changes in tools/autotool.py [85369b1:dc0b964] in mainline

File:

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

tools/autotool.py

@@ -271 +271 @@
                                                 unsigned_sizes[name] = value_int
                                                 unsigned_tags[tag] = value_int
-                                                unsigned_strcs[strc] = value_int
-                                                unsigned_concs[conc] = value_int
+                                                if (strc != ""):
+                                                        unsigned_strcs[strc] = value_int
+                                                if (conc != ""):
+                                                        unsigned_concs[conc] = value_int
                                         elif (subcategory == "signed"):
                                                 signed_sizes[name] = value_int
                                                 signed_tags[tag] = value_int
-                                                signed_strcs[strc] = value_int
-                                                signed_concs[conc] = value_int
+                                                if (strc != ""):
+                                                        signed_strcs[strc] = value_int
+                                                if (conc != ""):
+                                                        signed_concs[conc] = value_int
                                         else:
                                                 print_error(["Unexpected keyword \"%s\" in \"%s\" on line %s." % (subcategory, PROBE_OUTPUT, j), COMPILER_FAIL])
@@ -325 +329 @@
                 
                 if (not fnd):
-                        print_error(['Unable to find appropriate unsigned printf formatter for %u bytes' % b,
-                                     COMPILER_FAIL])
+                        macros.append({'oldmacro': "\"o\"", 'newmacro': "PRIo%u" % (b * 8)})
+                        macros.append({'oldmacro': "\"u\"", 'newmacro': "PRIu%u" % (b * 8)})
+                        macros.append({'oldmacro': "\"x\"", 'newmacro': "PRIx%u" % (b * 8)})
+                        macros.append({'oldmacro': "\"X\"", 'newmacro': "PRIX%u" % (b * 8)})
                 
                 
@@ -337 +343 @@
                 
                 if (not fnd):
-                        print_error(['Unable to find appropriate signed printf formatter for %u bytes' % b,
-                                     COMPILER_FAIL])
+                        macros.append({'oldmacro': "\"d\"", 'newmacro': "PRId%u" % (b * 8)})
                 
                 
@@ -344 +349 @@
                 for name, value in probe['unsigned_concs'].items():
                         if (value == b):
-                                if ((name.startswith('@')) or (name == "")):
-                                        macros.append({'oldmacro': "c ## U", 'newmacro': "UINT%u_C(c)" % (b * 8)})
-                                else:
-                                        macros.append({'oldmacro': "c ## U%s" % name, 'newmacro': "UINT%u_C(c)" % (b * 8)})
-                                fnd = True
-                                break
-                
-                if (not fnd):
-                        print_error(['Unable to find appropriate unsigned literal macro for %u bytes' % b,
-                                     COMPILER_FAIL])
+                                macros.append({'oldmacro': "c ## U%s" % name, 'newmacro': "UINT%u_C(c)" % (b * 8)})
+                                fnd = True
+                                break
+                
+                if (not fnd):
+                        macros.append({'oldmacro': "c ## U", 'newmacro': "UINT%u_C(c)" % (b * 8)})
                 
                 
@@ -359 +360 @@
                 for name, value in probe['signed_concs'].items():
                         if (value == b):
-                                if ((name.startswith('@')) or (name == "")):
-                                        macros.append({'oldmacro': "c", 'newmacro': "INT%u_C(c)" % (b * 8)})
-                                else:
-                                        macros.append({'oldmacro': "c ## %s" % name, 'newmacro': "INT%u_C(c)" % (b * 8)})
-                                fnd = True
-                                break
-                
-                if (not fnd):
-                        print_error(['Unable to find appropriate unsigned literal macro for %u bytes' % b,
-                                     COMPILER_FAIL])
+                                macros.append({'oldmacro': "c ## %s" % name, 'newmacro': "INT%u_C(c)" % (b * 8)})
+                                fnd = True
+                                break
+                
+                if (not fnd):
+                        macros.append({'oldmacro': "c", 'newmacro': "INT%u_C(c)" % (b * 8)})
         
         for tag in ['CHAR', 'SHORT', 'INT', 'LONG', 'LLONG']:
@@ -571 +568 @@
                 probe = probe_compiler(common,
                         [
-                                {'type': 'char', 'tag': 'CHAR', 'strc': '"hh"', 'conc': '"@@"'},
-                                {'type': 'short int', 'tag': 'SHORT', 'strc': '"h"', 'conc': '"@"'},
+                                {'type': 'char', 'tag': 'CHAR', 'strc': '"hh"', 'conc': '""'},
+                                {'type': 'short int', 'tag': 'SHORT', 'strc': '"h"', 'conc': '""'},
                                 {'type': 'int', 'tag': 'INT', 'strc': '""', 'conc': '""'},
                                 {'type': 'long int', 'tag': 'LONG', 'strc': '"l"', 'conc': '"L"'},