Changeset bc73be3 in mainline for tools

Timestamp:

2019-06-27T08:51:20Z (6 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (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:

cpp: merge and resolve conflicts

Location:

tools

Files:

• autocheck.awk (modified) (4 diffs)
• autotool.py (modified) (3 diffs)
• build-ccheck.sh (modified) (2 diffs)
• config.py (modified) (8 diffs)
• ew.py (modified) (13 diffs)
• grub/grub-update.sh (modified) (3 diffs)
• grub/mkimage.sh (modified) (1 diff)
• toolchain.sh (modified) (8 diffs)
• travis.sh (modified) (1 diff)

tools/autocheck.awk

@@ -33 +33 @@
 BEGIN {
         filename = ARGV[1]
+        output_lines = 0
         print "// Generated file. Fix the included header if static assert fails."
-        print "#include \"" filename "\""
+        print "// Inlined \"" filename "\""
+}
+
+{
+        print $0
 }
 
@@ -44 +49 @@
         }
         macro_name = toupper(struct_name) "_SIZE"
-        print "_Static_assert(" macro_name " == sizeof(struct " struct_name "), \"\");"
+        output[output_lines++] = "_Static_assert(" macro_name " == sizeof(struct " struct_name "), \"\");"
         struct_name = ""
 }
@@ -55 +60 @@
 
                 macro_name = toupper(struct_name) "_OFFSET_" toupper(member)
-                print "_Static_assert(" macro_name " == __builtin_offsetof(struct " struct_name ", " member "), \"\");"
+                output[output_lines++] = "_Static_assert(" macro_name " == __builtin_offsetof(struct " struct_name ", " member "), \"\");"
 
                 macro_name = toupper(struct_name) "_SIZE_" toupper(member)
-                print "#ifdef " macro_name
-                print "_Static_assert(" macro_name " == sizeof(((struct " struct_name "){ })." member "), \"\");"
-                print "#endif"
+                output[output_lines++] = "#ifdef " macro_name
+                output[output_lines++] = "_Static_assert(" macro_name " == sizeof(((struct " struct_name "){ })." member "), \"\");"
+                output[output_lines++] = "#endif"
         }
 }
@@ -67 +72 @@
         struct_name = $3
 }
+
+END {
+        for ( i = 0; i < output_lines; i++ ) {
+                print output[i]
+        }
+}

tools/autotool.py

@@ -1 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 #
 # Copyright (c) 2010 Martin Decky
@@ -201 +201 @@
                 target = "arm-helenos"
 
+        if (config['PLATFORM'] == "arm64"):
+                platform = config['PLATFORM']
+                target = "aarch64-helenos"
+
         if (config['PLATFORM'] == "ia32"):
                 platform = config['PLATFORM']
@@ -633 +637 @@
 
                 # Platform-specific utilities
-                if ((config['BARCH'] == "amd64") or (config['BARCH'] == "ia32") or (config['BARCH'] == "ppc32") or (config['BARCH'] == "sparc64")):
+                if (config['BARCH'] in ('amd64', 'arm64', 'ia32', 'ppc32', 'sparc64')):
                         common['GENISOIMAGE'] = check_app_alternatives(["genisoimage", "mkisofs", "xorriso"], ["--version"], "ISO 9660 creation utility", "usually part of genisoimage")
                         if common['GENISOIMAGE'] == 'xorriso':

tools/build-ccheck.sh

@@ -1 +1 @@
 #!/bin/bash
 #
-# Copyright (c) 2018 Jiri Svoboda
+# Copyright (c) 2019 Jiri Svoboda
 # All rights reserved.
 #
@@ -29 +29 @@
 
 SYCEK_GIT="https://github.com/jxsvoboda/sycek"
-SYCEK_REV="42fe0d77819f0ec05f17e40ea54c7b62073c8e97"
+SYCEK_REV="4dc1760741efdd84506478ab6effd68812b4726a"
 
 if [ ! -d sycek ]; then

tools/config.py

@@ -47 +47 @@
 PRESETS_DIR = 'defaults'
 
