xnu-1228.9.59.tar.gz

[apple/xnu.git] / makedefs / MakeInc.def

diff --git a/makedefs/MakeInc.def b/makedefs/MakeInc.def
index 73842031c4b9702f76b27ff4e29285ec6e7a66f5..fab9fa5244d47c538aec896d507da37b1a3c600d 100644 (file)
--- a/makedefs/MakeInc.def
+++ b/makedefs/MakeInc.def
@@ -20,8 +20,8 @@ endif
 # Component List
 #
 ifndef COMPONENT_LIST 
 # Component List
 #
 ifndef COMPONENT_LIST 

-export COMPONENT_LIST  = osfmk bsd iokit pexpert libkern libsa
-export COMPONENT_LIST_UC := $(shell echo -n $(COMPONENT_LIST) | $(TR) a-z A-Z)
+export COMPONENT_LIST  = osfmk bsd libkern iokit pexpert libsa security
+export COMPONENT_LIST_UC := $(shell printf "%s" "$(COMPONENT_LIST)" | $(TR) a-z A-Z)

 endif
 ifndef COMPONENT
 export COMPONENT       := $(firstword $(subst /, ,$(shell $(RELPATH) $(SRCROOT) $(SOURCE))))
 endif
 ifndef COMPONENT
 export COMPONENT       := $(firstword $(subst /, ,$(shell $(RELPATH) $(SRCROOT) $(SOURCE))))


@@ -35,46 +35,111 @@ endif
 
 # Architecture options
 #
 
 # Architecture options
 #

-#  supported configurations : PPC I386
-#
+ifndef SUPPORTED_ARCH_CONFIGS
+export SUPPORTED_ARCH_CONFIGS = PPC I386 ARM
+endif
+

 ifndef ARCH_CONFIGS
 ifdef RC_ARCHS
 ifndef ARCH_CONFIGS
 ifdef RC_ARCHS

-export ARCH_CONFIGS    := $(shell echo -n $(RC_ARCHS) | $(TR) a-z A-Z)
+export ARCH_CONFIGS    := $(shell printf "%s" "$(RC_ARCHS)" | $(TR) a-z A-Z)

 else
 export ARCH_CONFIGS    := $(shell arch | $(TR) a-z A-Z)
 endif
 endif
 ifdef  ARCH_CONFIG
 ifndef ARCH_CONFIG_LC
 else
 export ARCH_CONFIGS    := $(shell arch | $(TR) a-z A-Z)
 endif
 endif
 ifdef  ARCH_CONFIG
 ifndef ARCH_CONFIG_LC

-export ARCH_CONFIG_LC  := $(shell echo -n $(ARCH_CONFIG) | $(TR) A-Z a-z)
+export ARCH_CONFIG_LC  := $(shell printf "%s" "$(ARCH_CONFIG)" | $(TR) A-Z a-z)

 endif
 endif
 
 endif
 endif
 

-
-# Kernel Configuration options  

 #
 #

-# supported configurations : RELEASE DEBUG PROFILE
+# Kernel Configuration options  

 #
 #

+ifndef SUPPORTED_KERNEL_CONFIGS
+export SUPPORTED_KERNEL_CONFIGS = RELEASE DEVELOPMENT DEBUG PROFILE
+endif
+
+ifndef DEFAULT_KERNEL_CONFIG
+export DEFAULT_KERNEL_CONFIG = RELEASE
+endif
+
+# If KERNEL_CONFIGS is specified it should override KERNEL_CONFIG.
+# If KERNEL_CONFIG is specified it will override the default. Will quit with
+# error if more than one config is specified.
+# If DEFAULT_KERNEL_CONFIG is not specified then it will be built RELEASE.

 ifndef KERNEL_CONFIGS
 ifndef KERNEL_CONFIGS

-export KERNEL_CONFIGS  = RELEASE
+       ifndef KERNEL_CONFIG
+       export KERNEL_CONFIGS   = $(DEFAULT_KERNEL_CONFIG)
+       else
+       export KERNEL_CONFIGS   = $(KERNEL_CONFIG)
+       endif

 endif
 endif

