Changeset 055a68a in mainline for tools/autotool.py

Timestamp:

2015-04-23T23:47:40Z (9 years ago)

Author:

Michal Koutný <xm.koutny+hos@…>

Branches:

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

Children:

a18a8b9

Parents:

acb8766e (diff), dcba819 (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) (18 diffs)

tools/autotool.py

@@ -48 +48 @@
 PROBE_OUTPUT = 'probe.s'
 
+PROBE_INT128_SOURCE = 'probe_int128.c'
+PROBE_INT128_OUTPUT = 'probe_int128.s'
+
 PACKAGE_BINUTILS = "usually part of binutils"
 PACKAGE_GCC = "preferably version 4.7.0 or newer"
@@ -85 +88 @@
         AUTOTOOL_DECLARE("floatsize", "", tag, #type, "", "", sizeof(type));
 
+extern int main(int, char *[]);
+
 int main(int argc, char *argv[])
 {
@@ -101 +106 @@
 """
 
+PROBE_INT128_HEAD = """#define AUTOTOOL_DECLARE(category, subcategory, tag, name, strc, conc, value) \\
+        asm volatile ( \\
+                "AUTOTOOL_DECLARE\\t" category "\\t" subcategory "\\t" tag "\\t" name "\\t" strc "\\t" conc "\\t%[val]\\n" \\
+                : \\
+                : [val] "n" (value) \\
+        )
+
+#define DECLARE_INTSIZE(tag, type) \\
+        AUTOTOOL_DECLARE("intsize", "unsigned", tag, #type, "", "", sizeof(unsigned type)); \\
+        AUTOTOOL_DECLARE("intsize", "signed", tag, #type, "", "", sizeof(signed type));
+
+extern int main(int, char *[]);
+
+int main(int argc, char *argv[])
+{
+"""
+
+PROBE_INT128_TAIL = """}
+"""
+
 def read_config(fname, config):
         "Read HelenOS build configuration"
@@ -195 +220 @@
                 if (config['CROSS_TARGET'] == "arm32"):
                         gnu_target = "arm-linux-gnueabi"
-                        clang_target = "arm-unknown-linux"
+                        clang_target = "arm-unknown-none"
                         helenos_target = "arm-helenos-gnueabi"
                 
                 if (config['CROSS_TARGET'] == "ia32"):
                         gnu_target = "i686-pc-linux-gnu"
-                        clang_target = "i386-unknown-linux"
+                        clang_target = "i686-unknown-none"
                         helenos_target = "i686-pc-helenos"
                 
                 if (config['CROSS_TARGET'] == "mips32"):
+                        cc_args.append("-mabi=32")
                         gnu_target = "mipsel-linux-gnu"
-                        clang_target = "mipsel-unknown-linux"
+                        clang_target = "mipsel-unknown-none"
                         helenos_target = "mipsel-helenos"
-                        common['CC_ARGS'].append("-mabi=32")
         
         if (config['PLATFORM'] == "amd64"):
                 target = config['PLATFORM']
                 gnu_target = "amd64-linux-gnu"
-                clang_target = "x86_64-unknown-linux"
+                clang_target = "x86_64-unknown-none"
                 helenos_target = "amd64-helenos"
         
@@ -218 +243 @@
                 target = config['PLATFORM']
                 gnu_target = "arm-linux-gnueabi"
-                clang_target = "arm-unknown-linux"
+                clang_target = "arm-unknown-none-eabi"
                 helenos_target = "arm-helenos-gnueabi"
         
@@ -224 +249 @@
                 target = config['PLATFORM']
                 gnu_target = "i686-pc-linux-gnu"
-                clang_target = "i386-unknown-linux"
+                clang_target = "i686-unknown-none"
                 helenos_target = "i686-pc-helenos"
         
@@ -239 +264 @@
                         target = config['PLATFORM']
                         gnu_target = "mipsel-linux-gnu"
-                        clang_target = "mipsel-unknown-linux"
+                        clang_target = "mipsel-unknown-none"
                         helenos_target = "mipsel-helenos"
                 
@@ -245 +270 @@
                         target = "mips32eb"
                         gnu_target = "mips-linux-gnu"
-                        clang_target = "mips-unknown-linux"
+                        clang_target = "mips-unknown-none"
                         helenos_target = "mips-helenos"
         
@@ -255 +280 @@
                         target = config['PLATFORM']
                         gnu_target = "mips64el-linux-gnu"
-                        clang_target = "mips64el-unknown-linux"
+                        clang_target = "mips64el-unknown-none"
                         helenos_target = "mips64el-helenos"
         
@@ -261 +286 @@
                 target = config['PLATFORM']
                 gnu_target = "ppc-linux-gnu"
-                clang_target = "powerpc-unknown-linux"
+                clang_target = "ppc-unknown-none"
                 helenos_target = "ppc-helenos"
         
@@ -272 +297 @@
                 target = config['PLATFORM']
                 gnu_target = "sparc64-linux-gnu"
-                clang_target = "sparc-unknown-linux"
+                clang_target = "sparc-unknown-none"
                 helenos_target = "sparc64-helenos"
         
@@ -396 +421 @@
         
         for typedef in floatsizes:
-                outf.write("\nDECLARE_FLOATSIZE(\"%s\", %s);\n" % (typedef['tag'], typedef['type']))
+                outf.write("\tDECLARE_FLOATSIZE(\"%s\", %s);\n" % (typedef['tag'], typedef['type']))
         
         outf.write(PROBE_TAIL)
@@ -510 +535 @@
         return {'unsigned_sizes': unsigned_sizes, 'signed_sizes': signed_sizes, 'unsigned_tags': unsigned_tags, 'signed_tags': signed_tags, 'unsigned_strcs': unsigned_strcs, 'signed_strcs': signed_strcs, 'unsigned_concs': unsigned_concs, 'signed_concs': signed_concs, 'float_tags': float_tags, 'builtin_sizes': builtin_sizes, 'builtin_signs': builtin_signs}
 
+def probe_int128(common):
+        "Generate, compile and parse probing source for 128-bit integers"
+        
+        check_common(common, "CC")
+        
+        outf = open(PROBE_INT128_SOURCE, 'w')
+        outf.write(PROBE_INT128_HEAD)
+        outf.write("\tDECLARE_INTSIZE(\"INT128\", int __attribute((mode(TI))));\n")
+        outf.write(PROBE_INT128_TAIL)
+        outf.close()
+        
+        args = [common['CC']]
+        args.extend(common['CC_ARGS'])
+        args.extend(["-S", "-o", PROBE_INT128_OUTPUT, PROBE_INT128_SOURCE])
+        
+        try:
+                sys.stderr.write("Checking whether the compiler has intrinsic support for 128-bit integers ... ")
+                output = subprocess.Popen(args, stdout = subprocess.PIPE, stderr = subprocess.PIPE).communicate()
+        except:
+                sys.stderr.write("no\n")
+                return False
+        
+        if (not os.path.isfile(PROBE_INT128_OUTPUT)):
+                sys.stderr.write("no\n")
+                return False
+        
+        inf = open(PROBE_INT128_OUTPUT, 'r')
+        lines = inf.readlines()
+        inf.close()
+        
+        for j in range(len(lines)):
+                tokens = lines[j].strip().split("\t")
+                
+                if (len(tokens) > 0):
+                        if (tokens[0] == "AUTOTOOL_DECLARE"):
+                                if (len(tokens) < 7):
+                                        print_error(["Malformed declaration in \"%s\" on line %s." % (PROBE_INT128_OUTPUT, j), COMPILER_FAIL])
+                                
+                                category = tokens[1]
+                                subcategory = tokens[2]
+                                tag = tokens[3]
+                                name = tokens[4]
+                                strc = tokens[5]
+                                conc = tokens[6]
+                                value = tokens[7]
+                                
+                                if (category == "intsize"):
+                                        try:
+                                                value_int = decode_value(value)
+                                        except:
+                                                print_error(["Integer value expected in \"%s\" on line %s." % (PROBE_INT128_OUTPUT, j), COMPILER_FAIL])
+                                        
+                                        if (subcategory == "unsigned"):
+                                                if (value_int != 16):
+                                                        sys.stderr.write("no\n")
+                                                        return False
+                                        elif (subcategory == "signed"):
+                                                if (value_int != 16):
+                                                        sys.stderr.write("no\n")
+                                                        return False
+                                        else:
+                                                print_error(["Unexpected keyword \"%s\" in \"%s\" on line %s." % (subcategory, PROBE_INT128_OUTPUT, j), COMPILER_FAIL])
+        
+        sys.stderr.write("yes\n")
+        return True
+
 def detect_sizes(probe, bytes, inttags, floattags):
         "Detect correct types for fixed-size types"
@@ -683 +774 @@
         outmk.close()
 
-def create_header(hdname, maps):
+def create_header(hdname, maps, int128):
         "Create header output"
         
@@ -703 +794 @@
         for typedef in maps['typedefs']:
                 outhd.write('typedef %s %s;\n' % (typedef['oldtype'], typedef['newtype']))
+        
+        if (int128):
+                outhd.write('typedef unsigned int __attribute((mode(TI))) uint128_t;\n')
+                outhd.write('typedef signed int __attribute((mode(TI))) int128_t;\n')
         
         outhd.write('\n#endif\n')
@@ -798 +893 @@
                 
                 if (config['COMPILER'] == "icc"):
-                        common['CC'] = "icc"
                         check_app([common['CC'], "-V"], "Intel C++ Compiler", "support is experimental")
                         check_gcc(None, "", common, PACKAGE_GCC)
                         check_binutils(None, binutils_prefix, common, PACKAGE_BINUTILS)
+                        
+                        common['CC'] = "icc"
                 
                 if (config['COMPILER'] == "clang"):
@@ -845 +941 @@
                 )
                 
+                int128 = probe_int128(common)
+                
                 maps = detect_sizes(probe, [1, 2, 4, 8], ['CHAR', 'SHORT', 'INT', 'LONG', 'LLONG'], ['LONG_DOUBLE', 'DOUBLE', 'FLOAT'])
                 
@@ -851 +949 @@
         
         common['AUTOGEN'] = "%s/autogen.py" % os.path.dirname(os.path.abspath(sys.argv[0]))
-
+        
         create_makefile(MAKEFILE, common)
-        create_header(HEADER, maps)
+        create_header(HEADER, maps, int128)
         
         return 0