From fd83f7e52b5a79485e75cd9f0c9e5b111a019b22 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@uclibc-ng.org>
Date: Sat, 8 Oct 2016 12:20:06 +0200
Subject: gcc: add upstreamable patchset for microblaze, remove old patches and
use http protocol
---
toolchain/gcc/Makefile.inc | 2 +-
.../git/0001-fix-linker-name-for-uClibc.patch | 25 ++++++++++++++++++++++
toolchain/gcc/patches/git/add-crtreloc.frv | 12 -----------
toolchain/gcc/patches/git/disable-dwarf.bfin | 12 -----------
toolchain/gcc/patches/git/disable-dwarf.frv | 12 -----------
5 files changed, 26 insertions(+), 37 deletions(-)
create mode 100644 toolchain/gcc/patches/git/0001-fix-linker-name-for-uClibc.patch
delete mode 100644 toolchain/gcc/patches/git/add-crtreloc.frv
delete mode 100644 toolchain/gcc/patches/git/disable-dwarf.bfin
delete mode 100644 toolchain/gcc/patches/git/disable-dwarf.frv
(limited to 'toolchain')
diff --git a/toolchain/gcc/Makefile.inc b/toolchain/gcc/Makefile.inc
index 47b904076..77ab46eac 100644
--- a/toolchain/gcc/Makefile.inc
+++ b/toolchain/gcc/Makefile.inc
@@ -59,7 +59,7 @@ LIBSTDCXXVER:= 19
endif
ifeq ($(ADK_TOOLCHAIN_GCC_GIT),y)
PKG_VERSION:= git
-PKG_SITES:= git://gcc.gnu.org/git/gcc.git
+PKG_SITES:= https://github.com/gcc-mirror/gcc.git
PKG_RELEASE:= 1
LIBSTDCXXVER:= 21
endif
diff --git a/toolchain/gcc/patches/git/0001-fix-linker-name-for-uClibc.patch b/toolchain/gcc/patches/git/0001-fix-linker-name-for-uClibc.patch
new file mode 100644
index 000000000..54bd12e95
--- /dev/null
+++ b/toolchain/gcc/patches/git/0001-fix-linker-name-for-uClibc.patch
@@ -0,0 +1,25 @@
+From 0e8273cfa622a448787e408a066c520ee18eed77 Mon Sep 17 00:00:00 2001
+From: Waldemar Brodkorb <wbx@uclibc-ng.org>
+Date: Sat, 1 Oct 2016 13:33:13 +0200
+Subject: [PATCH] fix linker name for uClibc
+
+Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org>
+---
+ gcc/config/microblaze/linux.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/gcc/config/microblaze/linux.h b/gcc/config/microblaze/linux.h
+index ae8523c..b3bf43a 100644
+--- a/gcc/config/microblaze/linux.h
++++ b/gcc/config/microblaze/linux.h
+@@ -29,6 +29,7 @@
+ #define TLS_NEEDS_GOT 1
+
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
++#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
+
+ #if TARGET_BIG_ENDIAN_DEFAULT == 0 /* LE */
+ #define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:;:el}"
+--
+2.7.4 (Apple Git-66)
+
diff --git a/toolchain/gcc/patches/git/add-crtreloc.frv b/toolchain/gcc/patches/git/add-crtreloc.frv
deleted file mode 100644
index 963fdf0e5..000000000
--- a/toolchain/gcc/patches/git/add-crtreloc.frv
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur gcc-git.orig/gcc/config/frv/linux.h gcc-git/gcc/config/frv/linux.h
---- gcc-git.orig/gcc/config/frv/linux.h 2016-03-23 21:09:04.000000000 +0100
-+++ gcc-git/gcc/config/frv/linux.h 2016-03-26 23:11:48.958579270 +0100
-@@ -27,7 +27,7 @@
-
- #undef STARTFILE_SPEC
- #define STARTFILE_SPEC \
-- "%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} \
-+ "%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} crtreloc.o%s \
- crti.o%s %{static:crtbeginT.o%s;shared|pie:crtbeginS.o%s;:crtbegin.o%s}"
-
- #undef ENDFILE_SPEC
diff --git a/toolchain/gcc/patches/git/disable-dwarf.bfin b/toolchain/gcc/patches/git/disable-dwarf.bfin
deleted file mode 100644
index c11baec92..000000000
--- a/toolchain/gcc/patches/git/disable-dwarf.bfin
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur gcc-git.orig/libgcc/config.host gcc-git/libgcc/config.host
---- gcc-git.orig/libgcc/config.host 2015-10-23 21:12:52.000000000 +0200
-+++ gcc-git/libgcc/config.host 2015-11-15 21:17:38.385745887 +0100
-@@ -231,7 +231,7 @@
- esac
- ;;
- *-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu | *-*-gnu* | *-*-kopensolaris*-gnu)
-- tmake_file="$tmake_file t-crtstuff-pic t-libgcc-pic t-eh-dw2-dip t-slibgcc t-slibgcc-gld t-slibgcc-elf-ver t-linux"
-+ tmake_file="$tmake_file t-crtstuff-pic t-libgcc-pic t-slibgcc t-slibgcc-gld t-slibgcc-elf-ver t-linux"
- extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
- if test x$enable_vtable_verify = xyes; then
- extra_parts="$extra_parts vtv_start.o vtv_end.o vtv_start_preinit.o vtv_end_preinit.o"
diff --git a/toolchain/gcc/patches/git/disable-dwarf.frv b/toolchain/gcc/patches/git/disable-dwarf.frv
deleted file mode 100644
index c11baec92..000000000
--- a/toolchain/gcc/patches/git/disable-dwarf.frv
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur gcc-git.orig/libgcc/config.host gcc-git/libgcc/config.host
---- gcc-git.orig/libgcc/config.host 2015-10-23 21:12:52.000000000 +0200
-+++ gcc-git/libgcc/config.host 2015-11-15 21:17:38.385745887 +0100
-@@ -231,7 +231,7 @@
- esac
- ;;
- *-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu | *-*-gnu* | *-*-kopensolaris*-gnu)
-- tmake_file="$tmake_file t-crtstuff-pic t-libgcc-pic t-eh-dw2-dip t-slibgcc t-slibgcc-gld t-slibgcc-elf-ver t-linux"
-+ tmake_file="$tmake_file t-crtstuff-pic t-libgcc-pic t-slibgcc t-slibgcc-gld t-slibgcc-elf-ver t-linux"
- extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
- if test x$enable_vtable_verify = xyes; then
- extra_parts="$extra_parts vtv_start.o vtv_end.o vtv_start_preinit.o vtv_end_preinit.o"
--
cgit v1.2.3