+

 ifndef KERNEL_CONFIG
 export KERNEL_CONFIG   = $(firstword $(KERNEL_CONFIGS))
 endif
 
 ifndef KERNEL_CONFIG
 export KERNEL_CONFIG   = $(firstword $(KERNEL_CONFIGS))
 endif
 

+ifneq ($(words $(KERNEL_CONFIG)), 1)
+$(error There were $(words $(KERNEL_CONFIG)) parameters passed to KERNEL_CONFIG = $(KERNEL_CONFG). \
+               Are you sure? To specify multiple configurations please use KERNEL_CONFIGS)
+endif
+
+ifndef MACHINE_CONFIG
+export MACHINE_CONFIG  = DEFAULT
+endif
+
+

 #
 #

-# Kernel Configuration to install
+# Target configuration options.  NOTE - target configurations will 
+# override ARCH_CONFIGS and KERNEL_CONFIGS.

 #
 #

-#  supported install architecture : PPC I386
+# Target configs come in groups of three parameters.  The first is the 
+# kernel configuration, the second is the architecture configuration,
+# and the third is the machine configuration.  You may pass in as
+# many groups of configurations as you wish.  Each item passed in is
+# seperated by whitespace.

 #
 #

-export INSTALL_TYPE    = RELEASE
-ifndef INSTALL_ARCHS
-ifdef RC_ARCHS
-export INSTALL_ARCHS   = $(ARCH_CONFIGS)
+# Example:
+#      TARGET_CONFIGS="release ppc default debug i386 default release arm MX31ADS"
+# Parameters may be in upper or lower case (they are converted to upper).
+#
+# "default" parameter is a special case.  It means use the default value for 
+# that parameter.  Here are the default values for each configuration:
+#
+# default kernel configuration = DEFAULT_KERNEL_CONFIG
+# default architecture configuration = system architecture where you are running make.
+# default machine configuration for ppc = none at this time.
+# default machine configuration for i386 = none at this time.
+# default machine configuration for arm = "S5L8900X".
+#
+ifndef TARGET_CONFIGS_UC
+ifdef TARGET_CONFIGS
+       export TARGET_CONFIGS_UC = $(strip $(shell printf "%s" "$(TARGET_CONFIGS)" | $(TR) a-z A-Z))
+       export MACHINE_CONFIG   = $(word 3, $(TARGET_CONFIGS_UC))
+       export DEFAULT_KERNEL_CONFIG = $(word 1, $(TARGET_CONFIGS_UC))

 else
 else

-export INSTALL_ARCHS   = $(ARCH_CONFIGS)
+       # generate TARGET_CONFIGS using KERNEL_CONFIGS and ARCH_CONFIGS and MACHINE_CONFIG (which defaults to "DEFAULT")
+       temp_list = $(foreach my_kern_config, $(KERNEL_CONFIGS), $(my_kern_config) arch_slot $(MACHINE_CONFIG))
+       export TARGET_CONFIGS = $(strip $(foreach my_arch_config, $(ARCH_CONFIGS), $(subst arch_slot,$(my_arch_config),$(temp_list))))
+       export TARGET_CONFIGS_UC := $(shell printf "%s" "$(TARGET_CONFIGS)" | $(TR) a-z A-Z)
+       export MACHINE_CONFIG   = $(word 3, $(TARGET_CONFIGS_UC))
+       export DEFAULT_KERNEL_CONFIG = $(word 1, $(TARGET_CONFIGS_UC))

 endif
 endif

-export INSTALL_ARCHS_LC := $(shell echo -n $(ARCH_CONFIGS) | $(TR) A-Z a-z)
+endif
+
+export MACHINE_CONFIG_LC := $(shell printf "%s" "$(MACHINE_CONFIG)" | $(TR) A-Z a-z)
+export KERNEL_CONFIG_LC := $(shell printf "%s" "$(KERNEL_CONFIG)" | $(TR) A-Z a-z)
+
+#
+# Kernel Configuration to install
+#
+#  supported install architecture : PPC I386 ARM
+#
+export INSTALL_TYPE    = $(DEFAULT_KERNEL_CONFIG)
+
+ifndef INSTALL_ARCHS
+export INSTALL_ARCHS   = $(strip $(foreach my_config, $(SUPPORTED_ARCH_CONFIGS), $(findstring $(my_config), $(TARGET_CONFIGS_UC))))
+export INSTALL_ARCHS_LC := $(shell printf "%s" "$(INSTALL_ARCHS)" | $(TR) A-Z a-z)

 endif
 
 export INSTALL_ARCH_DEFAULT    = PPC
 endif
 
 export INSTALL_ARCH_DEFAULT    = PPC


