[commons-daemon] branch master updated: apsupport.m4: improve mips detect

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git


The following commit(s) were added to refs/heads/master by this push:
     new b0da5e7  apsupport.m4: improve mips detect
     new bf65dd4  Merge pull request #10 from wzssyqa/patch-1
b0da5e7 is described below

commit b0da5e75db292329ef644d656326607dbc44f1bd
Author: YunQiang Su <wz...@gmail.com>
AuthorDate: Tue Jun 4 12:53:28 2019 +0800

    apsupport.m4: improve mips detect
    
    For mips, we add some new CPU types: mipsisa64r6{,el}, mipsisa32r6{,el}.
    To add support of them and don't make the list too long,
    we detect mips*el and then mips*.
---
 src/native/unix/support/apsupport.m4 | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/native/unix/support/apsupport.m4 b/src/native/unix/support/apsupport.m4
index a7e5957..2d58d4a 100644
--- a/src/native/unix/support/apsupport.m4
+++ b/src/native/unix/support/apsupport.m4
@@ -116,7 +116,12 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
     LDCMD="/opt/C/bin/cc"
     HOST_CPU=osd
     ;;
-  mips | mipsn32 | mips64)
+  mips*el)
+    CFLAGS="$CFLAGS -DCPU=\\\"mipsel\\\""
+    supported_os="mipsel"
+    HOST_CPU=mipsel
+    ;;
+  mips*)
     CFLAGS="$CFLAGS -DCPU=\\\"mips\\\""
     supported_os="mips"
     HOST_CPU=mips
@@ -145,11 +150,6 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
     fi
     CFLAGS="$CFLAGS -DCPU=\\\"$HOST_CPU\\\" -DSO_EXT=\\\"sl\\\""
     ;;
-  mipsel | mipsn32el | mips64el)
-    CFLAGS="$CFLAGS -DCPU=\\\"mipsel\\\""
-    supported_os="mipsel"
-    HOST_CPU=mipsel
-    ;;
   ia64w)
     CFLAGS="$CFLAGS -DCPU=\\\"IA64W\\\" -DSO_EXT=\\\"so\\\""
     HOST_CPU=IA64W