Changeset a420203 in mainline for tools/autotool.py

Timestamp:

2015-03-15T00:24:52Z (9 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

8848276

Parents:

270bf4f

Message:

use distinct file names for int128 probe
(for easier debugging)

File:

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

tools/autotool.py

@@ -47 +47 @@
 PROBE_SOURCE = 'probe.c'
 PROBE_OUTPUT = 'probe.s'
+
+PROBE_INT128_SOURCE = 'probe_int128.c'
+PROBE_INT128_OUTPUT = 'probe_int128.s'
 
 PACKAGE_BINUTILS = "usually part of binutils"
@@ -533 +536 @@
         check_common(common, "CC")
         
-        outf = open(PROBE_SOURCE, 'w')
+        outf = open(PROBE_INT128_SOURCE, 'w')
         outf.write(PROBE_INT128_HEAD)
         outf.write("\tDECLARE_INTSIZE(\"INT128\", int __attribute((mode(TI))));\n")
@@ -541 +544 @@
         args = [common['CC']]
         args.extend(common['CC_ARGS'])
-        args.extend(["-S", "-o", PROBE_OUTPUT, PROBE_SOURCE])
+        args.extend(["-S", "-o", PROBE_INT128_OUTPUT, PROBE_INT128_SOURCE])
         
         try:
@@ -550 +553 @@
                 return False
         
-        if (not os.path.isfile(PROBE_OUTPUT)):
+        if (not os.path.isfile(PROBE_INT128_OUTPUT)):
                 sys.stderr.write("no\n")
                 return False
         
-        inf = open(PROBE_OUTPUT, 'r')
+        inf = open(PROBE_INT128_OUTPUT, 'r')
         lines = inf.readlines()
         inf.close()
@@ -564 +567 @@
                         if (tokens[0] == "AUTOTOOL_DECLARE"):
                                 if (len(tokens) < 7):
-                                        print_error(["Malformed declaration in \"%s\" on line %s." % (PROBE_OUTPUT, j), COMPILER_FAIL])
+                                        print_error(["Malformed declaration in \"%s\" on line %s." % (PROBE_INT128_OUTPUT, j), COMPILER_FAIL])
                                 
                                 category = tokens[1]
@@ -578 +581 @@
                                                 value_int = decode_value(value)
                                         except:
-                                                print_error(["Integer value expected in \"%s\" on line %s." % (PROBE_OUTPUT, j), COMPILER_FAIL])
+                                                print_error(["Integer value expected in \"%s\" on line %s." % (PROBE_INT128_OUTPUT, j), COMPILER_FAIL])
                                         
                                         if (subcategory == "unsigned"):
@@ -589 +592 @@
                                                         return False
                                         else:
-                                                print_error(["Unexpected keyword \"%s\" in \"%s\" on line %s." % (subcategory, PROBE_OUTPUT, j), COMPILER_FAIL])
+                                                print_error(["Unexpected keyword \"%s\" in \"%s\" on line %s." % (subcategory, PROBE_INT128_OUTPUT, j), COMPILER_FAIL])
         
         sys.stderr.write("yes\n")