@@ -82,14 +147,13 @@ export INSTALL_ARCH_DEFAULT        = PPC
 #
 # Standard defines list
 #
 #
 # Standard defines list
 #

-export DEFINES = -DAPPLE -DNeXT -DKERNEL -DKERNEL_PRIVATE -DXNU_KERNEL_PRIVATE -DPRIVATE -D__MACHO__=1 -Dvolatile=__volatile $(IDENT)
+export DEFINES = -DAPPLE -DKERNEL -DKERNEL_PRIVATE -DXNU_KERNEL_PRIVATE -DPRIVATE -D__MACHO__=1 -Dvolatile=__volatile $(IDENT)

 
 #
 # Compiler command
 #
 
 #
 # Compiler command
 #

-KCC  = /usr/bin/cc
-KC++ = /usr/bin/c++
-CC   = $(KCC)
+KCC  := $(CC)
+KC++ := $(CXX)

 
 #
 # Compiler warning flags
 
 #
 # Compiler warning flags


@@ -112,23 +176,28 @@ MWARNFLAGS_STD = \
 export MWARNFLAGS ?= $(MWARNFLAGS_STD)
 
 CXXWARNFLAGS_STD = \
 export MWARNFLAGS ?= $(MWARNFLAGS_STD)
 
 CXXWARNFLAGS_STD = \

-       -Wall -Wno-format-y2k -W -Wstrict-prototypes -Wmissing-prototypes \
+       -Wall -Wno-format-y2k -W \

        -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch \
        -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch \

-       -Wshadow -Wcast-align -Wchar-subscripts -Winline -Wredundant-decls \
-       -fpermissive
+       -Wshadow -Wcast-align -Wchar-subscripts -Winline -Wredundant-decls

 
 export CXXWARNFLAGS ?= $(CXXWARNFLAGS_STD)
 
 
 #
 
 export CXXWARNFLAGS ?= $(CXXWARNFLAGS_STD)
 
 
 #

-# Setup for parallel sub-makes when doing an RC build
+# Setup for parallel sub-makes based on 2 times number of logical CPUs

 #
 ifndef MAKEJOBS
 #
 ifndef MAKEJOBS

-ifeq "YES" "$(RC_XBS)"
-export MAKEJOBS = --jobs=3
-endif
+export MAKEJOBS = --jobs=$(shell expr `/usr/sbin//sysctl -n hw.logicalcpu` \* 2)

 endif
 
 endif
 

+#
+# Default ARCH_FLAGS, for use with compiler/linker/assembler/mig drivers
+
+ARCH_FLAGS_PPC           = -arch ppc
+ARCH_FLAGS_I386                  = -arch i386
+ARCH_FLAGS_ARM           = $($(addsuffix $(MACHINE_CONFIG),ARCH_FLAGS_ARM_))
+
+

 #
 # Default CFLAGS
 #
 #
 # Default CFLAGS
 #


@@ -136,35 +205,79 @@ ifdef RC_CFLAGS
 export OTHER_CFLAGS    = $(subst $(addprefix -arch ,$(RC_ARCHS)),,$(RC_CFLAGS))
 endif
 
 export OTHER_CFLAGS    = $(subst $(addprefix -arch ,$(RC_ARCHS)),,$(RC_CFLAGS))
 endif
 

-export CFLAGS_GEN = -static -g -nostdinc -nostdlib -no-cpp-precomp \
-       -fno-builtin -finline -fno-keep-inline-functions -msoft-float \
+export DSYMBUILDDIR = ./Contents/Resources/DWARF/
+
+#
+# We must not use -fno-keep-inline-functions, or it will remove the dtrace
+# probes from the kernel.
+#
+export CFLAGS_GEN = -static $(DEBUG_CFLAGS) -nostdinc -nostdlib \
+       -fno-builtin -finline -msoft-float \

        -fsigned-bitfields $(OTHER_CFLAGS)
 
 export CFLAGS_RELEASE  = 
        -fsigned-bitfields $(OTHER_CFLAGS)
 
 export CFLAGS_RELEASE  = 

