diff mbox

powerpc: Automatically guess --with-cpu value

Message ID 569D1203.10106@linux.vnet.ibm.com
State New
Headers show

Commit Message

cseo Jan. 18, 2016, 4:25 p.m. UTC 
On 1/8/16 6:25 PM, Andreas Schwab wrote:
>
> sort -V isn't portable, you should use -n instead.
>
> Andreas.
>

Thanks for catching that. Corrected.

Comments

Andreas Schwab Jan. 18, 2016, 5:38 p.m. UTC | #1 
Carlos Eduardo Seo <cseo@linux.vnet.ibm.com> writes:

> +	  sed -n 's/^#define \(_ARCH_PWR[0-9].*\) .*$/\1/p' |
> +	  sort -nr | head -n 1`

Your sort key isn't numeric.

Andreas.
diff mbox

Patch

diff --git a/sysdeps/powerpc/preconfigure b/sysdeps/powerpc/preconfigure
index 0c6fdde..da3a5ce 100644
--- a/sysdeps/powerpc/preconfigure
+++ b/sysdeps/powerpc/preconfigure
@@ -15,3 +15,35 @@  powerpc*)
   rm -f conftest.i
   ;;
 esac
+
+# Lets ask the compiler which Power processor we've got, in case the user did
+# not choose a --with-cpu value.
+# Note if you add patterns here you must ensure that an appropriate directory
+# exists in sysdeps/powerpc
+if test -z "$with_cpu"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: --with-cpu not set. Trying to detect CPU." >&5
+    $as_echo "$as_me: --with-cpu not set. Trying to detect CPU." >&6;}
+  archcpu=`$CC $CFLAGS $CPPFLAGS -E -dM -xc /dev/null |
+	  sed -n 's/^#define \(_ARCH_PWR[0-9].*\) .*$/\1/p' |
+	  sort -nr | head -n 1`
+
+# Set --with-cpu as appropriate.
+  case "$archcpu" in
+  _ARCH_PWR5X)
+    submachine="power5+"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: CPU identified as $submachine" >&5
+      $as_echo "$as_me:  CPU identified as $submachine" >&6;}
+    ;;
+  _ARCH_PWR*)
+  submachine=`echo $archcpu | sed "s/_ARCH_PWR/power/" |
+	      tr '[:upper:]' '[:lower:]'`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: CPU identified as $submachine" >&5
+      $as_echo "$as_me:  CPU identified as $submachine" >&6;}
+    ;;
+  *)
+  submachine=""
+    { $as_echo "$as_me:${as_lineno-$LINENO}: CPU not identified; using default" >&5
+      $as_echo "$as_me:  CPU not identified; using default" >&6;}
+    ;;
+  esac
+fi