From 95444b27abfb723db6c66c08dc6c12c7e1128e2e Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 17 Sep 2017 12:24:34 +0200
Subject: remove -fhonour-copts usage

This reuires a external gcc patch, which I no longer add to newer gcc.
A lot of packages already need to disable the usage of -fhonour-copts, because
it doesn't work without patching. May be we need something like Buildroot
is using, a gcc wrapper to see poisened include or library paths while
cross-compiling.
---
 mk/build.mk   |  1 -
 mk/package.mk |  2 --
 mk/vars.mk    | 19 -------------------
 3 files changed, 22 deletions(-)

(limited to 'mk')

diff --git a/mk/build.mk b/mk/build.mk
index 67a53896a..9813db404 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -17,7 +17,6 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_PACKAGE_BUSYBOX_HIDE=n \
 			ADK_DISABLE_KERNEL_PATCHES=n \
 			ADK_DISABLE_TARGET_KERNEL_PATCHES=n \
-			ADK_DISABLE_HONOUR_CFLAGS=n \
 			ADK_KERNEL_FB_CON_DECOR=n \
 			ADK_MAKE_PARALLEL=y \
 			ADK_MAKE_JOBS=4 \
diff --git a/mk/package.mk b/mk/package.mk
index e6bb0fed0..88dcaadb7 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -20,7 +20,6 @@ CONFIGURE_ENV+=		PATH='${TARGET_PATH}' \
 			${TARGET_ENV} \
 			PKG_CONFIG_LIBDIR='${STAGING_TARGET_DIR}/usr/lib/pkgconfig:${STAGING_TARGET_DIR}/usr/share/pkgconfig' \
 			PKG_CONFIG_SYSROOT_DIR='${STAGING_TARGET_DIR}' \
-			GCC_HONOUR_COPTS=s \
 			cross_compiling=yes
 
 CONFIGURE_PROG?=	configure
@@ -41,7 +40,6 @@ MAKE_ENV+=		PATH='${TARGET_PATH}' \
 			${TARGET_ENV} \
 			PKG_CONFIG_LIBDIR='${STAGING_TARGET_DIR}/usr/lib/pkgconfig:${STAGING_TARGET_DIR}/usr/share/pkgconfig' \
 			PKG_CONFIG_SYSROOT_DIR='${STAGING_TARGET_DIR}' \
-			$(GCC_CHECK) \
 			WRKDIR='${WRKDIR}' WRKDIST='${WRKDIST}' \
 			WRKSRC='${WRKSRC}' WRKBUILD='${WRKBUILD}'
 
diff --git a/mk/vars.mk b/mk/vars.mk
index 850a45a72..0a6c1e5a0 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -65,12 +65,6 @@ TARGET_PATH=		${SCRIPT_DIR}:${STAGING_TARGET_DIR}/scripts:${TOOLCHAIN_DIR}/usr/b
 HOST_PATH=		${SCRIPT_DIR}:${TOOLCHAIN_DIR}/usr/bin:${STAGING_HOST_DIR}/usr/bin:${STAGING_HOST_DIR}/usr/sbin:${_PATH}
 AUTOTOOL_PATH=		${TOOLCHAIN_DIR}/usr/bin:${STAGING_HOST_DIR}/usr/bin:${STAGING_TARGET_DIR}/scripts:${_PATH}
 
-ifeq ($(ADK_DISABLE_HONOUR_CFLAGS),)
-GCC_CHECK:=		GCC_HONOUR_COPTS=2
-else
-GCC_CHECK:=
-endif
-
 ifeq ($(ADK_TARGET_UCLINUX),y)
 ADK_TARGET_LINUXTYPE:=	uclinux
 else
@@ -139,13 +133,6 @@ TARGET_LDFLAGS:=	-L$(STAGING_TARGET_DIR)/lib -L$(STAGING_TARGET_DIR)/usr/lib \
 			-Wl,-O1 -Wl,-rpath -Wl,/usr/lib \
 			-Wl,-rpath-link -Wl,${STAGING_TARGET_DIR}/usr/lib
 
-ifeq ($(ADK_BUILD_COMPILER_GCC),y)
-ifeq ($(ADK_DISABLE_HONOUR_CFLAGS),)
-TARGET_CFLAGS+=		-fhonour-copts
-TARGET_CXXFLAGS+=	-fhonour-copts
-endif
-endif
-
 # for architectures where gcc --with-cpu matches -mcpu=
 ifneq ($(ADK_TARGET_GCC_CPU),)
 TARGET_CFLAGS+=		-mcpu=$(ADK_TARGET_GCC_CPU)
@@ -336,12 +323,6 @@ KERNEL_MODULE_FLAGS:=	ARCH=${ADK_TARGET_KARCH} \
 			CROSS_COMPILE="${TARGET_CROSS}" \
 			V=1
 
-ifeq ($(ADK_BUILD_COMPILER_GCC),y)
-ifeq ($(ADK_DISABLE_HONOUR_CFLAGS),)
-KERNEL_MODULE_FLAGS+=	CFLAGS_MODULE="-fhonour-copts"
-endif
-endif
-
 COMMON_ENV=		CONFIG_SHELL='$(strip ${SHELL})' \
 			AUTOM4TE='${STAGING_HOST_DIR}/usr/bin/autom4te' \
 			M4='${STAGING_HOST_DIR}/usr/bin/m4' \
-- 
cgit v1.2.3