+export CFLAGS_DEVELOPMENT      =

 export CFLAGS_DEBUG    = 
 export CFLAGS_PROFILE  =  -pg
 
 export CFLAGS_DEBUG    = 
 export CFLAGS_PROFILE  =  -pg
 

-export CFLAGS_PPC      = -arch ppc -Dppc -DPPC -D__PPC__ -DPAGE_SIZE_FIXED
-export CFLAGS_I386     = -arch i386 -Di386 -DI386 -D__I386__ -DPAGE_SIZE_FIXED \
-       -march=i686 -mpreferred-stack-boundary=2 -falign-functions=4 -mcpu=pentium4 -force_cpusubtype_ALL
+ifeq ($(BUILD_STABS),1)
+export CFLAGS_PPC      = -Dppc -DPPC -D__PPC__ -DPAGE_SIZE_FIXED \
+                               -mno-altivec -gstabs+ -force_cpusubtype_ALL
+export CFLAGS_I386     = -Di386 -DI386 -D__I386__ \
+                               -DPAGE_SIZE_FIXED -gstabs+ -force_cpusubtype_ALL
+export CFLAGS_ARM      = -Darm -DARM -D__ARM__ -DPAGE_SIZE_FIXED \
+       -fno-strict-aliasing -gstabs+ -fno-keep-inline-functions
+export BUILD_DWARF = 0
+export BUILD_STABS = 1
+else
+export CFLAGS_PPC      = -Dppc -DPPC -D__PPC__ -DPAGE_SIZE_FIXED \
+                               -mno-altivec -gdwarf-2 -force_cpusubtype_ALL
+export CFLAGS_I386     = -Di386 -DI386 -D__I386__ \
+                               -DPAGE_SIZE_FIXED -gdwarf-2 -force_cpusubtype_ALL
+export CFLAGS_ARM      = -Darm -DARM -D__ARM__ -DPAGE_SIZE_FIXED \
+       -fno-strict-aliasing -gdwarf-2 -fno-keep-inline-functions
+export BUILD_DWARF = 1
+export BUILD_STABS = 0
+endif
+ifeq (-arch armv6,$(ARCH_FLAGS_ARM))
+CFLAGS_ARM             += -mthumb
+endif
+ifeq (-arch armv5,$(ARCH_FLAGS_ARM))
+CFLAGS_ARM             += -mthumb
+endif
+ifeq (-arch xscale,$(ARCH_FLAGS_ARM))
+CFLAGS_ARM             += -mthumb
+endif
+
+export CFLAGS_RELEASEPPC = -O2 -mcpu=750 -mmultiple
+export CFLAGS_RELEASE_TRACEPPC = -O2 -mcpu=750 -mmultiple
+export CFLAGS_DEVELOPMENTPPC = -O2 -mcpu=750 -mmultiple
+export CFLAGS_DEBUGPPC = -O2 -mcpu=750 -mmultiple
+export CFLAGS_PROFILEPPC = -O2 -mcpu=750 -mmultiple

 
 

-export CFLAGS_RELEASEPPC = -O2 -mcpu=750 -mmultiple -fschedule-insns
-export CFLAGS_RELEASE_TRACEPPC = -O2 -mcpu=750 -mmultiple -fschedule-insns
-export CFLAGS_DEBUGPPC = -O2 -mcpu=750 -mmultiple -fschedule-insns
-export CFLAGS_PROFILEPPC = -O2 -mcpu=750 -mmultiple -fschedule-insns

 export CFLAGS_RELEASEI386 = -Os
 export CFLAGS_RELEASEI386 = -Os

+export CFLAGS_DEVELOPMENTI386 = -Os

 export CFLAGS_DEBUGI386 = -Os
 export CFLAGS_PROFILEI386 = -Os
 
 export CFLAGS_DEBUGI386 = -Os
 export CFLAGS_PROFILEI386 = -Os
 

