Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 710940 | Differences between
and this patch

Collapse All | Expand All

(-)VirtualBox-6.1.4/Config.kmk (-2 / +10 lines)
Lines 2684-2691 else Link Here
2684
 # The reason for this hack is that the windows kmk_ash cannot deal with $((1+1)).
2684
 # The reason for this hack is that the windows kmk_ash cannot deal with $((1+1)).
2685
 # Some versions of gcc (e.g. openSUSE11) return only major.minor on `gcc -dumpversion`.
2685
 # Some versions of gcc (e.g. openSUSE11) return only major.minor on `gcc -dumpversion`.
2686
 # gcc-5 of openSUSE42.1 only returns the major version on `gcc -dumpversion`!
2686
 # gcc-5 of openSUSE42.1 only returns the major version on `gcc -dumpversion`!
2687
 VBOX_GCC_VERSION = $(shell ($(1) -dumpfullversion 2>/dev/null || $(1) -dumpversion) | \
2687
 #
2688
    $(SED_EXT) 's|\([0-9]\)\.\{0,1\}\([0-9]\{0,1\}\)\.\{0,1\}\([0-9]\{0,1\}\).*|$$(int-add $$(int-mul 10000, \1), $$(int-mul 100, $$(firstword \2 0)), $$(firstword \3 0))|' )
2688
 # Check to make sure that the compiler has either  -dumpfullversion or -dumpversion. gcc-10 has neither
2689
 RC = $(shell ($(1) -dumpfullversion 2>/dev/null || $(1) -dumpversion 2>/dev/null) ; echo $$?)
2690
 ifneq ($(RC),0)
2691
    # dump version commands not available - hardcode 10.0.1 for the moment
2692
    VBOX_GCC_VERSION = 100001
2693
 else
2694
    VBOX_GCC_VERSION = $(shell ($(1) -dumpfullversion 2>/dev/null || $(1) -dumpversion 2>/dev/null) | \
2695
       $(SED_EXT) 's|\([0-9]\)\.\{0,1\}\([0-9]\{0,1\}\)\.\{0,1\}\([0-9]\{0,1\}\).*|$$(int-add $$(int-mul 10000, \1), $$(int-mul 100, $$(firstword \2 0)), $$(firstword \3 0))|' )
2696
 endif
2689
endif
2697
endif
2690
2698
2691
# YASM macros
2699
# YASM macros
(-)VirtualBox-6.1.4/src/VBox/Debugger/DBGCDumpImage.cpp (-1 / +1 lines)
Lines 468-474 static const char *dbgcMachoCpuType(uint Link Here
468
{
468
{
469
    switch (uType)
469
    switch (uType)
470
    {
470
    {
471
        case CPU_TYPE_ANY:          return "CPU_TYPE_ANY";
471
        default:		    return "CPU_TYPE_ANY";
472
        case CPU_TYPE_VAX:          return "VAX";
472
        case CPU_TYPE_VAX:          return "VAX";
473
        case CPU_TYPE_MC680x0:      return "MC680x0";
473
        case CPU_TYPE_MC680x0:      return "MC680x0";
474
        case CPU_TYPE_X86:          return "X86";
474
        case CPU_TYPE_X86:          return "X86";

Return to bug 710940