Changeset b183ce0a in mainline for tools/autotool.py

Timestamp:

2013-03-24T15:34:29Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

8a26f82

Parents:

b92a0ee (diff), 119b46e (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) (2 diffs)

tools/autotool.py

@@ -224 +224 @@
                 cc_args.append("-mabi=32")
                 
-                if ((config['MACHINE'] == "lgxemul") or (config['MACHINE'] == "msim")):
+                if ((config['MACHINE'] == "msim") or (config['MACHINE'] == "lmalta")):
                         target = config['PLATFORM']
                         gnu_target = "mipsel-linux-gnu"
                 
-                if (config['MACHINE'] == "bgxemul"):
+                if ((config['MACHINE'] == "bmalta")):
                         target = "mips32eb"
                         gnu_target = "mips-linux-gnu"
@@ -715 +715 @@
                 if (config['COMPILER'] == "gcc_cross"):
                         target, cc_args, gnu_target, clang_target_unused = get_target(config)
-                                
                         path = "%s/%s/bin" % (cross_prefix, target)
                         prefix = "%s-" % gnu_target