+export CFLAGS_RELEASEARM = -O2
+export CFLAGS_DEVELOPMENTARM = -O2
+export CFLAGS_DEBUGARM = -O2
+export CFLAGS_PROFILEARM = -O2
+

 export CFLAGS  = $(CFLAGS_GEN) \
 export CFLAGS  = $(CFLAGS_GEN) \

+                 $($(addsuffix $(MACHINE_CONFIG),MACHINE_FLAGS_)) \
+                 $($(addsuffix $(ARCH_CONFIG),ARCH_FLAGS_)) \

                  $($(addsuffix $(ARCH_CONFIG),CFLAGS_)) \
                  $($(addsuffix $(KERNEL_CONFIG),CFLAGS_)) \
                  $($(addsuffix $(ARCH_CONFIG), $(addsuffix $(KERNEL_CONFIG),CFLAGS_))) \
                  $(DEFINES)
 
                  $($(addsuffix $(ARCH_CONFIG),CFLAGS_)) \
                  $($(addsuffix $(KERNEL_CONFIG),CFLAGS_)) \
                  $($(addsuffix $(ARCH_CONFIG), $(addsuffix $(KERNEL_CONFIG),CFLAGS_))) \
                  $(DEFINES)
 

+export MIGCC = $(CC)
+

 # Default C++ flags
 #
 # Default C++ flags
 #

-CXXFLAGS_GEN  = -fno-rtti -fno-exceptions -fcheck-new -fapple-kext -fpermissive
+CXXFLAGS_GEN  = -fno-rtti -fno-exceptions -fcheck-new -fapple-kext

 
 CXXFLAGS      = $(CXXFLAGS_GEN) \
                  $($(addsuffix $(ARCH_CONFIG),CXXFLAGS_)) \
 
 CXXFLAGS      = $(CXXFLAGS_GEN) \
                  $($(addsuffix $(ARCH_CONFIG),CXXFLAGS_)) \


@@ -173,22 +286,26 @@ CXXFLAGS      = $(CXXFLAGS_GEN) \
 #
 # Assembler command
 #
 #
 # Assembler command
 #

-AS     = /usr/bin/cc
-S_KCC  = /usr/bin/cc
+AS     = $(CC)
+S_KCC  = $(CC)

 
 #
 # Default SFLAGS
 #
 
 #
 # Default SFLAGS
 #

-export SFLAGS_GEN = -static -D__ASSEMBLER__ -force_cpusubtype_ALL $(OTHER_CFLAGS)
+export SFLAGS_GEN = -static -D__ASSEMBLER__ $(OTHER_CFLAGS)

 
 export SFLAGS_RELEASE  = 
 
 export SFLAGS_RELEASE  = 

+export SFLAGS_DEVELOPMENT      = 

 export SFLAGS_DEBUG    = 
 export SFLAGS_PROFILE  = 
 
 export SFLAGS_DEBUG    = 
 export SFLAGS_PROFILE  = 
 

-export SFLAGS_PPC      = $(CFLAGS_PPC)
-export SFLAGS_I386     = $(CFLAGS_I386)
+export SFLAGS_PPC      = $(CFLAGS_PPC) -force_cpusubtype_ALL
+export SFLAGS_I386     = $(CFLAGS_I386)
+export SFLAGS_ARM      = $(CFLAGS_ARM)

 
 export SFLAGS  = $(SFLAGS_GEN) \
 
 export SFLAGS  = $(SFLAGS_GEN) \

+                 $($(addsuffix $(MACHINE_CONFIG),MACHINE_FLAGS_)) \
+                 $($(addsuffix $(ARCH_CONFIG),ARCH_FLAGS_)) \

                  $($(addsuffix $(ARCH_CONFIG),SFLAGS_)) \
                  $($(addsuffix $(KERNEL_CONFIG),SFLAGS_)) \
                  $(DEFINES)
                  $($(addsuffix $(ARCH_CONFIG),SFLAGS_)) \
                  $($(addsuffix $(KERNEL_CONFIG),SFLAGS_)) \
                  $(DEFINES)


@@ -196,7 +313,7 @@ export SFLAGS       = $(SFLAGS_GEN) \
 #
 # Linker command
 #
 #
 # Linker command
 #

-LD     = /usr/bin/ld
+LD     = $(KC++) -nostdlib

 
 #
 # Default LDFLAGS
 
 #
 # Default LDFLAGS


