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

bcall pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
     new 406bfd3  Detect whether we need -latomic or not. Fix mips build
406bfd3 is described below

commit 406bfd3433dfb81ae86acfd1b240cd1e8ef9d0a7
Author: Jean Baptiste Favre <[email protected]>
AuthorDate: Sun Nov 18 22:56:55 2018 +0100

    Detect whether we need -latomic or not. Fix mips build
---
 build/atomic.m4 | 38 ++++++++++++++++++++++++++++++++++++++
 configure.ac    |  5 +++++
 2 files changed, 43 insertions(+)

diff --git a/build/atomic.m4 b/build/atomic.m4
new file mode 100644
index 0000000..266eb29
--- /dev/null
+++ b/build/atomic.m4
@@ -0,0 +1,38 @@
+dnl -------------------------------------------------------- -*- autoconf -*-
+dnl Licensed to the Apache Software Foundation (ASF) under one or more
+dnl contributor license agreements.  See the NOTICE file distributed with
+dnl this work for additional information regarding copyright ownership.
+dnl The ASF licenses this file to You under the Apache License, Version 2.0
+dnl (the "License"); you may not use this file except in compliance with
+dnl the License.  You may obtain a copy of the License at
+dnl
+dnl     http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing, software
+dnl distributed under the License is distributed on an "AS IS" BASIS,
+dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+dnl See the License for the specific language governing permissions and
+dnl limitations under the License.
+
+dnl -----------------------------------------------------------------
+dnl atomic.m4: Trafficserver's autoconf macros for testing atomic support
+dnl
+
+dnl
+dnl TS_CHECK_ATOMIC: try to figure out the need for -latomic
+dnl
+AC_DEFUN([TS_CHECK_ATOMIC], [
+  AC_COMPILE_IFELSE(
+    [AC_LANG_PROGRAM([[#include <stdint.h>]],
+                     [[uint64_t val = 0; __atomic_add_fetch(&val, 1, 
__ATOMIC_RELAXED);]])],   
+    [AC_DEFINE(HAVE_ATOMIC, 1, [Define to 1 if you have '__atomic' functions.])
+      AC_LINK_IFELSE(
+        [AC_LANG_PROGRAM([[#include <stdint.h>]],
+                         [[uint64_t val = 0; __atomic_add_fetch(&val, 1, 
__ATOMIC_RELAXED);]])],
+        [ATOMIC_LIBS=""],
+        [ATOMIC_LIBS="-latomic"]
+    )],
+    [ATOMIC_LIBS=""]
+  )
+  AC_SUBST([ATOMIC_LIBS])
+])
diff --git a/configure.ac b/configure.ac
index eb89e5c..5a8245d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1167,6 +1167,11 @@ CFLAGS="$__saved_CFLAGS"
 AC_SUBST([CURSES_LDFLAGS],[$curses_ldflags])
 
 #
+# Check for -latomic need (at least for mips arch)
+TS_CHECK_ATOMIC
+TS_ADDTO([LDFLAGS], [$ATOMIC_LIBS])
+
+#
 # Check for SSL presence and usability
 TS_CHECK_CRYPTO
 

Reply via email to