+class BinaryOp:
+        def __init__(self, operator, left, right):
+                assert operator in ('&', '|', '=', '!=')
+
+                self._operator = operator
+                self._left = left
+                self._right = right
+
+        def evaluate(self, config):
+                if self._operator == '&':
+                        return self._left.evaluate(config) and \
+                            self._right.evaluate(config)
+                if self._operator == '|':
+                        return self._left.evaluate(config) or \
+                            self._right.evaluate(config)
+
+                # '=' or '!='
+                if not self._left in config:
+                        config_val = ''
+                else:
+                        config_val = config[self._left]
+                        if config_val == '*':
+                                config_val = 'y'
+
+                if self._operator == '=':
+                        return self._right == config_val
+                return self._right != config_val
+
+# Expression parser
+class CondParser:
+        TOKEN_EOE = 0
+        TOKEN_SPECIAL = 1
+        TOKEN_STRING = 2
+
+        def __init__(self, text):
+                self._text = text
+
+        def parse(self):
+                self._position = -1
+                self._next_char()
+                self._next_token()
+
+                res = self._parse_expr()
+                if self._token_type != self.TOKEN_EOE:
+                        self._error("Expected end of expression")
+                return res
+
+        def _next_char(self):
+                self._position += 1
+                if self._position >= len(self._text):
+                        self._char = None
+                else:
+                        self._char = self._text[self._position]
+                self._is_special_char = self._char in \
+                    ('&', '|', '=', '!', '(', ')')
+
+        def _error(self, msg):
+                raise RuntimeError("Error parsing expression: %s:\n%s\n%s^" %
+                    (msg, self._text, " " * self._token_position))
+
+        def _next_token(self):
+                self._token_position = self._position
+
+                # End of expression
+                if self._char == None:
+                        self._token = None
+                        self._token_type = self.TOKEN_EOE
+                        return
+
+                # '&', '|', '=', '!=', '(', ')'
+                if self._is_special_char:
+                        self._token = self._char
+                        self._next_char()
+                        if self._token == '!':
+                                if self._char != '=':
+                                        self._error("Expected '='")
+                                self._token += self._char
+                                self._next_char()
+                        self._token_type = self.TOKEN_SPECIAL
+                        return
+
+                # <var> or <val>
+                self._token = ''
+                self._token_type = self.TOKEN_STRING
+                while True:
+                        self._token += self._char
+                        self._next_char()
+                        if self._is_special_char or self._char == None:
+                                break
+
+        def _parse_expr(self):
+                """ <expr> ::= <or_expr> ('&' <or_expr>)* """
+
+                left = self._parse_or_expr()
+                while self._token == '&':
+                        self._next_token()
+                        left = BinaryOp('&', left, self._parse_or_expr())
+                return left
+
+        def _parse_or_expr(self):
+                """ <or_expr> ::= <factor> ('|' <factor>)* """
+
+                left = self._parse_factor()
+                while self._token == '|':
+                        self._next_token()
+                        left = BinaryOp('|', left, self._parse_factor())
+                return left
+
+        def _parse_factor(self):
+                """ <factor> ::= <var> <cond> | '(' <expr> ')' """
+
+                if self._token == '(':
+                        self._next_token()
+                        res = self._parse_expr()
+                        if self._token != ')':
+                                self._error("Expected ')'")
+                        self._next_token()
+                        return res
+
+                if self._token_type == self.TOKEN_STRING:
+                        var = self._token
+                        self._next_token()
+                        return self._parse_cond(var)
+
+                self._error("Expected '(' or <var>")
+
+        def _parse_cond(self, var):
+                """ <cond> ::= '=' <val> | '!=' <val> """
+
+                if self._token not in ('=', '!='):
+                        self._error("Expected '=' or '!='")
+
+                oper = self._token
+                self._next_token()
+
+                if self._token_type != self.TOKEN_STRING:
+                        self._error("Expected <val>")
+
+                val = self._token
+                self._next_token()
+
+                return BinaryOp(oper, var, val)
+
 def read_config(fname, config):
         "Read saved values from last configuration run or a preset file"
@@ -59 +202 @@
         inf.close()
 
