source: trunk/dports/emulators/virtualbox/files/patch-apple-gcc42.diff @ 107839

Last change on this file since 107839 was 107839, checked in by royliu@…, 6 years ago

virtualbox: update to 4.2.16 (#39643)

File size: 4.8 KB
  • Config.kmk

    old new  
    19161916   $(error VBox: 64-bit darwin builds require Xcode 3.2 or later, you have $(VBOX_XCODE_VERSION))
    19171917  endif
    19181918 endif
    1919  if $(VBOX_XCODE_VERSION_MAJOR) == 4 && $(VBOX_XCODE_VERSION_MINOR) >= 2
    1920   TOOL_GXX4MACHO_PREFIX ?= llvm-
    1921  endif
    1922  TOOL_GXX4MACHO_SUFFIX ?= -4.2
     1919 TOOL_GXX4MACHO_PREFIX ?=
     1920 TOOL_GXX4MACHO_SUFFIX ?= -apple-4.2
    19231921 VBOX_DARWIN_NO_COMPACT_LINKEDIT ?=
    19241922
    19251923 TOOL_GCC4MACHO_SUFFIX ?= $(TOOL_GXX4MACHO_SUFFIX)$(HOSTSUFF_EXE)
  • kBuild/tools/LLVMGCC42MACHO.kmk

    old new  
    11# $Id: LLVMGCC42MACHO.kmk 2547 2011-11-04 21:58:53Z bird $
    22## @file
    3 # kBuild Tool Config - LLVM GCC v4.2.x targeting Darwin (Mac OS X) Mach-O.
     3# kBuild Tool Config - Apple GCC v4.2.x targeting Darwin (Mac OS X) Mach-O.
    44#
    55
    66#
     
    3131#
    3232#
    3333
    34 TOOL_LLVMGCC42MACHO := LLVM GCC v4.2.x targeting Darwin (Mac OS X) Mach-O.
     34TOOL_LLVMGCC42MACHO := Apple GCC v4.2.x targeting Darwin (Mac OS X) Mach-O.
    3535
    3636# Tool Specific Properties
    37 TOOL_LLVMGCC42MACHO_PREFIX    ?= llvm-
    38 TOOL_LLVMGCC42MACHO_SUFFIX    ?= -4.2$(HOSTSUFF_EXE)
     37TOOL_LLVMGCC42MACHO_PREFIX    ?=
     38TOOL_LLVMGCC42MACHO_SUFFIX    ?= -apple-4.2$(HOSTSUFF_EXE)
    3939TOOL_LLVMGCC42MACHO_CC        ?= $(TOOL_LLVMGCC42MACHO_PREFIX)gcc$(TOOL_LLVMGCC42MACHO_SUFFIX)
    4040TOOL_LLVMGCC42MACHO_CXX       ?= $(TOOL_LLVMGCC42MACHO_PREFIX)g++$(TOOL_LLVMGCC42MACHO_SUFFIX)
    4141TOOL_LLVMGCC42MACHO_OBJC      ?= $(TOOL_LLVMGCC42MACHO_PREFIX)gcc$(TOOL_LLVMGCC42MACHO_SUFFIX)
    4242TOOL_LLVMGCC42MACHO_OBJCXX    ?= $(TOOL_LLVMGCC42MACHO_PREFIX)gcc$(TOOL_LLVMGCC42MACHO_SUFFIX)
    4343TOOL_LLVMGCC42MACHO_AS        ?= $(TOOL_LLVMGCC42MACHO_PREFIX)gcc$(TOOL_LLVMGCC42MACHO_SUFFIX)
    44 TOOL_LLVMGCC42MACHO_LD        ?= $(TOOL_LLVMGCC42MACHO_PREFIX)gcc$(TOOL_LLVMGCC42MACHO_SUFFIX)
     44#
     45# note: this LLVMGCC42MACHO_LD differs from LLVMGCCMACHO, this is because apple-gcc-42
     46# require __personality_* symbol which might require by cpp sources processing by this
     47# tool set (e.g. filesplitter), this link issue resolve by involving g++ stack.
     48#
     49TOOL_LLVMGCC42MACHO_LD        ?= $(TOOL_LLVMGCC42MACHO_PREFIX)g++$(TOOL_LLVMGCC42MACHO_SUFFIX)
    4550TOOL_LLVMGCC42MACHO_LD_SYSMOD ?= $(TOOL_LLVMGCC42MACHO_PREFIX)gcc$(TOOL_LLVMGCC42MACHO_SUFFIX)
    4651ifndef TOOL_LLVMGCC42MACHO_LDFLAGS.$(KBUILD_TARGET)
    4752TOOL_LLVMGCC42MACHO_LDFLAGS.dll ?= -dynamiclib
  • kBuild/tools/LLVMGXX42MACHO.kmk

    old new  
    11# $Id: LLVMGXX42MACHO.kmk 2547 2011-11-04 21:58:53Z bird $
    22## @file
    3 # kBuild Tool Config - LLVM GCC v4.2.x targeting Darwin (Mac OS X) Mach-O, for building C++ code.
     3# kBuild Tool Config - Apple GCC v4.2.x targeting Darwin (Mac OS X) Mach-O, for building C++ code.
    44#
    55
    66#
     
    3131#
    3232#
    3333
    34 TOOL_LLVMGXX42MACHO := LLVM GCC v4.2.x targeting Darwin (Mac OS X) Mach-O, for building C++ code.
     34TOOL_LLVMGXX42MACHO := Apple GCC v4.2.x targeting Darwin (Mac OS X) Mach-O, for building C++ code.
    3535
    3636# Tool Specific Properties
    37 TOOL_LLVMGXX42MACHO_PREFIX    ?= llvm-
    38 TOOL_LLVMGXX42MACHO_SUFFIX    ?= -4.2$(HOSTSUFF_EXE)
     37TOOL_LLVMGXX42MACHO_PREFIX    ?=
     38TOOL_LLVMGXX42MACHO_SUFFIX    ?= -apple-4.2$(HOSTSUFF_EXE)
    3939TOOL_LLVMGXX42MACHO_CC        ?= $(TOOL_LLVMGXX42MACHO_PREFIX)gcc$(TOOL_LLVMGXX42MACHO_SUFFIX)
    4040TOOL_LLVMGXX42MACHO_CXX       ?= $(TOOL_LLVMGXX42MACHO_PREFIX)g++$(TOOL_LLVMGXX42MACHO_SUFFIX)
    4141TOOL_LLVMGXX42MACHO_OBJC      ?= $(TOOL_LLVMGXX42MACHO_PREFIX)gcc$(TOOL_LLVMGXX42MACHO_SUFFIX)
  • src/libs/kStuff/kStuff/kLdr/kLdrModMachO.c

    old new  
    967967            }
    968968
    969969            case LC_DYSYMTAB:
     970            case LC_FUNCTION_STARTS:
     971            case LC_DATA_IN_CODE:
    970972                /** @todo deal with this! */
    971973                break;
    972974
  • src/libs/kStuff/kStuff/include/k/kLdrFmts/mach-o.h

    old new  
    380380#define LC_VERSION_MIN_MACOSX KU32_C(0x24)   /**< The image requires the given Mac OS X version. See version_min_command. */
    381381#define LC_VERSION_MIN_IPHONEOS KU32_C(0x25) /**< The image requires the given iOS version. See version_min_command. */
    382382#define LC_FUNCTION_STARTS  KU32_C(0x26)  /**< Where to find the compress function start addresses. See linkedit_data_command. */
    383 #define LC_DYLD_ENVIRONMENT KU32_C(0x26)  /**< Environment variable for the dynamic linker. See dylinker_command. */
     383#define LC_DYLD_ENVIRONMENT KU32_C(0x27)  /**< Environment variable for the dynamic linker. See dylinker_command. */
     384#define LC_DATA_IN_CODE KU32_C(0x29) /** ???? */
    384385/** @} */
    385386
    386387
Note: See TracBrowser for help on using the repository browser.