[Gmp-commit] /var/hg/gmp: 2 new changesets

[mercurial at gmplib.org]

details:   /var/hg/gmp/rev/5cc59b74d78f
changeset: 17028:5cc59b74d78f
user:      Torbjorn Granlund <torbjorng at google.com>
date:      Fri Jan 15 22:42:09 2016 +0100
description:
(s390): Don't assume /proc/cpuinfo exists.

details:   /var/hg/gmp/rev/7421da954a7b
changeset: 17029:7421da954a7b
user:      Torbjorn Granlund <torbjorng at google.com>
date:      Fri Jan 15 22:42:22 2016 +0100
description:
ChangeLog

diffstat:

 ChangeLog    |   8 ++++++++
 config.guess |  27 ++++++++++++++-------------
 2 files changed, 22 insertions(+), 13 deletions(-)

diffs (52 lines):

diff -r 9aa521f0e1e7 -r 7421da954a7b ChangeLog
--- a/ChangeLog	Wed Jan 13 20:52:57 2016 +0100
+++ b/ChangeLog	Fri Jan 15 22:42:22 2016 +0100
@@ -1,3 +1,11 @@
+2016-01-15  Torbjörn Granlund  <torbjorng at google.com>
+
+	* config.guess (s390): Don't assume /proc/cpuinfo exists.
+
+2016-01-13  Torbjörn Granlund  <torbjorng at google.com>
+
+	* config.guess: Reorder and generalise ppc code.
+
 2016-01-01 Marco Bodrato <bodrato at mail.dm.unipi.it>
 
 	* tests/cxx/clocale.c: Do not re-define localeconv for mingw.
diff -r 9aa521f0e1e7 -r 7421da954a7b config.guess
--- a/config.guess	Wed Jan 13 20:52:57 2016 +0100
+++ b/config.guess	Fri Jan 15 22:42:22 2016 +0100
@@ -1053,19 +1053,20 @@
   ;;
 
 s390*-*-*)
-  model=`grep "^processor 0: version =" /proc/cpuinfo | sed -e 's/.*machine = //'`
-  case $model in
-    2064 | 2066) zcpu="z900" ;;
-    2084 | 2086) zcpu="z990" ;;
-    2094 | 2096) zcpu="z9"   ;;
-    2097 | 2098) zcpu="z10"  ;;
-    2817 | 2818 | *) zcpu="z196" ;;
-  esac
-  case "$guess_full" in
-    s390x-*-*) exact_cpu=${zcpu}    ;;
-    s390-*-*)  exact_cpu=${zcpu}esa ;;
-  esac
-  ;;
+  if test -f /proc/cpuinfo; then
+    model=`grep "^processor 0: version =" /proc/cpuinfo | sed -e 's/.*machine = //'`
+    case $model in
+      2064 | 2066) zcpu="z900" ;;
+      2084 | 2086) zcpu="z990" ;;
+      2094 | 2096) zcpu="z9"   ;;
+      2097 | 2098) zcpu="z10"  ;;
+      2817 | 2818 | *) zcpu="z196" ;;
+    esac
+    case "$guess_full" in
+      s390x-*-*) exact_cpu=${zcpu}    ;;
+      s390-*-*)  exact_cpu=${zcpu}esa ;;
+    esac
+    ;;
 
 esac