From 92bcfd66a1c001ec4575a3e5f71c9a5e88730875 Mon Sep 17 00:00:00 2001 From: Markham Date: Sun, 15 Apr 2018 15:15:46 +0200 Subject: [PATCH] fix build kernel hd2 with newer compiler mod kernel-config hd1 --- archive-patches/kernel-config/compiler-gcc6.h | 66 +++++++++++++++++++ .../kernel-2.6.34.13-nevis.config | 9 +-- make/prerequisites.mk | 7 +- 3 files changed, 76 insertions(+), 6 deletions(-) create mode 100644 archive-patches/kernel-config/compiler-gcc6.h diff --git a/archive-patches/kernel-config/compiler-gcc6.h b/archive-patches/kernel-config/compiler-gcc6.h new file mode 100644 index 0000000..cdd1cc2 --- /dev/null +++ b/archive-patches/kernel-config/compiler-gcc6.h @@ -0,0 +1,66 @@ +#ifndef __LINUX_COMPILER_H +#error "Please don't include directly, include instead." +#endif + +#define __used __attribute__((__used__)) +#define __must_check __attribute__((warn_unused_result)) +#define __compiler_offsetof(a, b) __builtin_offsetof(a, b) + +/* Mark functions as cold. gcc will assume any path leading to a call + to them will be unlikely. This means a lot of manual unlikely()s + are unnecessary now for any paths leading to the usual suspects + like BUG(), printk(), panic() etc. [but let's keep them for now for + older compilers] + + Early snapshots of gcc 4.3 don't support this and we can't detect this + in the preprocessor, but we can live with this because they're unreleased. + Maketime probing would be overkill here. + + gcc also has a __attribute__((__hot__)) to move hot functions into + a special section, but I don't see any sense in this right now in + the kernel context */ +#define __cold __attribute__((__cold__)) + +#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) + +#ifndef __CHECKER__ +# define __compiletime_warning(message) __attribute__((warning(message))) +# define __compiletime_error(message) __attribute__((error(message))) +#endif /* __CHECKER__ */ + +/* + * Mark a position in code as unreachable. This can be used to + * suppress control flow warnings after asm blocks that transfer + * control elsewhere. + * + * Early snapshots of gcc 4.5 don't support this and we can't detect + * this in the preprocessor, but we can live with this because they're + * unreleased. Really, we need to have autoconf for the kernel. + */ +#define unreachable() __builtin_unreachable() + +/* Mark a function definition as prohibited from being cloned. */ +#define __noclone __attribute__((__noclone__)) + +/* + * Tell the optimizer that something else uses this function or variable. + */ +#define __visible __attribute__((externally_visible)) + +/* + * GCC 'asm goto' miscompiles certain code sequences: + * + * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 + * + * Work it around via a compiler barrier quirk suggested by Jakub Jelinek. + * Fixed in GCC 4.8.2 and later versions. + * + * (asm goto is automatically volatile - the naming reflects this.) + */ +#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) + +#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP +#define __HAVE_BUILTIN_BSWAP32__ +#define __HAVE_BUILTIN_BSWAP64__ +#define __HAVE_BUILTIN_BSWAP16__ +#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */ diff --git a/archive-patches/kernel-config/kernel-2.6.34.13-nevis.config b/archive-patches/kernel-config/kernel-2.6.34.13-nevis.config index e7cf982..d0401ce 100644 --- a/archive-patches/kernel-config/kernel-2.6.34.13-nevis.config +++ b/archive-patches/kernel-config/kernel-2.6.34.13-nevis.config @@ -1485,7 +1485,7 @@ CONFIG_XFS_RT=y # CONFIG_NILFS2_FS is not set CONFIG_FILE_LOCKING=y CONFIG_FSNOTIFY=y -# CONFIG_DNOTIFY is not set +CONFIG_DNOTIFY=y # CONFIG_INOTIFY is not set CONFIG_INOTIFY_USER=y # CONFIG_QUOTA is not set @@ -1568,17 +1568,18 @@ CONFIG_JFFS2_CMODE_PRIORITY=y CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=y CONFIG_NFS_V3=y -# CONFIG_NFS_V3_ACL is not set +CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=y -# CONFIG_NFS_V4_1 is not set +CONFIG_NFS_V4_1=y CONFIG_ROOT_NFS=y CONFIG_NFSD=y CONFIG_NFSD_V3=y -# CONFIG_NFSD_V3_ACL is not set +CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y CONFIG_LOCKD=y CONFIG_LOCKD_V4=y CONFIG_EXPORTFS=y +CONFIG_NFS_ACL_SUPPORT=y CONFIG_NFS_COMMON=y CONFIG_SUNRPC=y CONFIG_SUNRPC_GSS=y diff --git a/make/prerequisites.mk b/make/prerequisites.mk index 8d8cd19..0993ca7 100755 --- a/make/prerequisites.mk +++ b/make/prerequisites.mk @@ -106,8 +106,11 @@ $(GIT_KERNEL): git clone -b $(KBRANCH) $(CSGIT)/$(REPO_KERNEL_CST) linux-$(KBRANCH); \ cd $(GIT_KERNEL)/linux-$(KBRANCH) && \ git checkout $(KBRANCH); \ - fi && \ - ln -sf $(GIT_KERNEL)/linux-$(KBRANCH) $(SOURCE_DIR)/linux + fi; \ + ln -sf $(GIT_KERNEL)/linux-$(KBRANCH) $(SOURCE_DIR)/linux; \ + if [ "$(BOXSERIES)" = "hd2" ]; then \ + cp -a $(PATCHES)/kernel-config/compiler-gcc6.h $(SOURCE_DIR)/linux/include/linux; \ + fi $(GIT_PLUGINS): mkdir -p $(SOURCE_DIR)/git -- 2.39.5