# HG changeset patch # User Aleksej Bobylev # Date 1546341354 -7200 # Node ID 350e506f382112709c47c0068136b0235097e608 # Parent ac50637642b765348b38cf5440c069ad7f5ac0c4 Update SliTaz syslinuxes diff -r ac50637642b7 -r 350e506f3821 syslinux-slitaz-extra-repack/receipt --- a/syslinux-slitaz-extra-repack/receipt Tue Jan 01 04:17:55 2019 +0200 +++ b/syslinux-slitaz-extra-repack/receipt Tue Jan 01 13:15:54 2019 +0200 @@ -1,26 +1,25 @@ # SliTaz package receipt. PACKAGE="syslinux-slitaz-extra-repack" -VERSION="4.06" +# check the timestamps on the cooker page http://cook.slitaz.org/index.cgi?pkg=syslinux-extra +VERSION="181231-1226" # YYmmdd-HHMM CATEGORY="base-system" SHORT_DESC="MBR/FAT/EXT3/PXE bootloader: SliTaz fork, repacked from SliTaz-5" MAINTAINER="al.bobylev@gmail.com" LICENSE="GPL2" -WEB_SITE="http://hg.slitaz.org/wok/file/tip/syslinux" +WEB_SITE="http://cook.slitaz.org/index.cgi?pkg=syslinux-extra" +HOST_ARCH="i486" REPOLOGY="-" -TARBALL="syslinux-slitaz-extra-4.06.cpio" -WGET_URL="http://mirror1.slitaz.org/packages/5.0/syslinux-extra-4.06.tazpkg" +TARBALL="syslinux-slitaz-extra-$VERSION.cpio" # allow changes for source tarball +WGET_URL="http://cook.slitaz.org/index.cgi?download=syslinux-extra-4.06.tazpkg" # this URL is always the same + +DEPENDS="syslinux-slitaz-repack posixovl" +PROVIDE="syslinux-extra" compile_rules() { - cpio -dmF $src/$TARBALL -i - lzma d $src/fs.cpio.lzma -so | cpio -idm + cpio -dmF $TARBALL -i + lzma -d fs.cpio.lzma -c | cpio -idm mkdir $install - cp -r $src/fs/* $install + cp -r fs/* $install } - -genpkg_rules() { - copy @std - DEPENDS="syslinux-slitaz-repack posixovl" - PROVIDE="syslinux-extra" -} diff -r ac50637642b7 -r 350e506f3821 syslinux-slitaz-repack/receipt --- a/syslinux-slitaz-repack/receipt Tue Jan 01 04:17:55 2019 +0200 +++ b/syslinux-slitaz-repack/receipt Tue Jan 01 13:15:54 2019 +0200 @@ -1,40 +1,37 @@ # SliTaz package receipt. PACKAGE="syslinux-slitaz-repack" -VERSION="4.06" +# check the timestamps on the cooker page http://cook.slitaz.org/index.cgi?pkg=syslinux +VERSION="181231-1226" # YYmmdd-HHMM CATEGORY="base-system" SHORT_DESC="LiveCD ISO bootloader: SliTaz fork, repacked from SliTaz-5" MAINTAINER="al.bobylev@gmail.com" LICENSE="GPL2" -WEB_SITE="http://hg.slitaz.org/wok/file/tip/syslinux" +WEB_SITE="http://cook.slitaz.org/index.cgi?pkg=syslinux" +HOST_ARCH="any" REPOLOGY="-" -TARBALL="syslinux-slitaz-4.06.cpio" -WGET_URL="http://mirror1.slitaz.org/packages/5.0/syslinux-4.06.tazpkg" +TARBALL="syslinux-slitaz-$VERSION.cpio" # allow changes for source tarball +WGET_URL="http://cook.slitaz.org/index.cgi?download=syslinux-4.06.tazpkg" # this URL is always the same -COOKOPTS="force-arch" # different boot/ +CONFIG_FILES="/boot/isolinux/i18n.cfg /boot/isolinux/isolinux.cfg \ +/boot/isolinux/kbd" +TAGS="boot" +DEPENDS="ipxe memtest" +PROVIDE="syslinux" compile_rules() { - cpio -dmF $src/$TARBALL -i - lzma d $src/fs.cpio.lzma -so | cpio -idm + cpio -dmF $TARBALL -i + lzma -d fs.cpio.lzma -c | cpio -idm mkdir $install - cp -r $src/fs/* $install + cp -r fs/* $install sed -i 's|5\.0-RC4|Next|; s|\.jpg|\.png|; s|autologin|font=ter-v14n &|' \ $install/boot/isolinux/isolinux.cfg } -genpkg_rules() { - copy @std - CONFIG_FILES="/boot/isolinux/i18n.cfg /boot/isolinux/isolinux.cfg \ - /boot/isolinux/kbd" - TAGS="boot" - DEPENDS="ipxe memtest" - PROVIDE="syslinux" -} - post_install() { sed -i "/MENU TITLE SliTaz GNU\/Linux/ s| [0-9X]*$| $(date +%Y%m%d)|" \ "$1/boot/isolinux/isolinux.cfg" - sed '/MENU TITLE/!d;s/MENU TITLE //' > $1/etc/slitaz-version \ + sed '/MENU TITLE/!d; s|MENU TITLE ||' > $1/etc/slitaz-version \ < "$1/boot/isolinux/isolinux.cfg" } diff -r ac50637642b7 -r 350e506f3821 syslinux/receipt --- a/syslinux/receipt Tue Jan 01 04:17:55 2019 +0200 +++ b/syslinux/receipt Tue Jan 01 13:15:54 2019 +0200 @@ -4,7 +4,7 @@ VERSION="4.06" CATEGORY="base-system" SHORT_DESC="LiveCD ISO bootloader (isolinux)" -MAINTAINER="devel@slitaz.org" +MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL2" WEB_SITE="https://www.syslinux.org/wiki/index.php?title=The_Syslinux_Project" @@ -15,7 +15,7 @@ util-linux-uuid-dev advancecomp libidn linld python" SPLIT="$PACKAGE-extra $PACKAGE-modules $PACKAGE-tools" -COOKOPTS="skip-log-errors force-arch" # different files in boot/ +COOKOPTS="skip-log-errors" LINLD="$WOK/linld/source" compile_rules() { diff -r ac50637642b7 -r 350e506f3821 syslinux/stuff/iso2exe/iso2exe.sh --- a/syslinux/stuff/iso2exe/iso2exe.sh Tue Jan 01 04:17:55 2019 +0200 +++ b/syslinux/stuff/iso2exe/iso2exe.sh Tue Jan 01 13:15:54 2019 +0200 @@ -116,10 +116,10 @@ ddq if=/tmp/exe$$ bs=1 count=3 skip=$((0x7C00)) of=$1 seek=$i conv=notrunc fi rm -f /tmp/exe$$ /tmp/coff$$ - if [ -z "$RECURSIVE_PARTITION" -a $(get 470 $1 4) -eq 0 ]; then - store 464 $((1+$i/512)) $1 8 - store 470 $(($i/512)) $1 8 - store 474 $(($(get 474 $1 4) - $i/512)) $1 32 + if [ -z "$RECURSIVE_PARTITION" -a $(get 454 $1 4) -eq 0 ]; then + store 448 $((1+$i/512)) $1 8 + store 454 $(($i/512)) $1 8 + store 458 $(($(get 458 $1 4) - $i/512)) $1 32 fi } @@ -204,19 +204,19 @@ printf " $i:%08X %08X %02X\n" $OFFSET $SIZE \ $(get $((446+4+16*i)) "$1" 1) done - if [ $(get 466 "$1") -eq 65263 ]; then + if [ $(get 450 "$1") -eq 65262 ]; then echo "EFI partitions :" - n=$(get 584 "$1" 1) + n=$(get 592 "$1") s=$(get 596 "$1") - o=$((($(get 552 "$1" 1)*512)-($(get 592 "$1")*$s))) + o=$(($(get 584 "$1")*512)) i=0 - while [ $n -gt $i ]; do + while [ $i -lt $n ]; do f=$(get $(($o+0x20)) "$1" 4) l=$(($(get $(($o+0x28)) "$1" 4)-$f)) [ $l -eq 0 ] && break printf " $i:%08X %08X %s\n" $f $(($l+1)) \ - "$(od -An -N 36 -w -j $(($o+0x38)) -t a "$1" \ - | sed 's/\( nul\)*//g;s/ //g;s/ sp//')" + "$(od -An -N 72 -w72 -j $(($o+0x38)) -t a "$1" \ + | sed 's/ nul//g;s/ //g;s/ sp//g')" o=$(($o+$s)) i=$(($i+1)) done @@ -552,7 +552,7 @@ 0) [ -x /usr/bin/isohybrid ] && isohybrid -entry 2 $1;; esac - gpt= ; [ $(get 466 $1) -eq 65263 ] && gpt=1 + gpt= ; [ $(get 450 $1) -eq 65262 ] && gpt=1 mac= ; [ $(get 2048 $1) -eq 19792 ] && mac=1 echo "Read hybrid & tazlito data..." if [ -n "$gpt" ]; then diff -r ac50637642b7 -r 350e506f3821 syslinux/stuff/iso2exe/taziso --- a/syslinux/stuff/iso2exe/taziso Tue Jan 01 04:17:55 2019 +0200 +++ b/syslinux/stuff/iso2exe/taziso Tue Jan 01 13:15:54 2019 +0200 @@ -234,7 +234,7 @@ extraargs="mount=$(getuuid) subroot=slitaz" fi echo -en "\nInstall boot files..." - for i in $media/boot/bzImage $media/boot/*pxe* \ + for i in $media/boot/bzImage* $media/boot/*pxe* \ $media/boot/isolinux/he* $media/boot/isolinux/opt* \ $media/README $media/boot/memtest* ; do [ -s $i ] && cp $i $mnt/slitaz/boot @@ -243,7 +243,8 @@ [ $(get 0 $i 2> /dev/null || echo 0) -eq 23117 ] && mv $i $i.exe done - gettazboot $mnt/slitaz/boot/tazboot.exe + bzimage=$(cd $mnt/slitaz/boot ; ls bzimage*) + gettazboot $mnt/slitaz/boot/tazboot.exe # autoappend 64 suffix unix2dos > $mnt/slitaz/boot/tazboot.cmd <> $mnt/boot/grub/menu.lst < /tmp/isoinfo$$ if [ -x "$(which iso2exe)" ]; then echo "----" + blkid "$ISO" | while read args; do + set -- $args + while [ -n "$2" ]; do + case "$2" in + *UUID*|PT*) echo $2;; + esac + shift + done + done + if ! fdisk -l "$ISO" | grep -q 'valid partition'; then + fdisk -l "$ISO" | grep heads + fdisk -l "$ISO" | sed 's/^ *[^ ]* *//;s/ */ /g;$!d' + fi + echo "----" iso2exe -l "$ISO" fi >> /tmp/isoinfo$$ if [ "$1" ]; then @@ -1335,6 +1350,7 @@ exit fi ISO="${1:-/dev/null}" +[ ${ISO:0:1} != "/" ] && ISO=$(cd $(dirname $ISO); echo $PWD/$(basename $ISO)) [ -z "$(isiso 2> /dev/null)" ] && echo "Usage : $0 file.iso" && exit 1 media=/tmp/media$$ mkdir -p $media diff -r ac50637642b7 -r 350e506f3821 syslinux/stuff/isolinux.cfg --- a/syslinux/stuff/isolinux.cfg Tue Jan 01 04:17:55 2019 +0200 +++ b/syslinux/stuff/isolinux.cfg Tue Jan 01 13:15:54 2019 +0200 @@ -33,10 +33,6 @@ INCLUDE i18n.cfg -LABEL memtest mem ram - MENU LABEL Check memory - KERNEL /boot/memtest - LABEL md5sum check test verify MENU LABEL Check media COM32 c32box.c32 @@ -46,10 +42,6 @@ MENU LABEL Command Line MENU QUIT -LABEL web zeb - MENU LABEL Web Boot - KERNEL /boot/ipxe - LABEL reboot MENU LABEL Reboot System COM32 c32box.c32 diff -r ac50637642b7 -r 350e506f3821 syslinux/stuff/patches/fixes-4.07.u --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/syslinux/stuff/patches/fixes-4.07.u Tue Jan 01 13:15:54 2019 +0200 @@ -0,0 +1,63 @@ +--- mbr/isohdpfx.S ++++ mbr/isohdpfx.S +@@ -167,20 +167,22 @@ + read_sector_cbios: movb $0x42, %ah ; jmp read_common */ + movl $0xeb42b4+((read_common-read_sector_cbios-4) << 24), \ + (read_sector_cbios) +- jmp 1f ++ jmp 2f + 1: ++ xor %cx, %cx /* Clear EBIOS flag. */ ++2: + popw %dx + pushw %cx /* EBIOS flag */ + + /* Get (C)HS geometry */ + movb $0x08, %ah + int $0x13 +- andw $0x3f, %cx /* Sector count */ + popw %bx /* EBIOS flag */ +- pushw %cx /* -16: Save sectors on the stack */ + movzbw %dh, %ax /* dh = max head */ + incw %ax /* From 0-based max to count */ +- pushw %ax /* -18: Save heads on the stack */ ++ pushw %ax /* -16: Save heads on the stack */ ++ andw $0x3f, %cx /* Sector count */ ++ pushw %cx /* -18: Save sectors on the stack */ + mulw %cx /* Heads*sectors -> sectors per cylinder */ + + pushw %bx /* -20: EBIOS flag */ +--- extlinux/main.c ++++ extlinux/main.c +@@ -1236,9 +1236,7 @@ + if (devfd < 0) + return 1; + +- if (opt.reset_adv) +- syslinux_reset_adv(syslinux_adv); +- else if (ext_read_adv(path, devfd, &filename) < 0) { ++ if (ext_read_adv(path, devfd, &filename) < 0) { + close(devfd); + return 1; + } +--- core/isolinux.asm ++++ core/isolinux.asm +@@ -426,14 +426,17 @@ + .ok: + xor bx,bx + push bp ++ push eax + call getlinsec ++ pop eax + pop cx +- mov dx,cx ++ movzx edx,cx + pop bp + pop bx + + shl cx,SECTOR_SHIFT - 4 + add bx,cx ++ add eax,edx + sub bp,dx + jnz .more + diff -r ac50637642b7 -r 350e506f3821 syslinux/stuff/patches/lzop-1.03-gcc6.u --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/syslinux/stuff/patches/lzop-1.03-gcc6.u Tue Jan 01 13:15:54 2019 +0200 @@ -0,0 +1,37 @@ +gcc-6 has additional errors e.g. + +./test.c:1:12: error: variably modified '__acc_cta' at file scope + extern int __acc_cta[1-2*!((1l << (8*8 -1)) < 0)]; + ^~~~~~~~~ + +This is rightly pointed out since that index is undefined + +Signed-off-by: Khem Raj +Upstream-Status: Pending + +--- lzo/src/miniacc.h 2016-02-10 16:09:23.247315866 +0100 ++++ lzo/src/miniacc.h 2016-02-10 16:12:14.973297054 +0100 +@@ -4412,12 +4412,12 @@ + #if defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0150) + #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) + #else +- ACCCHK_ASSERT((1 << (8*SIZEOF_INT-1)) < 0) ++ ACCCHK_ASSERT((int)(1u << (8*SIZEOF_INT-1)) < 0) + #endif + ACCCHK_ASSERT((1u << (8*SIZEOF_INT-1)) > 0) + #if 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) + #else +- ACCCHK_ASSERT((1l << (8*SIZEOF_LONG-1)) < 0) ++ ACCCHK_ASSERT((long)(1ul << (8*SIZEOF_LONG-1)) < 0) + #endif + ACCCHK_ASSERT((1ul << (8*SIZEOF_LONG-1)) > 0) + #if defined(acc_int16e_t) +@@ -4646,7 +4646,7 @@ + #elif 1 && (ACC_CC_LCC || ACC_CC_LCCWIN32) && !defined(ACCCHK_CFG_PEDANTIC) + #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) + #elif !defined(ACC_BROKEN_INTEGRAL_PROMOTION) && (SIZEOF_INT > 1) +- ACCCHK_ASSERT( (((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0) ++ ACCCHK_ASSERT( (int)((unsigned int)((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0) + #endif + #if (ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0530) && (__BORLANDC__ < 0x0560)) + # pragma option pop diff -r ac50637642b7 -r 350e506f3821 syslinux/stuff/patches/series --- a/syslinux/stuff/patches/series Tue Jan 01 04:17:55 2019 +0200 +++ b/syslinux/stuff/patches/series Tue Jan 01 13:15:54 2019 +0200 @@ -2,3 +2,5 @@ -p0|iso9660.u -p0|readconfig.u -p0|keytab-lilo.u +-p0|lzop-1.03-gcc6.u +-p0|fixes-4.07.u diff -r ac50637642b7 -r 350e506f3821 syslinux/stuff/slitaz-next/miniacc.h --- a/syslinux/stuff/slitaz-next/miniacc.h Tue Jan 01 04:17:55 2019 +0200 +++ b/syslinux/stuff/slitaz-next/miniacc.h Tue Jan 01 13:15:54 2019 +0200 @@ -2,7 +2,7 @@ This file is part of the UPX executable compressor. - Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. UPX and the UCL library are free software; you can redistribute them @@ -27,7 +27,7 @@ #ifndef __ACC_H_INCLUDED #define __ACC_H_INCLUDED 1 -#define ACC_VERSION 20170125L +#define ACC_VERSION 20170301L #if defined(__CYGWIN32__) && !defined(__CYGWIN__) # define __CYGWIN__ __CYGWIN32__ #endif @@ -639,6 +639,12 @@ # define ACC_CC_ARMCC __ARMCC_VERSION # define ACC_INFO_CC "ARM C Compiler" # define ACC_INFO_CCVER __VERSION__ +#elif defined(__clang__) && defined(__c2__) && defined(__c2_version__) && defined(_MSC_VER) +# define ACC_CC_CLANG (__clang_major__ * 0x10000L + (__clang_minor__-0) * 0x100 + (__clang_patchlevel__-0)) +# define ACC_CC_CLANG_C2 _MSC_VER +# define ACC_CC_CLANG_VENDOR_MICROSOFT 1 +# define ACC_INFO_CC "clang/c2" +# define ACC_INFO_CCVER ACC_PP_MACRO_EXPAND(__c2_version__) #elif defined(__clang__) && defined(__llvm__) && defined(__VERSION__) # if defined(__clang_major__) && defined(__clang_minor__) && defined(__clang_patchlevel__) # define ACC_CC_CLANG (__clang_major__ * 0x10000L + (__clang_minor__-0) * 0x100 + (__clang_patchlevel__-0)) @@ -650,7 +656,13 @@ # elif defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__VERSION__) # define ACC_CC_CLANG_GNUC (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100 + (__GNUC_PATCHLEVEL__-0)) # endif -# define ACC_INFO_CC "clang" +# if defined(__APPLE_CC__) +# define ACC_CC_CLANG_VENDOR_APPLE 1 +# define ACC_INFO_CC "clang/apple" +# else +# define ACC_CC_CLANG_VENDOR_LLVM 1 +# define ACC_INFO_CC "clang" +# endif # if defined(__clang_version__) # define ACC_INFO_CCVER __clang_version__ # else @@ -971,6 +983,9 @@ #elif defined(__powerpc64le__) || defined(__powerpc64le) || defined(__ppc64le__) || defined(__PPC64LE__) # define ACC_ARCH_POWERPC 1 # define ACC_INFO_ARCH "powerpc" +#elif defined(__riscv) +# define ACC_ARCH_RISCV 1 +# define ACC_INFO_ARCH "riscv" #elif defined(__s390__) || defined(__s390) || defined(__s390x__) || defined(__s390x) # define ACC_ARCH_S390 1 # define ACC_INFO_ARCH "s390" @@ -1012,6 +1027,8 @@ # define ACC_ARCH_ARM_THUMB2 1 # elif 1 && defined(__TARGET_ARCH_THUMB) && ((__TARGET_ARCH_THUMB)+0 >= 4) # define ACC_ARCH_ARM_THUMB2 1 +# elif 1 && defined(_MSC_VER) && defined(_M_THUMB) && ((_M_THUMB)+0 >= 7) +# define ACC_ARCH_ARM_THUMB2 1 # endif # endif #endif @@ -1223,7 +1240,7 @@ # error "unexpected configuration - check your compiler defines" # endif #endif -#ifdef __cplusplus +#if defined(__cplusplus) extern "C" { #endif #if (ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0200)) @@ -1246,7 +1263,7 @@ #else # error "FIXME - implement ACC_MM_AHSHIFT" #endif -#ifdef __cplusplus +#if defined(__cplusplus) } #endif #endif @@ -1945,6 +1962,7 @@ #elif (ACC_CC_INTELC && (__INTEL_COMPILER >= 800)) # define __acc_likely(e) (__builtin_expect(!!(e),1)) # define __acc_unlikely(e) (__builtin_expect(!!(e),0)) +#elif (ACC_CC_CLANG && ACC_CC_CLANG_C2) #elif (ACC_CC_ARMCC_GNUC || ACC_CC_CLANG || ACC_CC_LLVM || ACC_CC_PATHSCALE) # define __acc_likely(e) (__builtin_expect(!!(e),1)) # define __acc_unlikely(e) (__builtin_expect(!!(e),0)) @@ -2486,7 +2504,7 @@ # define ACC_ABI_BIG_ENDIAN 1 #elif (ACC_ARCH_IA64) && (ACC_OS_POSIX_LINUX || ACC_OS_WIN64) # define ACC_ABI_LITTLE_ENDIAN 1 -#elif (ACC_ARCH_ALPHA || ACC_ARCH_AMD64 || ACC_ARCH_BLACKFIN || ACC_ARCH_CRIS || ACC_ARCH_I086 || ACC_ARCH_I386 || ACC_ARCH_MSP430) +#elif (ACC_ARCH_ALPHA || ACC_ARCH_AMD64 || ACC_ARCH_BLACKFIN || ACC_ARCH_CRIS || ACC_ARCH_I086 || ACC_ARCH_I386 || ACC_ARCH_MSP430 || ACC_ARCH_RISCV) # define ACC_ABI_LITTLE_ENDIAN 1 #elif (ACC_ARCH_AVR32 || ACC_ARCH_M68K || ACC_ARCH_S390 || ACC_ARCH_SPU) # define ACC_ABI_BIG_ENDIAN 1 @@ -2506,6 +2524,8 @@ # define ACC_ABI_BIG_ENDIAN 1 #elif 1 && (ACC_ARCH_ARM) && defined(__ARMEL__) && !defined(__ARMEB__) # define ACC_ABI_LITTLE_ENDIAN 1 +#elif 1 && (ACC_ARCH_ARM) && defined(_MSC_VER) && defined(_WIN32) +# define ACC_ABI_LITTLE_ENDIAN 1 #elif 1 && (ACC_ARCH_ARM && ACC_CC_ARMCC_ARMCC) # if defined(__BIG_ENDIAN) && defined(__LITTLE_ENDIAN) # error "unexpected configuration - check your compiler defines" @@ -2521,6 +2541,8 @@ # define ACC_ABI_BIG_ENDIAN 1 #elif 1 && (ACC_ARCH_ARM64) && defined(__AARCH64EL__) && !defined(__AARCH64EB__) # define ACC_ABI_LITTLE_ENDIAN 1 +#elif 1 && (ACC_ARCH_ARM64) && defined(_MSC_VER) && defined(_WIN32) +# define ACC_ABI_LITTLE_ENDIAN 1 #elif 1 && (ACC_ARCH_MIPS) && defined(__MIPSEB__) && !defined(__MIPSEL__) # define ACC_ABI_BIG_ENDIAN 1 #elif 1 && (ACC_ARCH_MIPS) && defined(__MIPSEL__) && !defined(__MIPSEB__) @@ -2691,6 +2713,13 @@ # ifndef ACC_OPT_UNALIGNED32 # define ACC_OPT_UNALIGNED32 1 # endif +# elif 1 && defined(_MSC_VER) && defined(_M_ARM) && ((_M_ARM)+0 >= 7) +# ifndef ACC_OPT_UNALIGNED16 +# define ACC_OPT_UNALIGNED16 1 +# endif +# ifndef ACC_OPT_UNALIGNED32 +# define ACC_OPT_UNALIGNED32 1 +# endif # endif #elif (ACC_ARCH_ARM64) # ifndef ACC_OPT_UNALIGNED16 @@ -2749,6 +2778,19 @@ # endif # endif # endif +#elif (ACC_ARCH_RISCV) +# define ACC_OPT_AVOID_UINT_INDEX 1 +# ifndef ACC_OPT_UNALIGNED16 +# define ACC_OPT_UNALIGNED16 1 +# endif +# ifndef ACC_OPT_UNALIGNED32 +# define ACC_OPT_UNALIGNED32 1 +# endif +# if (ACC_WORDSIZE == 8) +# ifndef ACC_OPT_UNALIGNED64 +# define ACC_OPT_UNALIGNED64 1 +# endif +# endif #elif (ACC_ARCH_S390) # ifndef ACC_OPT_UNALIGNED16 # define ACC_OPT_UNALIGNED16 1 @@ -3418,7 +3460,7 @@ # undef HAVE_UTIME_H # undef HAVE_SYS_TIME_H # define HAVE_SYS_UTIME_H 1 -#elif (ACC_CC_CLANG_MSC || ACC_CC_GHS || ACC_CC_INTELC_MSC || ACC_CC_MSC) +#elif (ACC_CC_CLANG_C2 || ACC_CC_CLANG_MSC || ACC_CC_GHS || ACC_CC_INTELC_MSC || ACC_CC_MSC) # undef HAVE_DIRENT_H # undef HAVE_UNISTD_H # undef HAVE_UTIME_H @@ -3721,7 +3763,7 @@ # endif #elif (ACC_CC_LCCWIN32) # define utime _utime -#elif (ACC_CC_MSC) +#elif (ACC_CC_CLANG_C2 || ACC_CC_MSC) # if (_MSC_VER < 600) # undef HAVE_STRFTIME # endif @@ -3921,8 +3963,6 @@ #endif #if (ACC_BROKEN_CDECL_ALT_SYNTAX) typedef void __acc_cdecl_sighandler (*acc_sighandler_t)(acc_signo_t); -#elif defined(RETSIGTYPE) -typedef RETSIGTYPE (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t); #else typedef void (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t); #endif @@ -4542,8 +4582,6 @@ #endif #if (ACC_BROKEN_CDECL_ALT_SYNTAX) typedef void __acc_cdecl_sighandler (*acc_sighandler_t)(acc_signo_t); -#elif defined(RETSIGTYPE) -typedef RETSIGTYPE (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t); #else typedef void (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t); #endif @@ -4834,7 +4872,7 @@ #if (HAVE_SIGNAL_H) # include #endif -#if (TIME_WITH_SYS_TIME) +#if (HAVE_SYS_TIME_H && HAVE_TIME_H) # include # include #elif (HAVE_TIME_H) diff -r ac50637642b7 -r 350e506f3821 syslinux/stuff/tools/isohybrid.sh --- a/syslinux/stuff/tools/isohybrid.sh Tue Jan 01 04:17:55 2019 +0200 +++ b/syslinux/stuff/tools/isohybrid.sh Tue Jan 01 13:15:54 2019 +0200 @@ -187,44 +187,48 @@ store32 440 $id store32 508 0xAA550000 e=$(( ((${entry:-1} -1) % 4) *16 +446)) - store32 $e 0x10080 esect=$(( ($sectors + ((($cylinders -1) & 0x300) >>2)) <<16)) ecyl=$(( (($cylinders -1) & 0xff) <<24)) - store32 $(($e + 4)) $(($partype + (($heads - 1) <<8) +$esect +$ecyl)) - store32 $(($e + 8)) $offset - store32 $(($e + 12)) $(($cylinders * $heads * $sectors)) - if [ -n "$efi_ofs" ]; then + epart=$(((($heads - 1) <<8) +$esect +$ecyl)) + sectorcount=$(($cylinders * $heads * $sectors)) + lastlba=$(($sectorcount -1)) + if [ -z "$efi_ofs" ]; then + store32 $e 0x10080 + store32 $(($e + 4)) $(($partype + $epart)) + store32 $(($e + 8)) $offset + store32 $(($e + 12)) $sectorcount + else [ $(read16 0 1024) -eq 35615 -a $(read16 11 0) -ne 35615 ] && ddq bs=512 conv=notrunc skip=2 seek=44 count=20 if=$iso of=$iso - store32 $((446+16)) $((0xFFFFFE00)) - store32 $((446+16+4)) $((0xFFFFFEEF)) - store32 $((446+16+8)) $efi_ofs - store32 $((446+16+12)) $efi_len + store32 $((446)) $((0x10000)) + store32 $((446+4)) $((0xFFFFFEEE)) + store32 $((446+8)) 1 + store32 $((446+12)) $lastlba uudecode <