@@ -204,45 +321,55 @@ LD        = /usr/bin/ld
 export LDFLAGS_COMPONENT_GEN = -static -r $(COMP_LDFLAGS_COMPONENT_GEN)
 
 export LDFLAGS_COMPONENT_RELEASE =  $(COMP_LDFLAGS_COMPONENT_RELEASE)
 export LDFLAGS_COMPONENT_GEN = -static -r $(COMP_LDFLAGS_COMPONENT_GEN)
 
 export LDFLAGS_COMPONENT_RELEASE =  $(COMP_LDFLAGS_COMPONENT_RELEASE)

+export LDFLAGS_COMPONENT_DEVELOPMENT =  $(COMP_LDFLAGS_COMPONENT_DEVELOPMENT)

 export LDFLAGS_COMPONENT_DEBUG   =  $(COMP_LDFLAGS_COMPONENT_DEBUG)
 export LDFLAGS_COMPONENT_PROFILE =  $(COMP_LDFLAGS_COMPONENT_PROFILE)
 
 export LDFLAGS_COMPONENT_DEBUG   =  $(COMP_LDFLAGS_COMPONENT_DEBUG)
 export LDFLAGS_COMPONENT_PROFILE =  $(COMP_LDFLAGS_COMPONENT_PROFILE)
 

-export LDFLAGS_COMPONENT_PPC   = -arch ppc $(COMP_LDFLAGS_COMPONENT_PPC)
-export LDFLAGS_COMPONENT_I386  = -arch i386 $(COMP_LDFLAGS_COMPONENT_i386)
+export LDFLAGS_COMPONENT_PPC   = $(COMP_LDFLAGS_COMPONENT_PPC) -force_cpusubtype_ALL
+export LDFLAGS_COMPONENT_I386  = $(COMP_LDFLAGS_COMPONENT_i386)
+export LDFLAGS_COMPONENT_ARM   = $(COMP_LDFLAGS_COMPONENT_ARM)

 
 export LDFLAGS_COMPONENT       = $(LDFLAGS_COMPONENT_GEN) \
 
 export LDFLAGS_COMPONENT       = $(LDFLAGS_COMPONENT_GEN) \

+                 $($(addsuffix $(ARCH_CONFIG),ARCH_FLAGS_)) \

                  $($(addsuffix $(ARCH_CONFIG),LDFLAGS_COMPONENT_)) \
                  $($(addsuffix $(KERNEL_CONFIG),LDFLAGS_COMPONENT_))
 
 export LDFLAGS_KERNEL_GEN = \
        -static \
                  $($(addsuffix $(ARCH_CONFIG),LDFLAGS_COMPONENT_)) \
                  $($(addsuffix $(KERNEL_CONFIG),LDFLAGS_COMPONENT_))
 
 export LDFLAGS_KERNEL_GEN = \
        -static \

-       -force_cpusubtype_ALL \
-       -e __start \
-       -segalign 0x1000 \
-       -sectalign __TEXT __text 0x1000 \
-       -sectalign __DATA __common 0x1000 \
-       -sectalign __DATA __bss 0x1000 \
-       -sectcreate __PRELINK __text /dev/null \
-       -sectcreate __PRELINK __symtab /dev/null \
-       -sectcreate __PRELINK __info /dev/null
+       -fapple-kext \
+       -Wl,-e,__start \
+       -Wl,-sectalign,__TEXT,__text,0x1000 \
+       -Wl,-sectalign,__DATA,__common,0x1000 \
+       -Wl,-sectalign,__DATA,__bss,0x1000 \
+       -Wl,-sectcreate,__PRELINK,__text,/dev/null \
+       -Wl,-sectcreate,__PRELINK,__symtab,/dev/null \
+       -Wl,-sectcreate,__PRELINK,__info,/dev/null

 
 export LDFLAGS_KERNEL_RELEASE  =
 
 export LDFLAGS_KERNEL_RELEASE  =

