Hi,
On 28/09/2019 22:44, Paul Spooren wrote:
Main motivation for this commit is the introduction of
`-ffile-prefix-map=` which alows reproducible build path.
compilation failed for me, it tried to use -iremap. Maybe you used
CONFIG_GCC_USE_EMBEDDED_PATH_REMAP?
Attached a fixup that works for me, runtime tested on sunxi.
Regards,
Andre
commit 818244878603e8cb45d06473f2a5a72c5f9254a7
Author: Andre Heider <a.hei...@gmail.com>
Date: Tue Oct 1 09:37:52 2019 +0200
fixup gcc8
diff --git a/config/Config-build.in b/config/Config-build.in
index 9669fc86c7..872e5c12ab 100644
--- a/config/Config-build.in
+++ b/config/Config-build.in
@@ -243,7 +243,6 @@ menu "Global build settings"
config PKG_CC_STACKPROTECTOR_STRONG
bool "Strong"
select GCC_LIBSSP if !USE_MUSL
- depends on !GCC_VERSION_4_8
depends on KERNEL_CC_STACKPROTECTOR_STRONG
endchoice
@@ -258,7 +257,6 @@ menu "Global build settings"
config KERNEL_CC_STACKPROTECTOR_REGULAR
bool "Regular"
config KERNEL_CC_STACKPROTECTOR_STRONG
- depends on !GCC_VERSION_4_8
bool "Strong"
endchoice
diff --git a/rules.mk b/rules.mk
index b140fbca70..7063cf3ad6 100644
--- a/rules.mk
+++ b/rules.mk
@@ -139,11 +139,11 @@ else
TOOLCHAIN_DIR_NAME:=toolchain-$(GNU_TARGET_NAME)
endif
-ifeq ($(or $(CONFIG_EXTERNAL_TOOLCHAIN),$(CONFIG_GCC_VERSION_4_8),$(CONFIG_TARGET_uml)),)
- ifeq ($(CONFIG_GCC_USE_EMBEDDED_PATH_REMAP),y)
- iremap = -fmacro-prefix-map=$(1)=$(2)
- else
+ifeq ($(or $(CONFIG_EXTERNAL_TOOLCHAIN),$(CONFIG_TARGET_uml)),)
+ ifeq ($(CONFIG_GCC_USE_IREMAP),y)
iremap = -iremap$(1):$(2)
+ else
+ iremap = -ffile-prefix-map=$(1)=$(2)
endif
endif
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 7d7f34210a..3882815d7f 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -21,6 +21,11 @@ choice
bool "gcc 9.x"
endchoice
+config GCC_USE_IREMAP
+ default y if ( GCC_USE_VERSION_5 || GCC_USE_VERSION_7 )
+ default n
+ bool
+
config GCC_USE_GRAPHITE
bool
prompt "Compile in support for the new Graphite framework in GCC 4.4+" if TOOLCHAINOPTS
diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
index 1a86bcb8a6..0658f3d52b 100644
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -10,11 +10,6 @@ config GCC_VERSION_9
default y if GCC_USE_VERSION_9
bool
-config GCC_USE_EMBEDDED_PATH_REMAP
- default y if ( GCC_VERSION_8 || GCC_VERSION_9 )
- default n
- bool
-
config GCC_VERSION
string
default "5.5.0" if GCC_VERSION_5
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
