[PATCH] D30290: [libcxx][zorg] Fix no-exceptions builder configurations

2017-02-23 Thread Asiri Rathnayake via Phabricator via cfe-commits 
rmaprath marked an inline comment as done.
rmaprath added a comment.

Thanks!

Committed as r295963.

@gkistanova: Could you please let me know when the next restart is due? I would 
like to keep an eye on the builders.

Cheers,

/ Asiri


Repository:
  rL LLVM

https://reviews.llvm.org/D30290



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D30290: [libcxx][zorg] Fix no-exceptions builder configurations

2017-02-23 Thread Phabricator via Phabricator via cfe-commits 
This revision was automatically updated to reflect the committed changes.
Closed by commit rL295963: [zorg] Fix no-exceptions libcxx configurations 
(authored by asiri).

Changed prior to commit:
  https://reviews.llvm.org/D30290?vs=89485=89496#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D30290

Files:
  zorg/trunk/buildbot/osuosl/master/config/builders.py


Index: zorg/trunk/buildbot/osuosl/master/config/builders.py
===
--- zorg/trunk/buildbot/osuosl/master/config/builders.py
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py
@@ -1044,7 +1044,8 @@
  'builddir': 'libcxx-libcxxabi-x86_64-linux-debian-noexceptions',
  'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
  env={'CC': 'clang', 'CXX': 'clang++'},
- cmake_extra_opts={'LIBCXX_ENABLE_EXCEPTIONS': 'OFF'},
+ cmake_extra_opts={'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
+   'LIBCXXABI_ENABLE_EXCEPTIONS': 'OFF'},
  lit_extra_args=['--shuffle']),
  'category': 'libcxx'},
 
@@ -1194,6 +1195,7 @@
 lit_extra_opts={'link_flags': '"-lc++abi -lc -lm -lpthread 
-lunwind -ldl -L/opt/llvm/lib/clang/3.9.0/lib/linux 
-lclang_rt.builtins-armhf"'},
 cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
   'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
+  'LIBCXXABI_ENABLE_EXCEPTIONS': 'OFF',
   'CMAKE_C_FLAGS': '-mcpu=cortex-a15 -mthumb',
   'CMAKE_CXX_FLAGS': '-mcpu=cortex-a15 -mthumb',
   'LLVM_PARALLEL_LINK_JOBS': '2'})},
@@ -1224,6 +1226,7 @@
 lit_extra_opts={'link_flags': '"-lc++abi -lc -lm -lpthread 
-lunwind -ldl -L/opt/llvm/lib/clang/3.9.0/lib/linux 
-lclang_rt.builtins-aarch64"'},
 cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
   'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
+  'LIBCXXABI_ENABLE_EXCEPTIONS': 'OFF',
   'LLVM_PARALLEL_LINK_JOBS': '4'})},
 
 ]


Index: zorg/trunk/buildbot/osuosl/master/config/builders.py
===
--- zorg/trunk/buildbot/osuosl/master/config/builders.py
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py
@@ -1044,7 +1044,8 @@
  'builddir': 'libcxx-libcxxabi-x86_64-linux-debian-noexceptions',
  'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
  env={'CC': 'clang', 'CXX': 'clang++'},
- cmake_extra_opts={'LIBCXX_ENABLE_EXCEPTIONS': 'OFF'},
+ cmake_extra_opts={'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
+   'LIBCXXABI_ENABLE_EXCEPTIONS': 'OFF'},
  lit_extra_args=['--shuffle']),
  'category': 'libcxx'},
 
@@ -1194,6 +1195,7 @@
 lit_extra_opts={'link_flags': '"-lc++abi -lc -lm -lpthread -lunwind -ldl -L/opt/llvm/lib/clang/3.9.0/lib/linux -lclang_rt.builtins-armhf"'},
 cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
   'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
+  'LIBCXXABI_ENABLE_EXCEPTIONS': 'OFF',
   'CMAKE_C_FLAGS': '-mcpu=cortex-a15 -mthumb',
   'CMAKE_CXX_FLAGS': '-mcpu=cortex-a15 -mthumb',
   'LLVM_PARALLEL_LINK_JOBS': '2'})},
@@ -1224,6 +1226,7 @@
 lit_extra_opts={'link_flags': '"-lc++abi -lc -lm -lpthread -lunwind -ldl -L/opt/llvm/lib/clang/3.9.0/lib/linux -lclang_rt.builtins-aarch64"'},
 cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
   'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
+  'LIBCXXABI_ENABLE_EXCEPTIONS': 'OFF',
   'LLVM_PARALLEL_LINK_JOBS': '4'})},
 
 ]
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D30290: [libcxx][zorg] Fix no-exceptions builder configurations