+export LDFLAGS_KERNEL_DEVELOPMENT      =

 #  -noseglinkedit
 export LDFLAGS_KERNEL_DEBUG    = 
 export LDFLAGS_KERNEL_PROFILE  = 
 
 export LDFLAGS_KERNEL_PPC      = \
 #  -noseglinkedit
 export LDFLAGS_KERNEL_DEBUG    = 
 export LDFLAGS_KERNEL_PROFILE  = 
 
 export LDFLAGS_KERNEL_PPC      = \

-       -arch ppc \
-       -segaddr __VECTORS 0x0 \
-       -segaddr __HIB 0x7000  \
-       -segaddr __TEXT 0xe000
+       -force_cpusubtype_ALL \
+       -Wl,-new_linker \
+       -Wl,-segaddr,__VECTORS,0x0 \
+       -Wl,-segaddr,__HIB,0x7000  \
+       -Wl,-segaddr,__TEXT,0xe000

  
 export LDFLAGS_KERNEL_I386     = \
  
 export LDFLAGS_KERNEL_I386     = \

-       -arch i386 \
-       -segaddr __HIB  0xC0100000 \
-       -segaddr __TEXT 0xC0111000
+       -Wl,-new_linker \
+       -Wl,-segaddr,__HIB,0x100000 \
+       -Wl,-segaddr,__TEXT,0x111000 
+
+export LDFLAGS_KERNEL_ARM     = \
+       -Wl,-segaddr,__HIB,0xC0000000 \
+       -Wl,-segaddr,__TEXT,0xC0008000

 
 export LDFLAGS_KERNEL  = $(LDFLAGS_KERNEL_GEN) \
 
 export LDFLAGS_KERNEL  = $(LDFLAGS_KERNEL_GEN) \

+                 $($(addsuffix $(MACHINE_CONFIG),MACHINE_FLAGS_)) \
+                 $($(addsuffix $(ARCH_CONFIG),ARCH_FLAGS_)) \

                  $($(addsuffix $(ARCH_CONFIG),LDFLAGS_KERNEL_)) \
                  $($(addsuffix $(KERNEL_CONFIG),LDFLAGS_KERNEL_))
 
                  $($(addsuffix $(ARCH_CONFIG),LDFLAGS_KERNEL_)) \
                  $($(addsuffix $(KERNEL_CONFIG),LDFLAGS_KERNEL_))
 


