From b5b72b1e8cc2267e69af149f48b755b97627e74e Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 7 Jan 2018 23:10:12 +0100
Subject: binutils/gcc: cosmetic changes

---
 toolchain/gcc/Makefile     |  4 ++--
 toolchain/gcc/Makefile.inc | 42 +++++++++++++++++-------------------------
 2 files changed, 19 insertions(+), 27 deletions(-)

(limited to 'toolchain/gcc')

diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index b69cad2bd..eb21fc4fd 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -297,7 +297,7 @@ endif
 	touch $@
 
 $(GCC_BUILD_DIR_INITIAL)/.compiled: $(GCC_BUILD_DIR_INITIAL)/.configured
-ifeq ($(ADK_TOOLCHAIN_GCC_OLD),y)
+ifeq ($(ADK_TOOLCHAIN_GCC_METAG),y)
 	PATH='$(TARGET_PATH)' \
 		$(MAKE) ${GCC_MAKEOPTS} -C $(GCC_BUILD_DIR_INITIAL) all-gcc
 else
@@ -307,7 +307,7 @@ endif
 	touch $@
 
 $(WRKBUILD)/.configured: $(GCC_BUILD_DIR_INITIAL)/.compiled
-ifeq ($(ADK_TOOLCHAIN_GCC_OLD),y)
+ifeq ($(ADK_TOOLCHAIN_GCC_METAG),y)
 	PATH='$(TARGET_PATH)' \
 		$(MAKE) -C $(GCC_BUILD_DIR_INITIAL) install-gcc
 else
diff --git a/toolchain/gcc/Makefile.inc b/toolchain/gcc/Makefile.inc
index 3f1e4fda8..8c694cb30 100644
--- a/toolchain/gcc/Makefile.inc
+++ b/toolchain/gcc/Makefile.inc
@@ -18,13 +18,13 @@ PKG_RELEASE:=		1
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 LIBSTDCXXVER:=		22
 endif
-ifeq ($(ADK_TOOLCHAIN_GCC_4_9),y)
-PKG_VERSION:=		4.9.4
-PKG_HASH:=		1680f92781b92cbdb57d7e4f647c650678c594154cb0d707fd9a994424a9860d
+ifeq ($(ADK_TOOLCHAIN_GCC_AVR32),y)
+PKG_VERSION:=		4.4.7
+PKG_HASH:=		76ad7c433af1c798a1e116c4dfa8f5f794f0d32bff65f88c54dcd5e5d146fc32
 PKG_SITES:=		${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/}
 PKG_RELEASE:=		1
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
-LIBSTDCXXVER:=		20
+LIBSTDCXXVER:=		19
 endif
 ifeq ($(ADK_TOOLCHAIN_GCC_CSKY),y)
 PKG_VERSION:=		gcc-6-branch-csky
@@ -33,13 +33,13 @@ PKG_SITES:=		https://github.com/c-sky/gcc.git
 PKG_RELEASE:=		1
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
 endif
-ifeq ($(ADK_TOOLCHAIN_GCC_OR1K),y)
-PKG_VERSION:=		musl-5.4.0
-PKG_GIT:=		branch
-PKG_SITES:=		https://github.com/openrisc/or1k-gcc.git
+ifeq ($(ADK_TOOLCHAIN_GCC_METAG),y)
+PKG_VERSION:=		4.2.4
+PKG_HASH:=		7cb75c5183bd18f415860084440377016dc78feeee2852227b831f2e4fcaa5d6
+PKG_SITES:=		http://gcc.cybermirror.org/releases/gcc-${PKG_VERSION}/
 PKG_RELEASE:=		1
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
-LIBSTDCXXVER:=		21
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+LIBSTDCXXVER:=		19
 endif
 ifeq ($(ADK_TOOLCHAIN_GCC_NDS32),y)
 PKG_VERSION:=		4.9.4-nds32
@@ -48,25 +48,17 @@ PKG_SITES:=		http://distfiles.openadk.org/
 PKG_RELEASE:=		1
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
 endif
-ifeq ($(ADK_TOOLCHAIN_GCC_4_4),y)
-PKG_VERSION:=		4.4.7
-PKG_HASH:=		76ad7c433af1c798a1e116c4dfa8f5f794f0d32bff65f88c54dcd5e5d146fc32
-PKG_SITES:=		${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/}
-PKG_RELEASE:=		1
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
-LIBSTDCXXVER:=		19
-endif
-ifeq ($(ADK_TOOLCHAIN_GCC_4_2),y)
-PKG_VERSION:=		4.2.4
-PKG_HASH:=		7cb75c5183bd18f415860084440377016dc78feeee2852227b831f2e4fcaa5d6
-PKG_SITES:=		http://gcc.cybermirror.org/releases/gcc-${PKG_VERSION}/
+ifeq ($(ADK_TOOLCHAIN_GCC_OR1K),y)
+PKG_VERSION:=		musl-5.4.0
+PKG_GIT:=		branch
+PKG_SITES:=		https://github.com/openrisc/or1k-gcc.git
 PKG_RELEASE:=		1
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
-LIBSTDCXXVER:=		19
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
+LIBSTDCXXVER:=		21
 endif
 ifeq ($(ADK_TOOLCHAIN_GCC_GIT),y)
 PKG_VERSION:=		git
 PKG_SITES:=		https://github.com/gcc-mirror/gcc.git
 PKG_RELEASE:=		1
-LIBSTDCXXVER:=		21
+LIBSTDCXXVER:=		23
 endif
-- 
cgit v1.2.3