-def check_condition(text, config, rules):
-        "Check that the condition specified on input line is True (only CNF and DNF is supported)"
-
-        ctype = 'cnf'
-
-        if (')|' in text) or ('|(' in text):
-                ctype = 'dnf'
-
-        if ctype == 'cnf':
-                conds = text.split('&')
-        else:
-                conds = text.split('|')
-
-        for cond in conds:
-                if cond.startswith('(') and cond.endswith(')'):
-                        cond = cond[1:-1]
-
-                inside = check_inside(cond, config, ctype)
-
-                if (ctype == 'cnf') and (not inside):
-                        return False
-
-                if (ctype == 'dnf') and inside:
-                        return True
-
-        if ctype == 'cnf':
-                return True
-
-        return False
-
-def check_inside(text, config, ctype):
-        "Check for condition"
-
-        if ctype == 'cnf':
-                conds = text.split('|')
-        else:
-                conds = text.split('&')
-
-        for cond in conds:
-                res = re.match(r'^(.*?)(!?=)(.*)$', cond)
-                if not res:
-                        raise RuntimeError("Invalid condition: %s" % cond)
-
-                condname = res.group(1)
-                oper = res.group(2)
-                condval = res.group(3)
-
-                if not condname in config:
-                        varval = ''
-                else:
-                        varval = config[condname]
-                        if (varval == '*'):
-                                varval = 'y'
-
-                if ctype == 'cnf':
-                        if (oper == '=') and (condval == varval):
-                                return True
-
-                        if (oper == '!=') and (condval != varval):
-                                return True
-                else:
-                        if (oper == '=') and (condval != varval):
-                                return False
-
-                        if (oper == '!=') and (condval == varval):
-                                return False
-
-        if ctype == 'cnf':
-                return False
-
-        return True
-
 def parse_rules(fname, rules):
         "Parse rules file"
@@ -149 +220 @@
 
                         cond = res.group(1)
+                        if cond:
+                                cond = CondParser(cond).parse()
                         varname = res.group(2)
                         vartype = res.group(3)
@@ -232 +305 @@
                 varname, vartype, name, choices, cond = rule
 
-                if cond and (not check_condition(cond, config, rules)):
+                if cond and not cond.evaluate(config):
                         continue
 
@@ -279 +352 @@
 
         # First check that this rule would make sense
-        if cond:
-                if not check_condition(cond, config, rules):
-                        return random_choices(config, rules, start_index + 1)
+        if cond and not cond.evaluate(config):
+                return random_choices(config, rules, start_index + 1)
 
         # Remember previous choices for backtracking
@@ -487 +559 @@
 
         for varname, vartype, name, choices, cond in rules:
-                if cond and (not check_condition(cond, config, rules)):
+                if cond and not cond.evaluate(config):
                         continue
 
@@ -514 +586 @@
         outmk.write('TIMESTAMP_UNIX = %d\n' % timestamp_unix)
         outmc.write('#define TIMESTAMP_UNIX %d\n' % timestamp_unix)
-        defs += ' "-DTIMESTAMP_UNIX=%d"\n' % timestamp_unix
+        defs += ' "-DTIMESTAMP_UNIX=%d"' % timestamp_unix
 
         outmk.write('TIMESTAMP = %s\n' % timestamp)
         outmc.write('#define TIMESTAMP %s\n' % timestamp)
-        defs += ' "-DTIMESTAMP=%s"\n' % timestamp
-
-        outmk.write(defs)
+        defs += ' "-DTIMESTAMP=%s"' % timestamp
+
+        outmk.write('%s\n' % defs)
 
         outmk.close()
@@ -676 +748 @@
                                 varname, vartype, name, choices, cond = rule
 
-                                if cond and (not check_condition(cond, config, rules)):
+                                if cond and not cond.evaluate(config):
                                         continue
 

tools/ew.py

@@ -57 +57 @@
 
 def termemu_detect():
-        for termemu in ['xfce4-terminal', 'xterm']:
+        emus = ['gnome-terminal', 'xfce4-terminal', 'xterm']
+        for termemu in emus:
                 try:
                         subprocess.check_output('which ' + termemu, shell = True)
@@ -64 +65 @@
                         pass
 
+        print('Could not find any of the terminal emulators %s.'%(emus))
+        sys.exit(1)
+
 def run_in_console(cmd, title):
-        ecmd = cmd.replace('"', '\\"')
-        cmdline = termemu_detect() + ' -T ' + '"' + title + '"' + ' -e "' + ecmd + '"'
+        temu = termemu_detect()
+        if temu == 'gnome-terminal':
+                cmdline = temu + ' -- ' + cmd
+        else:
+                ecmd = cmd.replace('"', '\\"')
+                cmdline = temu + ' -T ' + '"' + title + '"' + ' -e "' + ecmd + '"'
+
         print(cmdline)
         if not is_override('dryrun'):
@@ -87 +96 @@
 
 def malta_options():