@@ -266,7 +393,7 @@ export INCFLAGS     = $(INCFLAGS_LOCAL) $(INCFLAGS_GEN) $(INCFLAGS_IMPORT) $(INCFLA
 #
 # Default MIGFLAGS
 #
 #
 # Default MIGFLAGS
 #

-export MIGFLAGS        = $(DEFINES) $(INCFLAGS) $($(addsuffix $(ARCH_CONFIG),CFLAGS_))
+export MIGFLAGS        = $(DEFINES) $(INCFLAGS) $($(addsuffix $(ARCH_CONFIG),CFLAGS_)) $($(addsuffix $(ARCH_CONFIG),ARCH_FLAGS_))

 
 #
 # Default VPATH
 
 #
 # Default VPATH


@@ -280,7 +407,7 @@ export VPATH_GEN    = .:$(SOURCE):
 export VPATH           = $(VPATH_GEN)$(VPATH_IMPORT)$(VPATH_EXTERN)$(VPATH_MAKEFILE)
 
 #
 export VPATH           = $(VPATH_GEN)$(VPATH_IMPORT)$(VPATH_EXTERN)$(VPATH_MAKEFILE)
 
 #

-# Macros that control installation of kernel and it's header files
+# Macros that control installation of kernel and its header files

 #
 # install flags for header files
 # 
 #
 # install flags for header files
 # 


@@ -307,10 +434,10 @@ KRESDIR = $(KINCFRAME)/Versions/$(KINCVERS)/Resources
 
 XNU_PRIVATE_UNIFDEF = -UMACH_KERNEL_PRIVATE -UBSD_KERNEL_PRIVATE -UIOKIT_KERNEL_PRIVATE -ULIBKERN_KERNEL_PRIVATE -ULIBSA_KERNEL_PRIVATE -UPEXPERT_KERNEL_PRIVATE -UXNU_KERNEL_PRIVATE
 
 
 XNU_PRIVATE_UNIFDEF = -UMACH_KERNEL_PRIVATE -UBSD_KERNEL_PRIVATE -UIOKIT_KERNEL_PRIVATE -ULIBKERN_KERNEL_PRIVATE -ULIBSA_KERNEL_PRIVATE -UPEXPERT_KERNEL_PRIVATE -UXNU_KERNEL_PRIVATE
 

-SPINCFRAME_UNIFDEF = $(XNU_PRIVATE_UNIFDEF) -UKERNEL_PRIVATE -UKERNEL -DPRIVATE
-SINCFRAME_UNIFDEF  = $(XNU_PRIVATE_UNIFDEF) -UKERNEL_PRIVATE -UKERNEL -UPRIVATE
-KPINCFRAME_UNIFDEF = $(XNU_PRIVATE_UNIFDEF) -DKERNEL_PRIVATE -DPRIVATE -DKERNEL
-KINCFRAME_UNIFDEF  = $(XNU_PRIVATE_UNIFDEF) -UKERNEL_PRIVATE -UPRIVATE -DKERNEL
+SPINCFRAME_UNIFDEF = $(XNU_PRIVATE_UNIFDEF) -UKERNEL_PRIVATE -UKERNEL -DPRIVATE -U_OPEN_SOURCE_
+SINCFRAME_UNIFDEF  = $(XNU_PRIVATE_UNIFDEF) -UKERNEL_PRIVATE -UKERNEL -UPRIVATE -D_OPEN_SOURCE_
+KPINCFRAME_UNIFDEF = $(XNU_PRIVATE_UNIFDEF) -DKERNEL_PRIVATE -DPRIVATE -DKERNEL -U_OPEN_SOURCE_
+KINCFRAME_UNIFDEF  = $(XNU_PRIVATE_UNIFDEF) -UKERNEL_PRIVATE -UPRIVATE -DKERNEL -D_OPEN_SOURCE_

 
 #
 # Compononent Header file destinations
 
 #
 # Compononent Header file destinations


@@ -321,6 +448,7 @@ EXPDIR = EXPORT_HDRS/$(COMPONENT)
 # Strip Flags
 #
 export STRIP_FLAGS_RELEASE     = -S -x 
 # Strip Flags
 #
 export STRIP_FLAGS_RELEASE     = -S -x 

+export STRIP_FLAGS_DEVELOPMENT = -S -x 

 export STRIP_FLAGS_RELEASE_TRACE       = -S -x 
 export STRIP_FLAGS_DEBUG       = -S 
 export STRIP_FLAGS_DEBUG_TRACE = -S 
 export STRIP_FLAGS_RELEASE_TRACE       = -S -x 
 export STRIP_FLAGS_DEBUG       = -S 
 export STRIP_FLAGS_DEBUG_TRACE = -S 


@@ -328,11 +456,35 @@ export STRIP_FLAGS_PROFILE        = -S -x
 
 export STRIP_FLAGS     = $($(addsuffix $(KERNEL_CONFIG),STRIP_FLAGS_)) 
 
 
 export STRIP_FLAGS     = $($(addsuffix $(KERNEL_CONFIG),STRIP_FLAGS_)) 
 

+#
+# dsymutil flags
+#
+export DSYMUTIL_FLAGS_I386 = --arch=i386
+export DSYMUTIL_FLAGS_PPC = --arch=ppc
+export DSYMUTIL_FLAGS_ARM = --arch=arm
+
+export DSYMUTIL_FLAGS = $($(addsuffix $(ARCH_CONFIG),DSYMUTIL_FLAGS_))
+

 #
 # Man Page destination
 #
 MANDIR = usr/share/man
 
 #
 # Man Page destination
 #
 MANDIR = usr/share/man
 

+##
+# Verbosity
+##
+ifeq ($(RC_XBS),YES)
+VERBOSE = YES
+else
+VERBOSE = NO
+endif
+
+ifeq ($(VERBOSE),YES)
+_v = 
+else
+_v = @
+endif
+

 #
 #  This must be here before any rules are possibly defined by the
 #  machine dependent makefile fragment so that a plain "make" command
 #
 #  This must be here before any rules are possibly defined by the
 #  machine dependent makefile fragment so that a plain "make" command


@@ -342,3 +494,4 @@ MANDIR = usr/share/man
 
 default: all
 
 
 default: all
 

+# vim: set ft=make: