From 8457bae2cde1144a5bfd77088c29437e88db530b Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Wed, 8 May 2019 01:59:18 +0200
Subject: [PATCH] Code cleanup

---
 doc/cross-gcc.sh | 96 ++++++++++++++++++++++++++----------------------
 1 file changed, 53 insertions(+), 43 deletions(-)

diff --git a/doc/cross-gcc.sh b/doc/cross-gcc.sh
index 5554131..5f4eac2 100644
--- a/doc/cross-gcc.sh
+++ b/doc/cross-gcc.sh
@@ -43,51 +43,61 @@ WGET="wget"
 
 
 #functions
-#main
+#binutils
+_binutils()
+{
+	#Download binutils
+	[ -f "binutils-$BINUTILS_VERSION.tar.$GZEXT" ] ||
+		$WGET "$MIRROR/binutils/binutils-$BINUTILS_VERSION.tar.$GZEXT"
 
+	#Extract, configure, and build binutils in a dedicated tree
+	[ -d "binutils-$BINUTILS_VERSION" ] ||
+		$TAR xzvf "binutils-$BINUTILS_VERSION.tar.$GZEXT"
+	case "$TARGET" in
+		aarch64-elf|amd64-elf|sparc64-elf)
+			BINUTILS_FLAGS="$BINUTILS_FLAGS --enable-multilib"
+			;;
+	esac
+	$MKDIR "binutils-$TARGET"
+	(cd "binutils-$TARGET" && "../binutils-$BINUTILS_VERSION/configure" \
+		--target="$TARGET" --prefix="$PREFIX" --with-sysroot --disable-nls \
+		--disable-werror $BINUTILS_FLAGS)
+	for target in $BINUTILS_TARGETS; do
+		(cd "binutils-$TARGET" && $MAKE "$target")
+	done
+}
+
+#gcc
+_gcc()
+{
+	#Download GCC
+	[ -f "gcc-$GCC_VERSION.tar.$GZEXT" ] ||
+		$WGET "$MIRROR/gcc/gcc-$GCC_VERSION/gcc-$GCC_VERSION.tar.$GZEXT"
+
+	#Extract, configure, and build GCC in a dedicated tree
+	[ -d "gcc-$GCC_VERSION" ] ||
+		$TAR xzvf "gcc-$GCC_VERSION.tar.$GZEXT"
+	case "$TARGET" in
+		aarch64-elf)
+			GCC_FLAGS="$GCC_FLAGS --with-multilib-list=lp64,ilp32"
+			;;
+		amd64-elf|sparc64-elf)
+			GCC_FLAGS="$GCC_FLAGS --with-multilib-list=m64,m32"
+			;;
+	esac
+	$MKDIR "gcc-$TARGET"
+	(cd "gcc-$TARGET" && "../gcc-$GCC_VERSION/configure" --target="$TARGET" \
+		--prefix="$PREFIX" --disable-nls --enable-languages=c,c++ \
+		--without-headers $GCC_FLAGS)
+	for target in $GCC_TARGETS; do
+		(cd "gcc-$TARGET" && $MAKE "$target")
+	done
+}
+
+#main
 #Modify the environment to reflect the port chosen
 PREFIX="$HOME/opt/cross-gcc-$TARGET"
 PATH="$PREFIX/bin:$PATH"
 
-#Download binutils
-[ -f "binutils-$BINUTILS_VERSION.tar.$GZEXT" ] ||
-	$WGET "$MIRROR/binutils/binutils-$BINUTILS_VERSION.tar.$GZEXT"
-
-#Extract, configure, and build binutils in a dedicated tree
-[ -d "binutils-$BINUTILS_VERSION" ] ||
-	$TAR xzvf "binutils-$BINUTILS_VERSION.tar.$GZEXT"
-case "$TARGET" in
-	aarch64-elf|amd64-elf|sparc64-elf)
-		BINUTILS_FLAGS="$BINUTILS_FLAGS --enable-multilib"
-		;;
-esac
-$MKDIR "binutils-$TARGET"
-(cd "binutils-$TARGET" && "../binutils-$BINUTILS_VERSION/configure" \
-	--target="$TARGET" --prefix="$PREFIX" --with-sysroot --disable-nls \
-	--disable-werror $BINUTILS_FLAGS)
-for target in $BINUTILS_TARGETS; do
-	(cd "binutils-$TARGET" && $MAKE "$target")
-done
-
-#Download GCC
-[ -f "gcc-$GCC_VERSION.tar.$GZEXT" ] ||
-	$WGET "$MIRROR/gcc/gcc-$GCC_VERSION/gcc-$GCC_VERSION.tar.$GZEXT"
-
-#Extract, configure, and build GCC in a dedicated tree
-[ -d "gcc-$GCC_VERSION" ] ||
-	$TAR xzvf "gcc-$GCC_VERSION.tar.$GZEXT"
-case "$TARGET" in
-	aarch64-elf)
-		GCC_FLAGS="$GCC_FLAGS --with-multilib-list=lp64,ilp32"
-		;;
-	amd64-elf|sparc64-elf)
-		GCC_FLAGS="$GCC_FLAGS --with-multilib-list=m64,m32"
-		;;
-esac
-$MKDIR "gcc-$TARGET"
-(cd "gcc-$TARGET" && "../gcc-$GCC_VERSION/configure" --target="$TARGET" \
-	--prefix="$PREFIX" --disable-nls --enable-languages=c,c++ \
-	--without-headers $GCC_FLAGS)
-for target in $GCC_TARGETS; do
-	(cd "gcc-$TARGET" && $MAKE "$target")
-done
+_binutils &&
+_gcc