From 8f7c42d4913493b31a00e640f51c1a130d91d648 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 27 May 2010 20:34:15 -0700 Subject: [PATCH] * configure.in: Simplify some of the $canonical tests. --- ChangeLog | 4 ++++ configure.in | 14 +++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0e82d3a521c..43fb5ca1b57 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-05-28 Glenn Morris + + * configure.in: Simplify some of the $canonical tests. + 2010-05-27 Glenn Morris * config.bat: Do not preprocess src/Makefile.in. diff --git a/configure.in b/configure.in index 9d301367b09..0953cc8d413 100644 --- a/configure.in +++ b/configure.in @@ -369,7 +369,7 @@ dnl quotation begins ### the appropriate operating system and machine description files. ### You would hope that you could choose an m/*.h file pretty much -### based on the machine portion of the configuration name, and an s- +### based on the machine portion of the configuration name, and an s/*.h ### file based on the operating system portion. However, it turns out ### that each m/*.h file is pretty manufacturer-specific - for ### example mips.h is MIPS @@ -381,10 +381,6 @@ dnl quotation begins ### /etc/MACHINES doesn't say anything about version numbers, be ### prepared to handle anything reasonably. If version numbers ### matter, be sure /etc/MACHINES says something about it. -### -### Eric Raymond says we should accept strings like "sysvr4" to mean -### "System V Release 4"; he writes, "The old convention encouraged -### confusion between `system' and `release' levels'." machine='' opsys='' unported=no case "${canonical}" in @@ -499,16 +495,16 @@ case "${canonical}" in s390x-*-linux-gnu* ) machine=ibms390x opsys=gnu-linux ;; - rs6000-ibm-aix4.2* | powerpc-ibm-aix4.2* ) + rs6000-ibm-aix4.[23]* ) machine=ibmrs6000 opsys=aix4-2 ;; - rs6000-ibm-aix4.3* | powerpc-ibm-aix4.3* ) + powerpc-ibm-aix4.[23]* ) machine=ibmrs6000 opsys=aix4-2 ;; - rs6000-ibm-aix5* | powerpc-ibm-aix5* ) + rs6000-ibm-aix[56]* ) machine=ibmrs6000 opsys=aix4-2 ;; - rs6000-ibm-aix6* | powerpc-ibm-aix6* ) + powerpc-ibm-aix[56]* ) machine=ibmrs6000 opsys=aix4-2 ;; -- 2.39.2