---
ChangeLog | 8 ++++++++
config.sub | 58 +++++++++++++++++++++++++++++-----------------------------
2 files changed, 37 insertions(+), 29 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e32c2c5..0655aad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2018-05-01 John Ericson <john.ericson@obsidian.systems>
+
+ * config.sub (os, maybe_os): Normalize indentation to match rest of
+ file
+ * Every indent level gets a tab
+ * Case patterns longer than a line get begin each line with
+ leading pipe.
+
2018-05-01 Ben Elliston <b...@gnu.org>
* config.sub (maybe_os): Reindent this block.
diff --git a/config.sub b/config.sub
index 6b0995d..678a9e6 100755
--- a/config.sub
+++ b/config.sub
@@ -114,29 +114,29 @@ esac
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
- nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
- linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* |
kfreebsd*-gnu* | \
- knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
- kopensolaris*-gnu* | cloudabi*-eabi* | \
- storm-chaos* | os2-emx* | rtmk-nova*)
- os=-$maybe_os
- basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
- ;;
- android-linux)
- os=-linux-android
- basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
- ;;
- *)
- basic_machine=`echo "$1" | sed 's/-[^-]*$//'`
- case $1 in
- *-*)
- os=`echo "$1" | sed 's/.*-/-/'`
- ;;
- *)
- os=
+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib*
\
+ | linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* |
kfreebsd*-gnu* \
+ | knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* \
+ | kopensolaris*-gnu* | cloudabi*-eabi* \
+ | storm-chaos* | os2-emx* | rtmk-nova*)
+ os=-$maybe_os
+ basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+ ;;
+ android-linux)
+ os=-linux-android
+ basic_machine=`echo "$1" | sed
's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+ ;;
+ *)
+ basic_machine=`echo "$1" | sed 's/-[^-]*$//'`
+ case $1 in
+ *-*)
+ os=`echo "$1" | sed 's/.*-/-/'`
+ ;;
+ *)
+ os=
+ ;;
+ esac
;;
- esac
- ;;
esac
### Let's recognize common machines as not being operating systems so
@@ -147,13 +147,13 @@ case $os in
-sun*os*)
# Prevent following clause from handling this invalid input.
;;
- -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
- -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
- -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
- -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
- -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
- -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis | -knuth | -cray | -microblaze*)
+ -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* \
+ | -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* \
+ | -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* \
+ | -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* \
+ | -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* \
+ | -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp \
+ | -apple | -axis | -knuth | -cray | -microblaze*)
os=
basic_machine=$1
;;
--
2.16.3
_______________________________________________
config-patches mailing list
config-patches@gnu.org
https://lists.gnu.org/mailman/listinfo/config-patches
