SOURCES: VirtualBox-svn_fixes.patch (NEW) - merged fixes from upstream, now...
hawk
hawk at pld-linux.org
Mon Sep 8 14:00:41 CEST 2008
Author: hawk Date: Mon Sep 8 12:00:41 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- merged fixes from upstream, now creating disk images works properly
---- Files affected:
SOURCES:
VirtualBox-svn_fixes.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/VirtualBox-svn_fixes.patch
diff -u /dev/null SOURCES/VirtualBox-svn_fixes.patch:1.1
--- /dev/null Mon Sep 8 14:00:42 2008
+++ SOURCES/VirtualBox-svn_fixes.patch Mon Sep 8 14:00:36 2008
@@ -0,0 +1,8897 @@
+diff -urN VirtualBox-2.0.0/include/iprt/asm.h vbox/include/iprt/asm.h
+--- VirtualBox-2.0.0/include/iprt/asm.h 2008-09-08 10:06:11.000000000 +0200
++++ vbox/include/iprt/asm.h 2008-09-08 10:06:52.000000000 +0200
+@@ -1728,6 +1728,318 @@
+ }
+ #endif
+
++/**
++ * Gets dr0.
++ *
++ * @returns dr0.
++ */
++#if RT_INLINE_ASM_EXTERNAL
++DECLASM(RTCCUINTREG) ASMGetDR0(void);
++#else
++DECLINLINE(RTCCUINTREG) ASMGetDR0(void)
++{
++ RTCCUINTREG uDR0;
++# if RT_INLINE_ASM_GNU_STYLE
++# ifdef RT_ARCH_AMD64
++ __asm__ __volatile__("movq %%dr0, %0\n\t" : "=r" (uDR0));
++# else
++ __asm__ __volatile__("movl %%dr0, %0\n\t" : "=r" (uDR0));
++# endif
++# else
++ __asm
++ {
++# ifdef RT_ARCH_AMD64
++ mov rax, dr0
++ mov [uDR0], rax
++# else
++ mov eax, dr0
++ mov [uDR0], eax
++# endif
++ }
++# endif
++ return uDR0;
++}
++#endif
++
++
++/**
++ * Gets dr1.
++ *
++ * @returns dr1.
++ */
++#if RT_INLINE_ASM_EXTERNAL
++DECLASM(RTCCUINTREG) ASMGetDR1(void);
++#else
++DECLINLINE(RTCCUINTREG) ASMGetDR1(void)
++{
++ RTCCUINTREG uDR1;
++# if RT_INLINE_ASM_GNU_STYLE
++# ifdef RT_ARCH_AMD64
++ __asm__ __volatile__("movq %%dr1, %0\n\t" : "=r" (uDR1));
++# else
++ __asm__ __volatile__("movl %%dr1, %0\n\t" : "=r" (uDR1));
++# endif
++# else
++ __asm
++ {
++# ifdef RT_ARCH_AMD64
++ mov rax, dr1
++ mov [uDR1], rax
++# else
++ mov eax, dr1
++ mov [uDR1], eax
++# endif
++ }
++# endif
++ return uDR1;
++}
++#endif
++
++/**
++ * Gets dr2.
++ *
++ * @returns dr2.
++ */
++#if RT_INLINE_ASM_EXTERNAL
++DECLASM(RTCCUINTREG) ASMGetDR2(void);
++#else
++DECLINLINE(RTCCUINTREG) ASMGetDR2(void)
++{
++ RTCCUINTREG uDR2;
++# if RT_INLINE_ASM_GNU_STYLE
++# ifdef RT_ARCH_AMD64
++ __asm__ __volatile__("movq %%dr2, %0\n\t" : "=r" (uDR2));
++# else
++ __asm__ __volatile__("movl %%dr2, %0\n\t" : "=r" (uDR2));
++# endif
++# else
++ __asm
++ {
++# ifdef RT_ARCH_AMD64
++ mov rax, dr2
++ mov [uDR2], rax
++# else
++ mov eax, dr2
++ mov [uDR2], eax
++# endif
++ }
++# endif
++ return uDR2;
++}
++#endif
++
++/**
++ * Gets dr3.
++ *
++ * @returns dr3.
++ */
++#if RT_INLINE_ASM_EXTERNAL
++DECLASM(RTCCUINTREG) ASMGetDR3(void);
++#else
++DECLINLINE(RTCCUINTREG) ASMGetDR3(void)
++{
++ RTCCUINTREG uDR3;
++# if RT_INLINE_ASM_GNU_STYLE
++# ifdef RT_ARCH_AMD64
++ __asm__ __volatile__("movq %%dr3, %0\n\t" : "=r" (uDR3));
++# else
++ __asm__ __volatile__("movl %%dr3, %0\n\t" : "=r" (uDR3));
++# endif
++# else
++ __asm
++ {
++# ifdef RT_ARCH_AMD64
++ mov rax, dr3
++ mov [uDR3], rax
++# else
++ mov eax, dr3
++ mov [uDR3], eax
++# endif
++ }
++# endif
++ return uDR3;
++}
++#endif
++
++/**
++ * Sets dr0.
++ *
++ * @param uDRVal Debug register value to write
++ */
++#if RT_INLINE_ASM_EXTERNAL
++DECLASM(void) ASMSetDR0(RTCCUINTREG uDRVal);
++#else
++DECLINLINE(void) ASMSetDR0(RTCCUINTREG uDRVal)
++{
++# if RT_INLINE_ASM_GNU_STYLE
++# ifdef RT_ARCH_AMD64
++ __asm__ __volatile__("movq %0, %%dr0\n\t" : "=r" (uDRVal));
++# else
++ __asm__ __volatile__("movl %0, %%dr0\n\t" : "=r" (uDRVal));
++# endif
++# else
++ __asm
++ {
++# ifdef RT_ARCH_AMD64
++ mov dr0, [uDRVal]
++# else
++ mov eax, [uDRVal]
++ mov dr0, eax
++# endif
++ }
++# endif
++}
++#endif
++
++/**
++ * Sets dr1.
++ *
++ * @param uDRVal Debug register value to write
++ */
++#if RT_INLINE_ASM_EXTERNAL
++DECLASM(void) ASMSetDR1(RTCCUINTREG uDRVal);
++#else
++DECLINLINE(void) ASMSetDR1(RTCCUINTREG uDRVal)
++{
++# if RT_INLINE_ASM_GNU_STYLE
++# ifdef RT_ARCH_AMD64
++ __asm__ __volatile__("movq %0, %%dr1\n\t" : "=r" (uDRVal));
++# else
++ __asm__ __volatile__("movl %0, %%dr1\n\t" : "=r" (uDRVal));
++# endif
++# else
++ __asm
++ {
++# ifdef RT_ARCH_AMD64
++ mov dr1, [uDRVal]
++# else
++ mov eax, [uDRVal]
++ mov dr1, eax
++# endif
++ }
++# endif
++}
++#endif
++
++/**
++ * Sets dr2.
++ *
++ * @param uDRVal Debug register value to write
++ */
++#if RT_INLINE_ASM_EXTERNAL
++DECLASM(void) ASMSetDR2(RTCCUINTREG uDRVal);
++#else
++DECLINLINE(void) ASMSetDR2(RTCCUINTREG uDRVal)
++{
++# if RT_INLINE_ASM_GNU_STYLE
++# ifdef RT_ARCH_AMD64
++ __asm__ __volatile__("movq %0, %%dr2\n\t" : "=r" (uDRVal));
++# else
++ __asm__ __volatile__("movl %0, %%dr2\n\t" : "=r" (uDRVal));
++# endif
++# else
++ __asm
++ {
++# ifdef RT_ARCH_AMD64
++ mov dr2, [uDRVal]
++# else
++ mov eax, [uDRVal]
++ mov dr2, eax
++# endif
++ }
++# endif
++}
++#endif
++
++/**
++ * Sets dr3.
++ *
++ * @param uDRVal Debug register value to write
++ */
++#if RT_INLINE_ASM_EXTERNAL
++DECLASM(void) ASMSetDR3(RTCCUINTREG uDRVal);
++#else
++DECLINLINE(void) ASMSetDR3(RTCCUINTREG uDRVal)
++{
++# if RT_INLINE_ASM_GNU_STYLE
++# ifdef RT_ARCH_AMD64
++ __asm__ __volatile__("movq %0, %%dr3\n\t" : "=r" (uDRVal));
++# else
++ __asm__ __volatile__("movl %0, %%dr3\n\t" : "=r" (uDRVal));
++# endif
++# else
++ __asm
++ {
++# ifdef RT_ARCH_AMD64
++ mov dr3, [uDRVal]
++# else
++ mov eax, [uDRVal]
++ mov dr3, eax
++# endif
++ }
++# endif
++}
++#endif
++
++/**
++ * Sets dr6.
++ *
++ * @param uDRVal Debug register value to write
++ */
++#if RT_INLINE_ASM_EXTERNAL
++DECLASM(void) ASMSetDR6(RTCCUINTREG uDRVal);
++#else
++DECLINLINE(void) ASMSetDR6(RTCCUINTREG uDRVal)
++{
++# if RT_INLINE_ASM_GNU_STYLE
++# ifdef RT_ARCH_AMD64
++ __asm__ __volatile__("movq %0, %%dr6\n\t" : "=r" (uDRVal));
++# else
++ __asm__ __volatile__("movl %0, %%dr6\n\t" : "=r" (uDRVal));
++# endif
++# else
++ __asm
++ {
++# ifdef RT_ARCH_AMD64
++ mov dr6, [uDRVal]
++# else
++ mov eax, [uDRVal]
++ mov dr6, eax
++# endif
++ }
++# endif
++}
++#endif
++
++/**
++ * Sets dr7.
++ *
++ * @param uDRVal Debug register value to write
++ */
++#if RT_INLINE_ASM_EXTERNAL
++DECLASM(void) ASMSetDR7(RTCCUINTREG uDRVal);
++#else
++DECLINLINE(void) ASMSetDR7(RTCCUINTREG uDRVal)
++{
++# if RT_INLINE_ASM_GNU_STYLE
++# ifdef RT_ARCH_AMD64
++ __asm__ __volatile__("movq %0, %%dr7\n\t" : "=r" (uDRVal));
++# else
++ __asm__ __volatile__("movl %0, %%dr7\n\t" : "=r" (uDRVal));
++# endif
++# else
++ __asm
++ {
++# ifdef RT_ARCH_AMD64
++ mov dr7, [uDRVal]
++# else
++ mov eax, [uDRVal]
++ mov dr7, eax
++# endif
++ }
++# endif
++}
++#endif
+
+ /**
+ * Compiler memory barrier.
+diff -urN VirtualBox-2.0.0/include/iprt/log.h vbox/include/iprt/log.h
+--- VirtualBox-2.0.0/include/iprt/log.h 2008-09-08 10:06:10.000000000 +0200
++++ vbox/include/iprt/log.h 2008-09-08 10:06:52.000000000 +0200
+@@ -799,10 +799,11 @@
+ /** @def LogIt
+ * Write to specific logger if group enabled.
+ */
+-#if defined(LOG_USE_C99)
+-# define _LogRelRemoveParentheseis(...) __VA_ARGS__
+-# define _LogRelIt(pvInst, fFlags, iGroup, ...) RTLogLoggerEx((PRTLOGGER)pvInst, fFlags, iGroup, __VA_ARGS__)
+-# define LogRelIt(pvInst, fFlags, iGroup, fmtargs) \
++#ifndef IN_RING0 /* causes problems in ring 0; do not enable before tracking this down (see 3137 & 3144) */
++# if defined(LOG_USE_C99)
++# define _LogRelRemoveParentheseis(...) __VA_ARGS__
++# define _LogRelIt(pvInst, fFlags, iGroup, ...) RTLogLoggerEx((PRTLOGGER)pvInst, fFlags, iGroup, __VA_ARGS__)
++# define LogRelIt(pvInst, fFlags, iGroup, fmtargs) \
+ do \
+ { \
+ PRTLOGGER LogRelIt_pLogger = (PRTLOGGER)(pvInst) ? (PRTLOGGER)(pvInst) : RTLogRelDefaultInstance(); \
+@@ -810,8 +811,8 @@
+ _LogRelIt(LogRelIt_pLogger, fFlags, iGroup, _LogRelRemoveParentheseis fmtargs); \
+ LogIt(LOG_INSTANCE, fFlags, iGroup, fmtargs); \
+ } while (0)
+-#else
+-# define LogRelIt(pvInst, fFlags, iGroup, fmtargs) \
++# else
++# define LogRelIt(pvInst, fFlags, iGroup, fmtargs) \
+ do \
+ { \
+ PRTLOGGER LogRelIt_pLogger = (PRTLOGGER)(pvInst) ? (PRTLOGGER)(pvInst) : RTLogRelDefaultInstance(); \
+@@ -823,9 +824,15 @@
+ } \
+ LogIt(LOG_INSTANCE, fFlags, iGroup, fmtargs); \
+ } while (0)
++# endif
++#else
++# define LogRelIt(pvInst, fFlags, iGroup, fmtargs) do { } while (0)
++# if defined(LOG_USE_C99)
++# define _LogRelRemoveParentheseis(...) __VA_ARGS__
++# define _LogRelIt(pvInst, fFlags, iGroup, ...) do { } while (0)
++# endif
+ #endif
+
+-
+ /** @def LogRel
+ * Level 1 logging.
+ */
+diff -urN VirtualBox-2.0.0/include/iprt/mp.h vbox/include/iprt/mp.h
+--- VirtualBox-2.0.0/include/iprt/mp.h 2008-09-08 10:06:10.000000000 +0200
++++ vbox/include/iprt/mp.h 2008-09-08 10:06:52.000000000 +0200
+@@ -83,6 +83,7 @@
+ */
+ RTDECL(RTCPUID) RTMpGetMaxCpuId(void);
+
++
+ /**
+ * Checks if a CPU exists in the system or may possibly be hotplugged later.
+ *
+@@ -108,6 +109,7 @@
+ */
+ RTDECL(RTCPUID) RTMpGetCount(void);
+
++
+ /**
+ * Gets set of the CPUs present that are currently online.
+ *
+@@ -131,6 +133,31 @@
+ */
+ RTDECL(bool) RTMpIsCpuOnline(RTCPUID idCpu);
+
++
++/**
++ * Gets set of the CPUs present in the system.
++ *
++ * @returns pSet.
++ * @param pSet Where to put the set.
++ */
++RTDECL(PRTCPUSET) RTMpGetPresentSet(PRTCPUSET pSet);
++
++/**
++ * Get the count of CPUs that are present in the system.
++ *
++ * @return The count.
++ */
++RTDECL(RTCPUID) RTMpGetPresentCount(void);
++
++/**
++ * Checks if a CPU is present in the system.
++ *
++ * @returns true/false accordingly.
++ * @param idCpu The identifier of the CPU.
++ */
++RTDECL(bool) RTMpIsCpuPresent(RTCPUID idCpu);
++
++
+ /**
+ * Get the current frequency of a CPU.
+ *
+diff -urN VirtualBox-2.0.0/include/VBox/err.h vbox/include/VBox/err.h
+--- VirtualBox-2.0.0/include/VBox/err.h 2008-09-08 10:06:11.000000000 +0200
++++ vbox/include/VBox/err.h 2008-09-08 10:06:52.000000000 +0200
+@@ -1213,6 +1213,14 @@
+ #define VERR_VMX_X86_CR4_VMXE_CLEARED (-4012)
+ /** VT-x features locked or unavailable in MSR. */
+ #define VERR_VMX_MSR_LOCKED_OR_DISABLED (-4013)
++/** Unable to switch due to invalid guest state. */
++#define VERR_VMX_INVALID_GUEST_STATE (-4014)
++/** Unexpected VM exit code. */
++#define VERR_VMX_UNEXPECTED_EXIT_CODE (-4015)
++/** Unexpected VM exception code. */
++#define VERR_VMX_UNEXPECTED_EXCEPTION (-4016)
++/** Unexpected interruption exit code. */
++#define VERR_VMX_UNEXPECTED_INTERRUPTION_EXIT_CODE (-4017)
+ /** @} */
+
+
+diff -urN VirtualBox-2.0.0/include/VBox/x86.h vbox/include/VBox/x86.h
+--- VirtualBox-2.0.0/include/VBox/x86.h 2008-09-08 10:06:11.000000000 +0200
++++ vbox/include/VBox/x86.h 2008-09-08 10:06:53.000000000 +0200
+@@ -624,6 +624,8 @@
+ #define X86_DR6_BS RT_BIT(14)
+ /** Bit 15 - BT - Task switch. (TSS T bit.) */
+ #define X86_DR6_BT RT_BIT(15)
++/** Value of DR6 after powerup/reset. */
++#define X86_DR6_INIT_VAL UINT64_C(0xFFFF0FF0)
+ /** @} */
+
+
+@@ -716,7 +718,7 @@
+ #define X86_DR7_LEN(iBp, cb) ( (cb) << ((iBp) * 4 + 18) )
+
+ /** Mask used to check if any breakpoints are enabled. */
+-#define X86_DR7_ENABLED_MASK (RT_BIT(0) | RT_BIT(1) | RT_BIT(2) | RT_BIT(3) | RT_BIT(4) | RT_BIT(5) | RT_BIT(6) | RT_BIT(7))
++#define X86_DR7_ENABLED_MASK (RT_BIT(0) | RT_BIT(1) | RT_BIT(2) | RT_BIT(3) | RT_BIT(4) | RT_BIT(5) | RT_BIT(6) | RT_BIT(7)) | X86_DR7_GD
+
+ /** @} */
+
+diff -urN VirtualBox-2.0.0/kBuild/envwin.cmd vbox/kBuild/envwin.cmd
+--- VirtualBox-2.0.0/kBuild/envwin.cmd 2008-09-08 10:06:35.000000000 +0200
++++ vbox/kBuild/envwin.cmd 2008-09-08 10:07:24.000000000 +0200
+@@ -234,9 +234,9 @@
+ echo Force AMD64 64-bit windows target platform.
+ echo --nt
+ echo Force NT target and host platform.
+-echo --win32
++echo --nt32
+ echo Force x86 32-bit NT target platform.
+-echo --win64
++echo --nt64
+ echo Force AMD64 64-bit NT target platform.
+ echo --debug, --release, --profile
+ echo Alternative way of specifying KBUILD_TYPE.
+diff -urN VirtualBox-2.0.0/kBuild/footer.kmk vbox/kBuild/footer.kmk
+--- VirtualBox-2.0.0/kBuild/footer.kmk 2008-09-08 10:06:36.000000000 +0200
++++ vbox/kBuild/footer.kmk 2008-09-08 10:07:25.000000000 +0200
+@@ -90,8 +90,8 @@
+ $(_ALL_FETCHES) \
+ $(_ALL_PATCHES)
+
+-# dependency files.
+-_DEPFILES :=
++# Dependency files. (currently not on target level, only this global stuff)
++_DEPFILES := $(DEPFILES) $(DEPFILES.$(KBUILD_TARGET)) $(DEPFILES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)) $(DEPFILES.$(KBUILD_TARGET_ARCH)) $(DEPFILES.$(KBUILD_TARGET_CPU)) $(DEPFILES.$(KBUILD_TYPE))
+
+ # included dependency files.
+ _DEPFILES_INCLUDED :=
+@@ -1351,12 +1351,28 @@
+ TARGET_$(target) := $(out)
+
+ # INSTARGET_*
+-ifndef $(target)_NOINST
+-INSTARGET_$(target) := $(patsubst %/,%/$(notdir $(out)), \
+- $(if $($(target)_INST), $(addprefix $(PATH_INS)/,$($(target)_INST)), $(definst)/))
++ifeq ($(strip $($(target)_NOINST) $($(target)_NOINST.$(bld_trg)) $($(target)_NOINST.$(bld_trg).$(bld_trg_arch)) $($(target)_NOINST.$(bld_trg).$(bld_trg_arch).$(bld_type)) $($(target)_NOINST.$(bld_trg_arch)) $($(target)_NOINST.$(bld_trg_cpu)) $($(target)_NOINST.$(bld_trg_type))),)
++ ifneq ($(strip $($(target)_INST.$(bld_trg).$(bld_trg_arch).$(bld_type))),)
++ local inst := $(addprefix $(PATH_INS)/,$($(target)_INST.$(bld_trg).$(bld_trg_arch).$(bld_type)))
++ else ifneq ($(strip $($(target)_INST.$(bld_trg).$(bld_trg_arch))),)
++ local inst := $(addprefix $(PATH_INS)/,$($(target)_INST.$(bld_trg).$(bld_trg_arch)))
++ else ifneq ($(strip $($(target)_INST.$(bld_trg).$(bld_type))),)
++ local inst := $(addprefix $(PATH_INS)/,$($(target)_INST.$(bld_trg).$(bld_type)))
++ else ifneq ($(strip $($(target)_INST.$(bld_trg_arch))),)
++ local inst := $(addprefix $(PATH_INS)/,$($(target)_INST.$(bld_trg_arch)))
++ else ifneq ($(strip $($(target)_INST.$(bld_trg))),)
++ local inst := $(addprefix $(PATH_INS)/,$($(target)_INST.$(bld_trg)))
++ else ifneq ($(strip $($(target)_INST.$(bld_type))),)
++ local inst := $(addprefix $(PATH_INS)/,$($(target)_INST.$(bld_type)))
++ else ifneq ($(strip $($(target)_INST)),)
++ local inst := $(addprefix $(PATH_INS)/,$($(target)_INST))
++ else
++ local inst := $(definst)/
++ endif
++ INSTARGET_$(target) := $(patsubst %/,%/$(notdir $(out)),$(inst))
+
+ else # NOINST
+-INSTARGET_$(target) :=
++ INSTARGET_$(target) :=
+ endif # NOINST
+
+ endef
+@@ -2098,21 +2114,37 @@
+ # @param $(typevar) The name of the variable with all the root targets of its type.
+ # @remark Only library uses this now.
+ define def_target_install_pluss
+-ifndef $(target)_NOINST
+-INSTARGET_$(target) := $(patsubst %/,%/$(notdir $(out)), \
+- $(if $($(target)_INST), $(addprefix $(PATH_INS)/,$($(target)_INST)), $(definst)/))
++ifeq ($(strip $($(target)_NOINST) $($(target)_NOINST.$(bld_trg)) $($(target)_NOINST.$(bld_trg).$(bld_trg_arch)) $($(target)_NOINST.$(bld_trg).$(bld_trg_arch).$(bld_type)) $($(target)_NOINST.$(bld_trg_arch)) $($(target)_NOINST.$(bld_trg_cpu)) $($(target)_NOINST.$(bld_trg_type))),)
++ ifneq ($(strip $($(target)_INST.$(bld_trg).$(bld_trg_arch).$(bld_type))),)
++ local inst := $(addprefix $(PATH_INS)/,$($(target)_INST.$(bld_trg).$(bld_trg_arch).$(bld_type)))
++ else ifneq ($(strip $($(target)_INST.$(bld_trg).$(bld_trg_arch))),)
++ local inst := $(addprefix $(PATH_INS)/,$($(target)_INST.$(bld_trg).$(bld_trg_arch)))
++ else ifneq ($(strip $($(target)_INST.$(bld_trg).$(bld_type))),)
++ local inst := $(addprefix $(PATH_INS)/,$($(target)_INST.$(bld_trg).$(bld_type)))
++ else ifneq ($(strip $($(target)_INST.$(bld_trg_arch))),)
++ local inst := $(addprefix $(PATH_INS)/,$($(target)_INST.$(bld_trg_arch)))
++ else ifneq ($(strip $($(target)_INST.$(bld_trg))),)
++ local inst := $(addprefix $(PATH_INS)/,$($(target)_INST.$(bld_trg)))
++ else ifneq ($(strip $($(target)_INST.$(bld_type))),)
++ local inst := $(addprefix $(PATH_INS)/,$($(target)_INST.$(bld_type)))
++ else ifneq ($(strip $($(target)_INST)),)
++ local inst := $(addprefix $(PATH_INS)/,$($(target)_INST))
++ else
++ local inst := $(definst)/
++ endif
++ INSTARGET_$(target) := $(patsubst %/,%/$(notdir $(out)),$(inst))
+
+ $(eval $(def_link_install_rule))
+
+-_INSTALLS_FILES += $(INSTARGET_$(target))
++ _INSTALLS_FILES += $(INSTARGET_$(target))
+
+-ifdef KBUILD_DO_AUTO_INSTALL
+-$(typevar) += $(INSTARGET_$(target))
+-else
+-$(typevar) += $(out)
+-endif
++ ifdef KBUILD_DO_AUTO_INSTALL
++ $(typevar) += $(INSTARGET_$(target))
++ else
++ $(typevar) += $(out)
++ endif
+ else # _NOINST
+-$(typevar) += $(out)
++ $(typevar) += $(out)
+ endif
+
+ _OUT_FILES += $($(target)_OUTPUT_) $($(target)_OUTPUT_MAYBE_) $(out)
+@@ -2203,8 +2235,40 @@
+ $($(target)_ARFLAGS.$(bld_trg).$(bld_trg_arch)) \
+ $($(target)_ARFLAGS.$(bld_trg_cpu))
+ local dirdep := $(call DIRDEP,$(dir $(out)))
+-local deps := $($(target)_DEPS)
+-local orderdeps := $($(target)_ORDERDEPS)
++local deps := \
++ $($(target)_DEPS.$(bld_trg_cpu)) \
++ $($(target)_DEPS.$(bld_trg).$(bld_trg_arch).$(bld_type)) \
++ $($(target)_DEPS.$(bld_trg).$(bld_trg_arch)) \
++ $($(target)_DEPS.$(bld_trg).$(bld_type)) \
++ $($(target)_DEPS.$(bld_trg_arch)) \
++ $($(target)_DEPS.$(bld_trg)) \
++ $($(target)_DEPS.$(bld_type)) \
++ $($(target)_DEPS) \
++ $($(target)_LNK_DEPS.$(bld_trg_cpu)) \
++ $($(target)_LNK_DEPS.$(bld_trg).$(bld_trg_arch).$(bld_type)) \
++ $($(target)_LNK_DEPS.$(bld_trg).$(bld_trg_arch)) \
++ $($(target)_LNK_DEPS.$(bld_trg).$(bld_type)) \
++ $($(target)_LNK_DEPS.$(bld_trg_arch)) \
++ $($(target)_LNK_DEPS.$(bld_trg)) \
++ $($(target)_LNK_DEPS.$(bld_type)) \
<<Diff was trimmed, longer than 597 lines>>
More information about the pld-cvs-commit
mailing list