From e2998cea49f7e7ccc7d55053b30e8b0696378263 Mon Sep 17 00:00:00 2001 From: weissms Date: Thu, 16 Feb 2012 17:41:07 +0000 Subject: [PATCH] Provide modulename parameter to build_archspecific so we can include LC_LIBDEFS_FILE. git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@44053 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- arch/all-unix/kernel/allockernelbase.c | 6 +++--- arch/all-unix/kernel/mmakefile.src | 2 +- arch/ppc-chrp/efika/kernel/mmakefile.src | 2 +- arch/ppc-sam440/kernel/mmakefile.src | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/all-unix/kernel/allockernelbase.c b/arch/all-unix/kernel/allockernelbase.c index 348c833eea..28cc7009b1 100644 --- a/arch/all-unix/kernel/allockernelbase.c +++ b/arch/all-unix/kernel/allockernelbase.c @@ -2,7 +2,7 @@ #include #include -#include "kernel_libdefs.h" /* Actually LC_LIBDEFS_FILE, we want FUNCTIONS_COUNT */ +#include LC_LIBDEFS_FILE /* we want FUNCTIONS_COUNT */ #include #include @@ -23,7 +23,7 @@ struct KernelBase *AllocKernelBase(struct ExecBase *SysBase) /* Allocate the memory. Note that we have platform-specific portion in KernelBase. */ mem = AllocMem(i + sizeof(struct UnixKernelBase), MEMF_PUBLIC|MEMF_CLEAR); if (!mem) - return NULL; + return NULL; /* Skip past the vector table */ KernelBase = mem + i; @@ -32,7 +32,7 @@ struct KernelBase *AllocKernelBase(struct ExecBase *SysBase) D(bug("[KRN] PlatformData %p\n", KernelBase->kb_PlatformData)); if (!KernelBase->kb_PlatformData) - return NULL; + return NULL; /* Set global KernelBase storage and return */ setKernelBase(KernelBase); diff --git a/arch/all-unix/kernel/mmakefile.src b/arch/all-unix/kernel/mmakefile.src index 3463abd4fa..c6f8975d53 100644 --- a/arch/all-unix/kernel/mmakefile.src +++ b/arch/all-unix/kernel/mmakefile.src @@ -13,7 +13,7 @@ FILES := kernel_startup kernel kernel_cpu kernel_intr cpu_$(CPU) %build_archspecific \ mainmmake=kernel-kernel maindir=rom/kernel \ - arch=unix files="$(FILES) $(FUNCS)" + arch=unix files="$(FILES) $(FUNCS)" modulename=kernel TESTS := coretest diff --git a/arch/ppc-chrp/efika/kernel/mmakefile.src b/arch/ppc-chrp/efika/kernel/mmakefile.src index 7ac3f0f4c3..9af5fc45fc 100644 --- a/arch/ppc-chrp/efika/kernel/mmakefile.src +++ b/arch/ppc-chrp/efika/kernel/mmakefile.src @@ -21,7 +21,7 @@ $(BINDIR)/boot/aros-efika: $(KOBJSDIR)/kernel_resource.o $(KOBJSDIR)/exec_librar %build_archspecific \ mainmmake=kernel-kernel maindir=rom/kernel \ cflags="$(CFLAGS) -I$(SRCDIR)/rom/exec" \ - arch=chrp-ppc-efika files="$(FILES)" + arch=chrp-ppc-efika files="$(FILES)" modulename=kernel #%build_module mmake=kernel-kernel-chrp-ppc-efika \ # modname=kernel modtype=resource \ diff --git a/arch/ppc-sam440/kernel/mmakefile.src b/arch/ppc-sam440/kernel/mmakefile.src index b79767d100..2886e9baee 100644 --- a/arch/ppc-sam440/kernel/mmakefile.src +++ b/arch/ppc-sam440/kernel/mmakefile.src @@ -19,7 +19,7 @@ $(BINDIR)/boot/aros-amcc440: $(KOBJSDIR)/kernel_resource.o $(KOBJSDIR)/exec_libr %build_archspecific \ mainmmake=kernel-kernel maindir=rom/kernel \ cflags="$(CFLAGS) $(PRIV_KERNEL_INCLUDES) $(PRIV_EXEC_INCLUDES)" \ - arch=sam440-ppc files="$(FILES)" + arch=sam440-ppc files="$(FILES)" modulename=kernel #%build_module mmake=kernel-kernel-sam440-ppc \ # modname=kernel modtype=resource \ -- 2.11.4.GIT