Changeset b2aaaa0 in mainline

Timestamp:

2018-09-13T10:10:46Z (6 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

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

Children:

09ab0a9a

Parents:

83932dc9

Message:

Remove duplicate cc_args from autotool.py, fix mips

Files:

• tools/autotool.py (modified) (12 diffs)
• uspace/lib/posix/Makefile (modified) (1 diff)

tools/autotool.py

@@ -179 +179 @@
         platform = None
         target = None
-        cc_args = []
 
         if (config['PLATFORM'] == "abs32le"):
@@ -192 +191 @@
 
                 if (config['CROSS_TARGET'] == "mips32"):
-                        cc_args.append("-mabi=32")
                         target = "mipsel-helenos"
 
@@ -213 +211 @@
         if (config['PLATFORM'] == "mips32"):
                 check_config(config, "MACHINE")
-                cc_args.append("-mabi=32")
 
                 if ((config['MACHINE'] == "msim") or (config['MACHINE'] == "lmalta")):
@@ -225 +222 @@
         if (config['PLATFORM'] == "mips64"):
                 check_config(config, "MACHINE")
-                cc_args.append("-mabi=64")
 
                 if (config['MACHINE'] == "msim"):
@@ -243 +239 @@
                 target = "sparc64-helenos"
 
-        return (platform, cc_args, target)
+        return (platform, target)
 
 def check_app(args, name, details):
@@ -359 +355 @@
         return int(value, base)
 
-def probe_compiler(common, typesizes):
+def probe_compiler(cc, common, typesizes):
         "Generate, compile and parse probing source"
 
@@ -377 +373 @@
         outf.close()
 
-        args = common['CC_AUTOGEN'].split(' ')
+        args = cc.split(' ')
         args.extend(["-S", "-o", PROBE_OUTPUT, PROBE_SOURCE])
 
@@ -564 +560 @@
                 check_app(["tar", "--version"], "tar utility", "usually part of tar")
 
-                platform, cc_args, target = get_target(config)
+                platform, target = get_target(config)
 
                 if (platform is None) or (target is None):
@@ -577 +573 @@
                 common['TARGET'] = target
                 prefix = "%s-" % target
+
+                cc_autogen = None
 
                 # Compiler
@@ -584 +582 @@
 
                         check_common(common, "GCC")
-                        common['CC'] = " ".join([common['GCC']] + cc_args)
-                        common['CC_AUTOGEN'] = common['CC']
+                        common['CC'] = common['GCC']
+                        cc_autogen = common['CC']
 
                         check_common(common, "GXX")
@@ -595 +593 @@
 
                         check_common(common, "CLANG")
-                        common['CC'] = " ".join([common['CLANG']] + cc_args)
-                        common['CC_AUTOGEN'] = common['CC'] + " -no-integrated-as"
+                        common['CC'] = common['CLANG']
+                        cc_autogen = common['CC'] + " -no-integrated-as"
 
                         if (config['INTEGRATED_AS'] == "yes"):
@@ -610 +608 @@
                                 common['GENISOIMAGE'] += ' -as genisoimage'
 
-                probe = probe_compiler(common,
+                probe = probe_compiler(cc_autogen, common,
                         [
                                 {'type': 'long long int', 'tag': 'LONG_LONG', 'sname': 'LLONG' },

uspace/lib/posix/Makefile

@@ -102 +102 @@
         echo '# Generated file, do not modify.' >> $@.new
         echo '# Do not forget to set HELENOS_EXPORT_ROOT.' >> $@.new
-        echo 'HELENOS_CROSS_PATH="$(shell dirname `which "$(CC)"`)"' >> $@.new
+        echo 'HELENOS_CROSS_PATH="$(shell dirname `which $(CC)`)"' >> $@.new
         echo 'HELENOS_ARCH="$(firstword $(subst -, ,$(TARGET)))"' >> $@.new
         echo 'HELENOS_TARGET="$(TARGET)"' >> $@.new