From 1b29292f897f28b3ffc55cb7e254fba040b078cf Mon Sep 17 00:00:00 2001
From: Chris Packham <judge.packham@gmail.com>
Date: Fri, 1 May 2020 15:27:50 +1200
Subject: gcc: Remove nested 8.3.0 directory

When GCC was updated to 8.4.0 the patches were moved incorrectly. Fix
this now so that they will be picked up.

Fixes: commit 31ca84ac ("Update to gcc 8.4.0")
Signed-off-by: Chris Packham <judge.packham@gmail.com>
---
 .../8.4.0/0007-nios2-bad-multilib-default.patch    | 31 ++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 packages/gcc/8.4.0/0007-nios2-bad-multilib-default.patch

(limited to 'packages/gcc/8.4.0/0007-nios2-bad-multilib-default.patch')

diff --git a/packages/gcc/8.4.0/0007-nios2-bad-multilib-default.patch b/packages/gcc/8.4.0/0007-nios2-bad-multilib-default.patch
new file mode 100644
index 00000000..4acc4918
--- /dev/null
+++ b/packages/gcc/8.4.0/0007-nios2-bad-multilib-default.patch
@@ -0,0 +1,31 @@
+---
+ gcc/config/nios2/nios2.h |    4 ++--
+ gcc/config/nios2/t-nios2 |    3 +--
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+--- a/gcc/config/nios2/nios2.h
++++ b/gcc/config/nios2/nios2.h
+@@ -63,11 +63,11 @@
+ #if TARGET_ENDIAN_DEFAULT == 0
+ # define ASM_SPEC "%{!meb:-EL} %{meb:-EB} %{march=*:-march=%*}"
+ # define LINK_SPEC_ENDIAN "%{!meb:-EL} %{meb:-EB}"
+-# define MULTILIB_DEFAULTS { "EL" }
++# define MULTILIB_DEFAULTS { "mel" }
+ #else
+ # define ASM_SPEC "%{!mel:-EB} %{mel:-EL} %{march=*:-march=%*}"
+ # define LINK_SPEC_ENDIAN "%{!mel:-EB} %{mel:-EL}"
+-# define MULTILIB_DEFAULTS { "EB" }
++# define MULTILIB_DEFAULTS { "meb" }
+ #endif
+ 
+ #define LINK_SPEC LINK_SPEC_ENDIAN \
+--- a/gcc/config/nios2/t-nios2
++++ b/gcc/config/nios2/t-nios2
+@@ -22,6 +22,5 @@
+ # MULTILIB_DIRNAMES = nomul mulx fpu-60-1 fpu-60-2
+ # MULTILIB_EXCEPTIONS = 
+ 
+-# MULTILIB_OPTIONS += EL/EB
++# MULTILIB_OPTIONS += mel/meb
+ # MULTILIB_DIRNAMES += le be
+-# MULTILIB_MATCHES += EL=mel EB=meb
-- 
cgit v1.2.3