2017-02-23 Thread Renato Golin via Phabricator via cfe-commits 
rengolin accepted this revision.
rengolin added a comment.
This revision is now accepted and ready to land.

LGTM, thanks!

I'll add a local task to look into that, but with Connect coming, I'm not sure 
how long that will take. :)


https://reviews.llvm.org/D30290



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D30290: [libcxx][zorg] Fix no-exceptions builder configurations

2017-02-23 Thread Asiri Rathnayake via Phabricator via cfe-commits 
rmaprath marked an inline comment as done.
rmaprath added inline comments.



Comment at: buildbot/osuosl/master/config/builders.py:1196
+lit_extra_opts={'link_flags': '"-lc++abi -lc -lm -lpthread -ldl 
-L/opt/llvm/lib/clang/3.9.0/lib/linux -lclang_rt.builtins-armhf"'},
+cmake_extra_opts={'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
+  'LIBCXXABI_ENABLE_EXCEPTIONS': 'OFF',

rengolin wrote:
> rmaprath wrote:
> > rengolin wrote:
> > > Why remove the unwinder?
> > The unwinder should not be required for the no-exceptions library testing, 
> > as these libraries do not throw/catch any exceptions.
> > 
> > / Asiri
> But the requirement is not only to test it, but to make them work. We had 
> trouble making the bot pass without the unwinder, due to dependencies.
> 
> Regardless, this is a *different* change and should be made later, with 
> proper research. For now, just add the new flag, please.
If you have a time (heh!), please do try out without the unwinder and see if it 
still works fine. I'll be quite interested if it doesn't.

Downstream we have even more stricter tests to make sure there are no exception 
tables in the final binaries, but this require special linker options. It would 
be good to make sure that we can at least do without the unwinder upstream :)


https://reviews.llvm.org/D30290



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D30290: [libcxx][zorg] Fix no-exceptions builder configurations

2017-02-23 Thread Asiri Rathnayake via Phabricator via cfe-commits 
rmaprath updated this revision to Diff 89485.
rmaprath added a comment.

Updated to address comments from @rengolin.

In theory, it should not be necessary to link-in or enable the unwinder for 
these tests. However, it is best to leave this for a separate patch (after some 
local testing), just to make sure that none of those other libraries attempt to 
reference symbols from the unwinder (they should not, but who knows...).


https://reviews.llvm.org/D30290

Files:
  buildbot/osuosl/master/config/builders.py


Index: buildbot/osuosl/master/config/builders.py
===
--- buildbot/osuosl/master/config/builders.py
+++ buildbot/osuosl/master/config/builders.py
@@ -1044,7 +1044,8 @@
  'builddir': 'libcxx-libcxxabi-x86_64-linux-debian-noexceptions',
  'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
  env={'CC': 'clang', 'CXX': 'clang++'},
- cmake_extra_opts={'LIBCXX_ENABLE_EXCEPTIONS': 'OFF'},
+ cmake_extra_opts={'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
+   'LIBCXXABI_ENABLE_EXCEPTIONS': 'OFF'},
  lit_extra_args=['--shuffle']),
  'category': 'libcxx'},
 
@@ -1194,6 +1195,7 @@
 lit_extra_opts={'link_flags': '"-lc++abi -lc -lm -lpthread 
-lunwind -ldl -L/opt/llvm/lib/clang/3.9.0/lib/linux 
-lclang_rt.builtins-armhf"'},
 cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
   'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
+  'LIBCXXABI_ENABLE_EXCEPTIONS': 'OFF',
   'CMAKE_C_FLAGS': '-mcpu=cortex-a15 -mthumb',
   'CMAKE_CXX_FLAGS': '-mcpu=cortex-a15 -mthumb',
   'LLVM_PARALLEL_LINK_JOBS': '2'})},
@@ -1224,6 +1226,7 @@
 lit_extra_opts={'link_flags': '"-lc++abi -lc -lm -lpthread 
-lunwind -ldl -L/opt/llvm/lib/clang/3.9.0/lib/linux 
-lclang_rt.builtins-aarch64"'},
 cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
   'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
+  'LIBCXXABI_ENABLE_EXCEPTIONS': 'OFF',
   'LLVM_PARALLEL_LINK_JOBS': '4'})},
 
 ]


Index: buildbot/osuosl/master/config/builders.py
===
--- buildbot/osuosl/master/config/builders.py
+++ buildbot/osuosl/master/config/builders.py
@@ -1044,7 +1044,8 @@
  'builddir': 'libcxx-libcxxabi-x86_64-linux-debian-noexceptions',
  'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
  env={'CC': 'clang', 'CXX': 'clang++'},
