commit d8a68728a077a8c5fc8ceae19f2866cdc8b70baf
author Michiharu Ariza <ariza@adobe.com> Fri Feb 15 14:48:10 2019 -0800
committer Michiharu Ariza <ariza@adobe.com> Fri Feb 15 14:48:10 2019 -0800
tree cd7020b09a95811e816f8a7fd0121c2728febaeb
parent 1cb1d5d7fb74e9f42dc8361dcdf669ed479d595d
parent 5c2bb1de8de31fecf0dae2ef905b896e42d39f1d

Merge branch 'master' into cff-more-arrayof-fixes

.circleci/config.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3272ed7..e3f8067 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,7 +7,7 @@
       xcode: "9.2.0"
     steps:
       - checkout
-      - run: HOMEBREW_NO_AUTO_UPDATE=1 brew install wget pkg-config libtool ragel freetype glib cairo
+      - run: HOMEBREW_NO_AUTO_UPDATE=1 brew install wget autoconf automake libtool pkg-config ragel freetype glib cairo
       - run: ./autogen.sh --with-freetype --with-glib --with-gobject --with-cairo
       - run: make -j4
       - run: make check || .ci/fail.sh
@@ -17,7 +17,7 @@
       xcode: "10.1.0"
     steps:
       - checkout
-      - run: HOMEBREW_NO_AUTO_UPDATE=1 brew install wget pkg-config libtool ragel freetype glib cairo
+      - run: HOMEBREW_NO_AUTO_UPDATE=1 brew install wget autoconf automake libtool pkg-config ragel freetype glib cairo
       - run: ./autogen.sh --with-freetype --with-glib --with-gobject --with-cairo
       - run: make -j4
       - run: make check || .ci/fail.sh
@@ -86,7 +86,7 @@
     steps:
       - checkout
       - run: apt update || true
-      - run: apt install -y wget ragel libfreetype6-dev libfontconfig1-dev libglib2.0-dev libcairo2-dev libicu-dev libgraphite2-dev python python-pip
+      - run: apt install -y wget autoconf automake libtool pkg-config ragel libfreetype6-dev libfontconfig1-dev libglib2.0-dev libcairo2-dev libicu-dev libgraphite2-dev python python-pip
       - run: pip install fonttools
       - run: wget http://download.savannah.gnu.org/releases/freetype/freetype-2.9.tar.bz2 && tar xf freetype-2.9.tar.bz2 && cd freetype-2.9 && ./autogen.sh && ./configure && make -j32 && cd ..
       - run: CFLAGS="-O3" CXXFLAGS="-O3" CC=clang CXX=clang++ ./autogen.sh --with-freetype --with-fontconfig --with-glib --with-cairo --with-icu --with-graphite2

src/hb-atomic.hh

diff --git a/src/hb-atomic.hh b/src/hb-atomic.hh
index 9321932..d98a960 100644
--- a/src/hb-atomic.hh
+++ b/src/hb-atomic.hh
@@ -184,7 +184,7 @@
 #endif
 
 
-#elif !defined(HB_NO_MT) && defined(_AIX) && defined(__IBMCPP__)
+#elif !defined(HB_NO_MT) && defined(_AIX) && (defined(__IBMCPP__) || defined(__ibmxl__))
 
 #include <builtins.h>