-        return '-cpu 4Kc'
+        return '-cpu 4Kc -append "console=devices/\\hw\\pci0\\00:0a.0\\com1\\a"'
+
+def find_firmware(name, environ_var, default_paths, extra_info=None):
+        """Find firmware image(s)."""
+
+        if environ_var in os.environ:
+                return os.environ[environ_var]
+
+        for path in default_paths:
+                if os.path.exists(path):
+                        return path
+
+        sys.stderr.write("Cannot find %s binary image(s)!\n" % name)
+        sys.stderr.write(
+            "Either set %s environment variable accordingly or place the image(s) in one of the default locations: %s.\n" %
+            (environ_var, ", ".join(default_paths)))
+        if extra_info is not None:
+                sys.stderr.write(extra_info)
+        return None
 
 def platform_to_qemu_options(platform, machine, processor):
@@ -94 +121 @@
         elif platform == 'arm32':
                 return 'system-arm', '-M integratorcp'
+        elif platform == 'arm64':
+                # Search for the EDK2 firmware image
+                default_paths = (
+                        '/usr/local/qemu-efi-aarch64/QEMU_EFI.fd', # Custom
+                        '/usr/share/edk2/aarch64/QEMU_EFI.fd',     # Fedora
+                        '/usr/share/qemu-efi-aarch64/QEMU_EFI.fd', # Ubuntu
+                )
+                extra_info = ("Pre-compiled binary can be obtained from "
+                    "http://snapshots.linaro.org/components/kernel/leg-virt-tianocore-edk2-upstream/latest/QEMU-AARCH64/RELEASE_GCC49/QEMU_EFI.fd.\n")
+                efi_path = find_firmware(
+                    "EDK2", 'EW_QEMU_EFI_AARCH64', default_paths, extra_info)
+                if efi_path is None:
+                        raise Exception
+
+                return 'system-aarch64', \
+                    '-M virt -cpu cortex-a57 -m 1024 -bios %s' % efi_path
         elif platform == 'ia32':
                 return 'system-i386', pc_options(32)
@@ -108 +151 @@
                 if processor == 'us':
                         return 'system-sparc64', '-M sun4u --prom-env boot-args="console=devices/\\hw\\pci0\\01:01.0\\com1\\a"'
-                elif processor == 'sun4v':
-                        default_path = '/usr/local/opensparc/image/'
-                try:
-                        if os.path.exists(default_path):
-                                opensparc_bins = default_path
-                        elif os.path.exists(os.environ['OPENSPARC_BINARIES']):
-                                opensparc_bins = os.environ['OPENSPARC_BINARIES']
-                        else:
-                                raise Exception
-                except:
-                        print("Cannot find OpenSPARC binary images!")
-                        print("Either set OPENSPARC_BINARIES environment variable accordingly or place the images in %s." % (default_path))
+
+                # processor = 'sun4v'
+                opensparc_bins = find_firmware(
+                    "OpenSPARC", 'OPENSPARC_BINARIES',
+                    ('/usr/local/opensparc/image/', ))
+                if opensparc_bins is None:
                         raise Exception
 
@@ -135 +172 @@
         hdisk_mk()
 
-        return ' -drive file=hdisk.img,index=0,media=disk,format=raw'
+        hdd_options = ''
+        if 'hdd' in overrides.keys():
+                if 'ata' in overrides['hdd'].keys():
+                        hdd_options += ''
+                elif 'virtio-blk' in overrides['hdd'].keys():
+                        hdd_options += ',if=virtio'
+
+        return ' -drive file=hdisk.img,index=0,media=disk,format=raw' + hdd_options
 
 def qemu_nic_ne2k_options():
@@ -201 +245 @@
                 cmdline += ' ' + options
 
-        cmdline += qemu_bd_options()
-
+        if (not 'hdd' in cfg.keys() or cfg['hdd']):
+                cmdline += qemu_bd_options()
         if (not 'net' in cfg.keys()) or cfg['net']:
                 cmdline += qemu_net_options()
@@ -227 +271 @@
         if cfg['image'] == 'image.iso':
                 cmdline += ' -boot d -cdrom image.iso'
+        elif cfg['image'] == 'image.iso@arm64':
+                # Define image.iso cdrom backend.
+                cmdline += ' -drive if=none,file=image.iso,id=cdrom,media=cdrom'
+                # Define scsi bus.
+                cmdline += ' -device virtio-scsi-device'
+                # Define cdrom frontend connected to this scsi bus.
+                cmdline += ' -device scsi-cd,drive=cdrom'
         elif cfg['image'] == 'image.boot':
                 cmdline += ' -kernel image.boot'
