From da4b0aaf46be19a71410247d1e622d8c976ff7ab Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 27 May 2017 02:33:04 +0200 Subject: microblaze: use gcc6 as default --- target/config/Config.in.compiler | 1 - toolchain/gcc/patches/6.3.0/microblaze.patch | 23 +++++++++++++++++++++++ toolchain/gcc/patches/7.1.0/microblaze.patch | 23 +++++++++++++++++++++++ 3 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 toolchain/gcc/patches/6.3.0/microblaze.patch create mode 100644 toolchain/gcc/patches/7.1.0/microblaze.patch diff --git a/target/config/Config.in.compiler b/target/config/Config.in.compiler index 748f3068f..1788dfac9 100644 --- a/target/config/Config.in.compiler +++ b/target/config/Config.in.compiler @@ -24,7 +24,6 @@ default ADK_TOOLCHAIN_GCC_4_4 if ADK_TARGET_ARCH_AVR32 default ADK_TOOLCHAIN_GCC_4_9 if ADK_TARGET_ARCH_LM32 && !ADK_TARGET_LIB_NEWLIB default ADK_TOOLCHAIN_GCC_4_9 if ADK_TARGET_LIB_GLIBC && ADK_TARGET_ARCH_SH default ADK_TOOLCHAIN_GCC_4_9 if ADK_TARGET_SYSTEM_KINETIS_K70 -default ADK_TOOLCHAIN_GCC_5 if ADK_TARGET_ARCH_MICROBLAZE default ADK_TOOLCHAIN_GCC_7 if ADK_TARGET_ARCH_CRIS default ADK_TOOLCHAIN_GCC_6 diff --git a/toolchain/gcc/patches/6.3.0/microblaze.patch b/toolchain/gcc/patches/6.3.0/microblaze.patch new file mode 100644 index 000000000..eb6c08492 --- /dev/null +++ b/toolchain/gcc/patches/6.3.0/microblaze.patch @@ -0,0 +1,23 @@ +revert 6dcad60c0ef48af584395a40feeb256fb82986a8 +as it breaks any userland in qemu + +diff -Nur gcc-6.3.0.orig/gcc/config/microblaze/microblaze.h gcc-6.3.0/gcc/config/microblaze/microblaze.h +--- gcc-6.3.0.orig/gcc/config/microblaze/microblaze.h 2016-01-21 18:10:54.000000000 +0100 ++++ gcc-6.3.0/gcc/config/microblaze/microblaze.h 2017-05-26 18:33:31.297534916 +0200 +@@ -253,14 +253,14 @@ + #define FIXED_REGISTERS \ + { \ + 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, \ +- 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \ ++ 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \ + 1, 1, 1, 1 \ + } + + #define CALL_USED_REGISTERS \ + { \ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, \ +- 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \ ++ 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \ + 1, 1, 1, 1 \ + } + #define GP_REG_FIRST 0 diff --git a/toolchain/gcc/patches/7.1.0/microblaze.patch b/toolchain/gcc/patches/7.1.0/microblaze.patch new file mode 100644 index 000000000..eb6c08492 --- /dev/null +++ b/toolchain/gcc/patches/7.1.0/microblaze.patch @@ -0,0 +1,23 @@ +revert 6dcad60c0ef48af584395a40feeb256fb82986a8 +as it breaks any userland in qemu + +diff -Nur gcc-6.3.0.orig/gcc/config/microblaze/microblaze.h gcc-6.3.0/gcc/config/microblaze/microblaze.h +--- gcc-6.3.0.orig/gcc/config/microblaze/microblaze.h 2016-01-21 18:10:54.000000000 +0100 ++++ gcc-6.3.0/gcc/config/microblaze/microblaze.h 2017-05-26 18:33:31.297534916 +0200 +@@ -253,14 +253,14 @@ + #define FIXED_REGISTERS \ + { \ + 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, \ +- 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \ ++ 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \ + 1, 1, 1, 1 \ + } + + #define CALL_USED_REGISTERS \ + { \ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, \ +- 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \ ++ 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \ + 1, 1, 1, 1 \ + } + #define GP_REG_FIRST 0 -- cgit v1.2.3