- cmake_extra_opts={'LIBCXX_ENABLE_EXCEPTIONS': 'OFF'},
+ cmake_extra_opts={'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
+   'LIBCXXABI_ENABLE_EXCEPTIONS': 'OFF'},
  lit_extra_args=['--shuffle']),
  'category': 'libcxx'},
 
@@ -1194,6 +1195,7 @@
 lit_extra_opts={'link_flags': '"-lc++abi -lc -lm -lpthread -lunwind -ldl -L/opt/llvm/lib/clang/3.9.0/lib/linux -lclang_rt.builtins-armhf"'},
 cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
   'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
+  'LIBCXXABI_ENABLE_EXCEPTIONS': 'OFF',
   'CMAKE_C_FLAGS': '-mcpu=cortex-a15 -mthumb',
   'CMAKE_CXX_FLAGS': '-mcpu=cortex-a15 -mthumb',
   'LLVM_PARALLEL_LINK_JOBS': '2'})},
@@ -1224,6 +1226,7 @@
 lit_extra_opts={'link_flags': '"-lc++abi -lc -lm -lpthread -lunwind -ldl -L/opt/llvm/lib/clang/3.9.0/lib/linux -lclang_rt.builtins-aarch64"'},
 cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
   'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
+  'LIBCXXABI_ENABLE_EXCEPTIONS': 'OFF',
   'LLVM_PARALLEL_LINK_JOBS': '4'})},
 
 ]
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D30290: [libcxx][zorg] Fix no-exceptions builder configurations

2017-02-23 Thread Renato Golin via Phabricator via cfe-commits 
rengolin added inline comments.



Comment at: buildbot/osuosl/master/config/builders.py:1196
+lit_extra_opts={'link_flags': '"-lc++abi -lc -lm -lpthread -ldl 
-L/opt/llvm/lib/clang/3.9.0/lib/linux -lclang_rt.builtins-armhf"'},
+cmake_extra_opts={'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
+  'LIBCXXABI_ENABLE_EXCEPTIONS': 'OFF',

rmaprath wrote:
> rengolin wrote:
> > Why remove the unwinder?
> The unwinder should not be required for the no-exceptions library testing, as 
> these libraries do not throw/catch any exceptions.
> 
> / Asiri
But the requirement is not only to test it, but to make them work. We had 
trouble making the bot pass without the unwinder, due to dependencies.

Regardless, this is a *different* change and should be made later, with proper 
research. For now, just add the new flag, please.


https://reviews.llvm.org/D30290



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D30290: [libcxx][zorg] Fix no-exceptions builder configurations

2017-02-23 Thread Asiri Rathnayake via Phabricator via cfe-commits 
rmaprath added inline comments.



Comment at: buildbot/osuosl/master/config/builders.py:1196
+lit_extra_opts={'link_flags': '"-lc++abi -lc -lm -lpthread -ldl 
-L/opt/llvm/lib/clang/3.9.0/lib/linux -lclang_rt.builtins-armhf"'},
+cmake_extra_opts={'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
+  'LIBCXXABI_ENABLE_EXCEPTIONS': 'OFF',

rengolin wrote:
> Why remove the unwinder?
The unwinder should not be required for the no-exceptions library testing, as 
these libraries do not throw/catch any exceptions.

/ Asiri


https://reviews.llvm.org/D30290



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D30290: [libcxx][zorg] Fix no-exceptions builder configurations

2017-02-23 Thread Renato Golin via Phabricator via cfe-commits 
rengolin added inline comments.



Comment at: buildbot/osuosl/master/config/builders.py:1196
+lit_extra_opts={'link_flags': '"-lc++abi -lc -lm -lpthread -ldl 
-L/opt/llvm/lib/clang/3.9.0/lib/linux -lclang_rt.builtins-armhf"'},
+cmake_extra_opts={'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
+  'LIBCXXABI_ENABLE_EXCEPTIONS': 'OFF',

Why remove the unwinder?


https://reviews.llvm.org/D30290



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D30290: [libcxx][zorg] Fix no-exceptions builder configurations

2017-02-23 Thread Asiri Rathnayake via Phabricator via cfe-commits 
rmaprath created this revision.
Herald added a reviewer: EricWF.

The no-exceptions builders are missing the -DLIBCXXABI_ENABLE_EXCEPTIONS=OFF 
flag (without this, only the libc++ libraries will be built without exceptions 
support, libc++abi will still be built with exceptions support - this is not a 
meaningful configuration).

Also we should not need to link in libunwind for these configurations. 
No-exceptions libraries by definition should not require an unwinder.


https://reviews.llvm.org/D30290

Files:
  buildbot/osuosl/master/config/builders.py


Index: buildbot/osuosl/master/config/builders.py
===
--- buildbot/osuosl/master/config/builders.py
+++ buildbot/osuosl/master/config/builders.py
@@ -1044,7 +1044,8 @@
  'builddir': 'libcxx-libcxxabi-x86_64-linux-debian-noexceptions',
  'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
  env={'CC': 'clang', 'CXX': 'clang++'},
- cmake_extra_opts={'LIBCXX_ENABLE_EXCEPTIONS': 'OFF'},
+ cmake_extra_opts={'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
+   'LIBCXXABI_ENABLE_EXCEPTIONS': 'OFF'},
  lit_extra_args=['--shuffle']),
  'category': 'libcxx'},
 
@@ -1183,17 +1184,17 @@
   'CMAKE_CXX_FLAGS': '-mcpu=cortex-a15 -marm',
   'LLVM_PARALLEL_LINK_JOBS': '2'})},
 
-{'name': 'libcxx-libcxxabi-libunwind-arm-linux-noexceptions',
+{'name': 'libcxx-libcxxabi-arm-linux-noexceptions',
  'slavenames': ['linaro-tk1-01'],
- 'builddir': 'libcxx-libcxxabi-libunwind-arm-linux-noexceptions',
+ 'builddir': 'libcxx-libcxxabi-arm-linux-noexceptions',
  'category': 'libcxx',
  'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
 env={'CC': 'clang', 'CXX': 'clang++', 'PATH': 
'/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/llvm/bin'},
 # FIXME: there should be a way to merge autodetected with 
user-defined linker flags
 # See: libcxxabi/test/lit.cfg
-lit_extra_opts={'link_flags': '"-lc++abi -lc -lm -lpthread 
-lunwind -ldl -L/opt/llvm/lib/clang/3.9.0/lib/linux 
-lclang_rt.builtins-armhf"'},
-cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
-  'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
+lit_extra_opts={'link_flags': '"-lc++abi -lc -lm -lpthread -ldl 
-L/opt/llvm/lib/clang/3.9.0/lib/linux -lclang_rt.builtins-armhf"'},
+cmake_extra_opts={'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
+  'LIBCXXABI_ENABLE_EXCEPTIONS': 'OFF',
   'CMAKE_C_FLAGS': '-mcpu=cortex-a15 -mthumb',
   'CMAKE_CXX_FLAGS': '-mcpu=cortex-a15 -mthumb',
   'LLVM_PARALLEL_LINK_JOBS': '2'})},
@@ -1212,18 +1213,18 @@
 cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
   'LLVM_PARALLEL_LINK_JOBS': '4'})},
 