@@ -269 +320 @@
                         'xhci' : False,
                         'tablet' : False
+                }
+        },
+        'arm64' : {
+                'virt' : {
+                        'run' : qemu_run,
+                        'image' : 'image.iso@arm64',
+                        'audio' : False,
+                        'console' : True,
+                        'hdd' : False,
+                        'net' : False,
+                        'tablet' : False,
+                        'usb' : False,
+                        'xhci' : False
                 }
         },
@@ -336 +400 @@
 def usage():
         print("%s - emulator wrapper for running HelenOS\n" % os.path.basename(sys.argv[0]))
-        print("%s [-d] [-h] [-net e1k|rtl8139|ne2k|virtio-net] [-nohdd] [-nokvm] [-nonet] [-nosnd] [-nousb] [-noxhci] [-notablet]\n" %
+        print("%s [-d] [-h] [-net e1k|rtl8139|ne2k|virtio-net] [-hdd ata|virtio-blk] [-nohdd] [-nokvm] [-nonet] [-nosnd] [-nousb] [-noxhci] [-notablet]\n" %
             os.path.basename(sys.argv[0]))
         print("-d\tDry run: do not run the emulation, just print the command line.")
@@ -357 +421 @@
 def run():
         expect_nic = False
+        expect_hdd = False
         expect_qemu = False
 
@@ -378 +443 @@
                         continue
 
+                if expect_hdd:
+                        expect_hdd = False
+                        if not 'hdd' in overrides.keys():
+                                overrides['hdd'] = {}
+                        if sys.argv[i] == 'ata':
+                                overrides['hdd']['ata'] = True
+                        elif sys.argv[i] == 'virtio-blk':
+                                overrides['hdd']['virtio-blk'] = True
+                        else:
+                                usage()
+                                exit()
+                        continue
+
                 if expect_qemu:
                         expect_qemu = False
@@ -389 +467 @@
                 elif sys.argv[i] == '-net' and i < len(sys.argv) - 1:
                         expect_nic = True
+                elif sys.argv[i] == '-hdd' and i < len(sys.argv) - 1:
+                        expect_hdd = True
                 elif sys.argv[i] == '-nohdd':
                         overrides['nohdd'] = True

tools/grub/grub-update.sh

@@ -40 +40 @@
 grub_rev="bc220962e366b1b46769ed6f9fa5be603ba58ab5"
 
+build_ia32amd64_pc=false
+build_ia32amd64_efi=false
+build_arm64_efi=false
+
 function grub_build()
 {
-        target="$1"
-        platform="$2"
+        platform="$1"
+        conf_target="$2"
+        conf_platform="$3"
 
-        ./configure --prefix="$builddir/$target-$platform" --target="$target" --with-platform="$platform" --disable-werror || exit 1
+        ./configure --prefix="$builddir/$platform" --target="$conf_target" --with-platform="$conf_platform" --disable-werror || exit 1
         make clean || exit 1
         make install || exit 1
@@ -55 +60 @@
         platform="$2"
 
-        rm -rf "$helenosdir"/boot/"$gdir"/"$platform" || exit 1
-        cp -R "$builddir"/"$platform"/lib64/grub/"$platform" "$helenosdir"/boot/"$gdir" || exit 1
-        rm -f "$helenosdir"/boot/"$gdir"/"$platform"/*.image || exit 1
-        rm -f "$helenosdir"/boot/"$gdir"/"$platform"/*.module || exit 1
-        git add "$helenosdir"/boot/"$gdir"/"$platform" || exit 1
+        echo "$grub_rev" > "$helenosdir"/boot/grub/"$gdir"/REVISION || exit 1
+        rm -rf "$helenosdir"/boot/grub/"$gdir"/"$platform" || exit 1
+        cp -R "$builddir"/"$platform"/lib*/grub/"$platform" "$helenosdir"/boot/grub/"$gdir" || exit 1
+        rm -f "$helenosdir"/boot/grub/"$gdir"/"$platform"/*.image || exit 1
+        rm -f "$helenosdir"/boot/grub/"$gdir"/"$platform"/*.module || exit 1
+        git add "$helenosdir"/boot/grub/"$gdir"/"$platform" || exit 1
 }
+
+function show_usage()
+{
+        echo "Script to generate/update prebuild Grub2 in HelenOS source tree"
+        echo
+        echo "Syntax:"
+        echo " $0 <target>"
+        echo
+        echo "Possible targets are:"
+        echo " ia32+amd64-pc"
+        echo " ia32+amd64-efi"
+        echo " arm64-efi"
+        echo " all             build all targets"
+        echo
+
+        exit 3
+}
+
+if [ "$#" -ne "1" ] ; then
+        show_usage
+fi
+
+case "$1" in
+        ia32+amd64-pc)
+                build_ia32amd64_pc=true
+                ;;
+        ia32+amd64-efi)
+                build_ia32amd64_efi=true
+                ;;
+        arm64-efi)
+                build_arm64_efi=true
+                ;;
+        all)
+                build_ia32amd64_pc=true
+                build_ia32amd64_efi=true
+                build_arm64_efi=true
+                ;;
+        *)
+                show_usage
+                ;;
+esac
 
 # Prepare a clone of Grub2 repo
@@ -72 +119 @@
 git reset --hard "$grub_rev" || exit 1
 
-echo "$grub_rev" >"$helenosdir"/boot/grub.pc/REVISION || exit 1
-echo "$grub_rev" > "$helenosdir"/boot/grub.efi/REVISION || exit 1
+./autogen.sh || exit 1
 
-# Build each platform to a different directory
-./autogen.sh || exit 1
-grub_build i386 pc
-grub_build i386 efi
-grub_build x86_64 efi
+if $build_ia32amd64_pc ; then
+        cd "$workdir" || exit 1
+        grub_build i386-pc i386 pc
 
-# Extract El Torrito boot image for i386-pc
-cd "$helenosdir"/boot/grub.pc || exit 1
-rm -f pc.img || exit 1
-"$builddir"/i386-pc/bin/grub-mkrescue -o phony --xorriso="$origdir/getimage.sh" || exit 1
+        # Extract El Torrito boot image for i386-pc
+        cd "$helenosdir"/boot/grub/ia32-pc || exit 1
+        rm -f pc.img || exit 1
+        "$builddir"/i386-pc/bin/grub-mkrescue -o phony --xorriso="$origdir/getimage.sh" || exit 1
 
-# Extract El Torrito boot image for i386-efi
-cd "$helenosdir"/boot/grub.efi || exit 1
-rm -f efi.img.gz || exit 1
-"$builddir"/i386-efi/bin/grub-mkrescue -o phony --xorriso="$origdir/getimage.sh" || exit 1
-mv efi.img i386-efi.img
+        grub_files_update ia32-pc i386-pc
+fi
 
-# Extract El Torrito boot image for x86_64-efi
-cd "$helenosdir"/boot/grub.efi || exit 1
-rm -f efi.img.gz || exit 1
-"$builddir"/x86_64-efi/bin/grub-mkrescue -o phony --xorriso="$origdir/getimage.sh" || exit 1
+if $build_ia32amd64_efi ; then
+        cd "$workdir" || exit 1
 
-# Combine El Torrito boot images for x86_64-efi and i386-efi
-mkdir tmp || exit 1
-mcopy -ns -i i386-efi.img ::efi tmp || exit 1
-mcopy -s -i efi.img tmp/* :: || exit 1
-gzip efi.img || exit 1
-rm -rf tmp || exit 1
-rm -f i386-efi.img || exit 1
+        # Build each platform to a different directory
+        grub_build i386-efi i386 efi
+        grub_build x86_64-efi x86_64 efi
 
-# Update Grub files for all platforms
-grub_files_update grub.pc i386-pc
-grub_files_update grub.efi i386-efi
-grub_files_update grub.efi x86_64-efi
+        # Extract El Torrito boot image for i386-efi
+        cd "$helenosdir"/boot/grub/ia32-efi || exit 1
+        rm -f efi.img.gz || exit 1
+        "$builddir"/i386-efi/bin/grub-mkrescue -o phony --xorriso="$origdir/getimage.sh" || exit 1
+        mv efi.img i386-efi.img
+
+        # Extract El Torrito boot image for x86_64-efi
+        cd "$helenosdir"/boot/grub/ia32-efi || exit 1
+        rm -f efi.img.gz || exit 1
+        "$builddir"/x86_64-efi/bin/grub-mkrescue -o phony --xorriso="$origdir/getimage.sh" || exit 1
+
+        # Combine El Torrito boot images for x86_64-efi and i386-efi
+        mkdir tmp || exit 1
+        mcopy -ns -i i386-efi.img ::efi tmp || exit 1
+        mcopy -s -i efi.img tmp/* :: || exit 1
+        gzip efi.img || exit 1
+        rm -rf tmp || exit 1
+        rm -f i386-efi.img || exit 1
+
+        # Update Grub files for all platforms
+        grub_files_update ia32-efi i386-efi
+        grub_files_update ia32-efi x86_64-efi
+fi
+
+if $build_arm64_efi ; then
+        cd "$workdir" || exit 1
+
+        # Check that the expected compiler is present on PATH
+        if ! [ -x "$(command -v aarch64-linux-gnu-gcc)" ] ; then
+                echo "Error: aarch64-linux-gnu-gcc is missing" >&2
+                exit 1
+        fi
+
+        grub_build arm64-efi aarch64-linux-gnu efi
+
+        # Extract El Torrito boot image for arm64-efi
+        cd "$helenosdir"/boot/grub/arm64-efi || exit 1
+        rm -f efi.img.gz || exit 1
+        "$builddir"/arm64-efi/bin/grub-mkrescue -o phony --xorriso="$origdir/getimage.sh" || exit 1
+        gzip efi.img || exit 1
+
+        grub_files_update arm64-efi arm64-efi
+fi
 
 echo "GRUB update successful."

tools/grub/mkimage.sh

@@ -39 +39 @@
 orig_dir="$(cd "$(dirname "$0")" && pwd)"
 grub_tools_dir="$orig_dir/grub-build/i386-pc/bin"
-grub_mod_dir="$orig_dir/../../boot/grub.pc/i386-pc"
+grub_mod_dir="$orig_dir/../../boot/grub/ia32-pc/i386-pc"
 
 "$grub_tools_dir"/grub-mkimage --directory "$grub_mod_dir" \

tools/toolchain.sh

@@ -66 +66 @@
         echo " amd64      AMD64 (x86-64, x64)"
         echo " arm32      ARM 32b"
+        echo " arm64      AArch64"
         echo " ia32       IA-32 (x86, i386)"
         echo " ia64       IA-64 (Itanium)"
@@ -103 +104 @@
         
         if [ -z "$1" ] || [ "$1" == "all" ] ; then
-                PLATFORMS=("amd64" "arm32" "ia32" "ia64" "mips32" "mips32eb" "ppc32" "riscv64" "sparc64")
+                PLATFORMS=("amd64" "arm32" "arm64" "ia32" "ia64" "mips32" "mips32eb" "ppc32" "riscv64" "sparc64")
         else
                 PLATFORMS=("$1")
@@ -275 +276 @@
                 "arm32")
                         GNU_ARCH="arm"
+                        ;;
+                "arm64")
+                        GNU_ARCH="aarch64"
                         ;;
                 "ia32")
@@ -497 +501 @@
                 test_version
                 ;;
-        amd64|arm32|ia32|ia64|mips32|mips32eb|ppc32|riscv64|sparc64)
+        amd64|arm32|arm64|ia32|ia64|mips32|mips32eb|ppc32|riscv64|sparc64)
                 prepare
                 build_target "$1"
@@ -505 +509 @@
                 build_target "amd64"
                 build_target "arm32"
+                build_target "arm64"
                 build_target "ia32"
                 build_target "ia64"
@@ -517 +522 @@
                 build_target "amd64"
                 build_target "arm32"
+                build_target "arm64"
                 build_target "ia32"
                 build_target "ia64"
@@ -528 +534 @@
                 build_target "amd64" &
                 build_target "arm32" &
+                build_target "arm64" &
                 build_target "ia32" &
                 build_target "ia64" &
@@ -543 +550 @@
                 wait
 
+                build_target "arm64" &
                 build_target "ia32" &
+                wait
+
                 build_target "ia64" &
+                build_target "mips32" &
                 wait
 
-                build_target "mips32" &
                 build_target "mips32eb" &
+                build_target "ppc32" &
                 wait
 
-                build_target "ppc32" &
                 build_target "riscv64" &
-                wait
-
                 build_target "sparc64" &
                 wait

tools/travis.sh

@@ -52 +52 @@
 arm32/integratorcp:arm-helenos:image.boot
 arm32/raspberrypi:arm-helenos:uImage.bin
+arm64/virt:aarch64-helenos:image.iso
 ia32:i686-helenos:image.iso
 ia64/i460GX:ia64-helenos:image.boot