Changeset e6a78b9 in mainline for tools


Ignore:
Timestamp:
2012-06-29T15:31:44Z (13 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
9432f08
Parents:
34ab31c0 (diff), 0bbd13e (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.

Location:
tools
Files:
1 added
10 edited

Legend:

Unmodified
Added
Removed

  • tools/autotool.py

    r34ab31c0 re6a78b9  
    720720                        check_binutils(None, binutils_prefix, common, PACKAGE_BINUTILS)
    721721               
    722                 if (config['COMPILER'] == "suncc"):
    723                         common['CC'] = "suncc"
    724                         check_app([common['CC'], "-V"], "Sun Studio Compiler", "support is experimental")
    725                         check_gcc(None, "", common, PACKAGE_GCC)
    726                         check_binutils(None, binutils_prefix, common, PACKAGE_BINUTILS)
    727                
    728722                if (config['COMPILER'] == "clang"):
    729723                        common['CC'] = "clang"

  • tools/checkers/clang.py

    r34ab31c0 re6a78b9  
    114114        for job in jobs:
    115115                if (not clang(rootdir, job)):
    116                         print
     116                        print()
    117117                        print("Failed job: %s" % job)
    118118                        return

  • tools/checkers/stanse.py

    r34ab31c0 re6a78b9  
    127127        for job in jobs:
    128128                if (not stanse(rootdir, job)):
    129                         print
     129                        print()
    130130                        print("Failed job: %s" % job)
    131131                        return

  • tools/checkers/vcc.py

    r34ab31c0 re6a78b9  
    204204        for job in jobs:
    205205                if (not vcc(vcc_path, rootdir, job)):
    206                         print
     206                        print()
    207207                        print("Failed job: %s" % job)
    208208                        return
    209209       
    210         print
     210        print()
    211211        print("All jobs passed")
    212212

  • tools/filldir.py

    r34ab31c0 re6a78b9  
    3737
    3838if len(sys.argv) < 3:
    39         print 'Usage: filldir <parent-dir> <count>'
     39        print('Usage: filldir <parent-dir> <count>')
    4040        exit(2)
    4141

  • tools/gentestfile.py

    r34ab31c0 re6a78b9  
    3636
    3737if len(sys.argv) < 2:
    38         print "Usage: gentestfile.py <count of 64-bit numbers to output>"
     38        print("Usage: gentestfile.py <count of 64-bit numbers to output>")
    3939        exit()
    4040
    41 m = long(sys.argv[1])
     41m = int(sys.argv[1])
    4242i = 0
    4343pow_2_64 = 2 ** 64

  • tools/mkfat.py

    r34ab31c0 re6a78b9  
    189189        "Filter FAT legal characters"
    190190       
    191         filtered_name = ''
     191        filtered_name = b''
    192192        filtered = False
    193193       
    … …  
    205205       
    206206        ascii_name, lfn = fat_lchars(name)
    207         ascii_parts = ascii_name.split('.')
     207        # Splitting works only on strings, not on bytes
     208        ascii_parts = ascii_name.decode('utf8').split('.')
    208209       
    209210        short_name = ''
    … …  
    444445        extra_bytes = int(sys.argv[1])
    445446       
    446         path = os.path.abspath(sys.argv[2].decode())
     447        path = os.path.abspath(sys.argv[2])
    447448        if (not os.path.isdir(path)):
    448449                print("<PATH> must be a directory")

  • tools/mkuimage.py

    r34ab31c0 re6a78b9  
    124124        header.img_type = 2             # Kernel
    125125        header.compression = 0          # None
    126         header.img_name = image_name
     126        header.img_name = image_name.encode('ascii')
    127127
    128128        header_crc = calc_crc32(header.pack())
    … …  
    140140        signed_crc = zlib.crc32(byteseq, 0)
    141141        if signed_crc < 0:
    142                 return (long(signed_crc) + (long(2) ** long(32))) # 2^32L
     142                return signed_crc + (1 << 32)
    143143        else:
    144144                return signed_crc
    … …  
    148148def print_syntax(cmd):
    149149        print("syntax: " + cmd + " [<options>] <raw_image> <uImage>")
    150         print
     150        print()
    151151        print("\traw_image\tInput image name (raw binary data)")
    152152        print("\tuImage\t\tOutput uImage name (U-Boot image)")
    153         print
     153        print()
    154154        print("options:")
    155155        print("\t-name <name>\tImage name (default: 'Noname')")

  • tools/toolchain.sh

    r34ab31c0 re6a78b9  
    5555BINUTILS_VERSION="2.22"
    5656BINUTILS_RELEASE=""
    57 GCC_VERSION="4.7.0"
     57GCC_VERSION="4.7.1"
    5858GDB_VERSION="7.4"
    5959
    … …  
    149149        echo " sparc64    SPARC V9"
    150150        echo " all        build all targets"
    151         echo " parallel   same as 'all', but in parallel"
     151        echo " parallel   same as 'all', but all in parallel"
     152        echo " 2-way      same as 'all', but 2-way parallel"
    152153        echo
    153154        echo "The toolchain will be installed to the directory specified by"
    … …  
    273274       
    274275        download_fetch "${BINUTILS_SOURCE}" "${BINUTILS}" "ee0f10756c84979622b992a4a61ea3f5"
    275         download_fetch "${GCC_SOURCE}" "${GCC}" "2a0f1d99fda235c29d40b561f81d9a77"
     276        download_fetch "${GCC_SOURCE}" "${GCC}" "933e6f15f51c031060af64a9e14149ff"
    276277        download_fetch "${GDB_SOURCE}" "${GDB}" "95a9a8305fed4d30a30a6dc28ff9d060"
    277278}
    … …  
    318319       
    319320        change_title "binutils: configure (${PLATFORM})"
    320         CFLAGS=-Wno-error ./configure "--target=${TARGET}" "--prefix=${PREFIX}" "--program-prefix=${TARGET}-" --disable-nls
     321        CFLAGS=-Wno-error ./configure "--target=${TARGET}" "--prefix=${PREFIX}" "--program-prefix=${TARGET}-" --disable-nls --disable-werror
    321322        check_error $? "Error configuring binutils."
    322323       
    … …  
    330331       
    331332        change_title "GCC: configure (${PLATFORM})"
    332         "${GCCDIR}/configure" "--target=${TARGET}" "--prefix=${PREFIX}" "--program-prefix=${TARGET}-" --with-gnu-as --with-gnu-ld --disable-nls --disable-threads --enable-languages=c,objc,c++,obj-c++ --disable-multilib --disable-libgcj --without-headers --disable-shared --enable-lto
     333        "${GCCDIR}/configure" "--target=${TARGET}" "--prefix=${PREFIX}" "--program-prefix=${TARGET}-" --with-gnu-as --with-gnu-ld --disable-nls --disable-threads --enable-languages=c,objc,c++,obj-c++ --disable-multilib --disable-libgcj --without-headers --disable-shared --enable-lto --disable-werror
    333334        check_error $? "Error configuring GCC."
    334335       
    … …  
    431432                wait
    432433                ;;
     434        "2-way")
     435                prepare
     436                build_target "amd64" "amd64-linux-gnu" &
     437                build_target "arm32" "arm-linux-gnueabi" &
     438                wait
     439               
     440                build_target "ia32" "i686-pc-linux-gnu" &
     441                build_target "ia64" "ia64-pc-linux-gnu" &
     442                wait
     443               
     444                build_target "mips32" "mipsel-linux-gnu" &
     445                build_target "mips32eb" "mips-linux-gnu" &
     446                wait
     447               
     448                build_target "mips64" "mips64el-linux-gnu" &
     449                build_target "ppc32" "ppc-linux-gnu" &
     450                wait
     451               
     452                build_target "ppc64" "ppc64-linux-gnu" &
     453                build_target "sparc64" "sparc64-linux-gnu" &
     454                wait
     455                ;;
    433456        *)
    434457                show_usage

  • tools/xstruct.py

    r34ab31c0 re6a78b9  
    3232
    3333import struct
     34import sys
    3435import types
    3536
     37# Handle long integer conversions nicely in both Python 2 and Python 3
     38integer_types = (int, long) if sys.version < '3' else (int,)
     39
     40# Ensure that 's' format for struct receives correct data type depending
     41# on Python version (needed due to different way to encode into bytes)
     42ensure_string = \
     43        (lambda value: value if type(value) is str else bytes(value)) \
     44                if sys.version < '3' else \
     45        (lambda value: bytes(value, 'ascii') if type(value) is str else value)
     46
    3647ranges = {
    37         'B': ((int, long), 0x00, 0xff),
    38         'H': ((int, long), 0x0000, 0xffff),
    39         'L': ((int, long), 0x00000000, 0xffffffff),
    40         'Q': ((int, long), 0x0000000000000000, 0xffffffffffffffff),
    41         'b': ((int, long), -0x80, 0x7f),
    42         'h': ((int, long), -0x8000, 0x7fff),
    43         'l': ((int, long), -0x80000000, 0x7fffffff) ,
    44         'q': ((int, long), -0x8000000000000000, 0x7fffffffffffffff),
     48        'B': (integer_types, 0x00, 0xff),
     49        'H': (integer_types, 0x0000, 0xffff),
     50        'L': (integer_types, 0x00000000, 0xffffffff),
     51        'Q': (integer_types, 0x0000000000000000, 0xffffffffffffffff),
     52        'b': (integer_types, -0x80, 0x7f),
     53        'h': (integer_types, -0x8000, 0x7fff),
     54        'l': (integer_types, -0x80000000, 0x7fffffff) ,
     55        'q': (integer_types, -0x8000000000000000, 0x7fffffffffffffff),
    4556}
    4657
    … …  
    7485                                        args.append(item)
    7586                        else:
     87                                if (fmt == "s"):
     88                                        value = ensure_string(value)
    7689                                check_range(variable, fmt, value)
    7790                                args.append(value)             
Note: See TracChangeset for help on using the changeset viewer.