-{'name': 'libcxx-libcxxabi-libunwind-aarch64-linux-noexceptions',
+{'name': 'libcxx-libcxxabi-aarch64-linux-noexceptions',
  'slavenames': ['linaro-apm-03'],
- 'builddir': 'libcxx-libcxxabi-libunwind-aarch64-linux-noexceptions',
+ 'builddir': 'libcxx-libcxxabi-aarch64-linux-noexceptions',
  'category': 'libcxx',
  'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
 # FIXME: CFLAGS / CXXFLAGS are here because cmake_extra_opts 
doesn't quote correctly
 env={'CC': 'clang', 'CXX': 'clang++', 'CFLAGS': 
'-mcpu=cortex-a57', 'CXXFLAGS': '-mcpu=cortex-a57'},
 # FIXME: there should be a way to merge autodetected with 
user-defined linker flags
 # See: libcxxabi/test/lit.cfg
-lit_extra_opts={'link_flags': '"-lc++abi -lc -lm -lpthread 
-lunwind -ldl -L/opt/llvm/lib/clang/3.9.0/lib/linux 
-lclang_rt.builtins-aarch64"'},
-cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
-  'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
+lit_extra_opts={'link_flags': '"-lc++abi -lc -lm -lpthread -ldl 
-L/opt/llvm/lib/clang/3.9.0/lib/linux -lclang_rt.builtins-aarch64"'},
+cmake_extra_opts={'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
+  'LIBCXXABI_ENABLE_EXCEPTIONS': 'OFF',
   'LLVM_PARALLEL_LINK_JOBS': '4'})},
 
 ]


Index: buildbot/osuosl/master/config/builders.py
===
--- buildbot/osuosl/master/config/builders.py
+++ buildbot/osuosl/master/config/builders.py
@@ -1044,7 +1044,8 @@
  'builddir': 'libcxx-libcxxabi-x86_64-linux-debian-noexceptions',
  'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
  env={'CC': 'clang', 'CXX': 'clang++'},
-