Merge "Update clang-tools to ab/5685004" am: 84a5dee972
am: 93b49290de

Change-Id: Ib782b5632b7e348efcfec31a5e396d4f28464e9a
diff --git a/darwin-x86/bin/header-abi-diff b/darwin-x86/bin/header-abi-diff
index 62b0a76..b4c67a1 100755
--- a/darwin-x86/bin/header-abi-diff
+++ b/darwin-x86/bin/header-abi-diff
Binary files differ
diff --git a/darwin-x86/bin/header-abi-dumper b/darwin-x86/bin/header-abi-dumper
index 280bd26..825c228 100755
--- a/darwin-x86/bin/header-abi-dumper
+++ b/darwin-x86/bin/header-abi-dumper
Binary files differ
diff --git a/darwin-x86/bin/header-abi-linker b/darwin-x86/bin/header-abi-linker
index feb9e83..036f46c 100755
--- a/darwin-x86/bin/header-abi-linker
+++ b/darwin-x86/bin/header-abi-linker
Binary files differ
diff --git a/darwin-x86/bin/merge-abi-diff b/darwin-x86/bin/merge-abi-diff
index a8fe1d4..dfd6ae1 100755
--- a/darwin-x86/bin/merge-abi-diff
+++ b/darwin-x86/bin/merge-abi-diff
Binary files differ
diff --git a/darwin-x86/bin/versioner b/darwin-x86/bin/versioner
index a9f45b4..35b76f1 100755
--- a/darwin-x86/bin/versioner
+++ b/darwin-x86/bin/versioner
Binary files differ
diff --git a/darwin-x86/clang-headers b/darwin-x86/clang-headers
index c320a11..3522aa7 120000
--- a/darwin-x86/clang-headers
+++ b/darwin-x86/clang-headers
@@ -1 +1 @@
-lib64/clang/9.0.2/include
\ No newline at end of file
+lib64/clang/9.0.4/include
\ No newline at end of file
diff --git a/darwin-x86/lib64/clang/9.0.2/include/omp-tools.h b/darwin-x86/lib64/clang/9.0.2/include/omp-tools.h
deleted file mode 100644
index d04a2b7..0000000
--- a/darwin-x86/lib64/clang/9.0.2/include/omp-tools.h
+++ /dev/null
@@ -1,1082 +0,0 @@
-/*
- * include/50/omp-tools.h.var
- */
-
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef __OMPT__
-#define __OMPT__
-
-/*****************************************************************************
- * system include files
- *****************************************************************************/
-
-#include <stdint.h>
-#include <stddef.h>
-
-/*****************************************************************************
- * iteration macros
- *****************************************************************************/
-
-#define FOREACH_OMPT_INQUIRY_FN(macro)      \
-    macro (ompt_enumerate_states)           \
-    macro (ompt_enumerate_mutex_impls)      \
-                                            \
-    macro (ompt_set_callback)               \
-    macro (ompt_get_callback)               \
-                                            \
-    macro (ompt_get_state)                  \
-                                            \
-    macro (ompt_get_parallel_info)          \
-    macro (ompt_get_task_info)              \
-    macro (ompt_get_task_memory)            \
-    macro (ompt_get_thread_data)            \
-    macro (ompt_get_unique_id)              \
-    macro (ompt_finalize_tool)              \
-                                            \
-    macro(ompt_get_num_procs)               \
-    macro(ompt_get_num_places)              \
-    macro(ompt_get_place_proc_ids)          \
-    macro(ompt_get_place_num)               \
-    macro(ompt_get_partition_place_nums)    \
-    macro(ompt_get_proc_id)                 \
-                                            \
-    macro(ompt_get_target_info)             \
-    macro(ompt_get_num_devices)
-
-#define FOREACH_OMPT_STATE(macro)                                                                \
-                                                                                                \
-    /* first available state */                                                                 \
-    macro (ompt_state_undefined, 0x102)      /* undefined thread state */                        \
-                                                                                                \
-    /* work states (0..15) */                                                                   \
-    macro (ompt_state_work_serial, 0x000)    /* working outside parallel */                      \
-    macro (ompt_state_work_parallel, 0x001)  /* working within parallel */                       \
-    macro (ompt_state_work_reduction, 0x002) /* performing a reduction */                        \
-                                                                                                \
-    /* barrier wait states (16..31) */                                                          \
-    macro (ompt_state_wait_barrier, 0x010)   /* waiting at a barrier */                          \
-    macro (ompt_state_wait_barrier_implicit_parallel, 0x011)                                     \
-                                            /* implicit barrier at the end of parallel region */\
-    macro (ompt_state_wait_barrier_implicit_workshare, 0x012)                                    \
-                                            /* implicit barrier at the end of worksharing */    \
-    macro (ompt_state_wait_barrier_implicit, 0x013)  /* implicit barrier */                      \
-    macro (ompt_state_wait_barrier_explicit, 0x014)  /* explicit barrier */                      \
-                                                                                                \
-    /* task wait states (32..63) */                                                             \
-    macro (ompt_state_wait_taskwait, 0x020)  /* waiting at a taskwait */                         \
-    macro (ompt_state_wait_taskgroup, 0x021) /* waiting at a taskgroup */                        \
-                                                                                                \
-    /* mutex wait states (64..127) */                                                           \
-    macro (ompt_state_wait_mutex, 0x040)                                                         \
-    macro (ompt_state_wait_lock, 0x041)      /* waiting for lock */                              \
-    macro (ompt_state_wait_critical, 0x042)  /* waiting for critical */                          \
-    macro (ompt_state_wait_atomic, 0x043)    /* waiting for atomic */                            \
-    macro (ompt_state_wait_ordered, 0x044)   /* waiting for ordered */                           \
-                                                                                                \
-    /* target wait states (128..255) */                                                         \
-    macro (ompt_state_wait_target, 0x080)        /* waiting for target region */                 \
-    macro (ompt_state_wait_target_map, 0x081)    /* waiting for target data mapping operation */ \
-    macro (ompt_state_wait_target_update, 0x082) /* waiting for target update operation */       \
-                                                                                                \
-    /* misc (256..511) */                                                                       \
-    macro (ompt_state_idle, 0x100)           /* waiting for work */                              \
-    macro (ompt_state_overhead, 0x101)       /* overhead excluding wait states */                \
-                                                                                                \
-    /* implementation-specific states (512..) */
-
-
-#define FOREACH_KMP_MUTEX_IMPL(macro)                                                \
-    macro (kmp_mutex_impl_none, 0)         /* unknown implementation */              \
-    macro (kmp_mutex_impl_spin, 1)         /* based on spin */                       \
-    macro (kmp_mutex_impl_queuing, 2)      /* based on some fair policy */           \
-    macro (kmp_mutex_impl_speculative, 3)  /* based on HW-supported speculation */
-
-#define FOREACH_OMPT_EVENT(macro)                                                                                        \
-                                                                                                                         \
-    /*--- Mandatory Events ---*/                                                                                         \
-    macro (ompt_callback_thread_begin,      ompt_callback_thread_begin_t,       1) /* thread begin                    */ \
-    macro (ompt_callback_thread_end,        ompt_callback_thread_end_t,         2) /* thread end                      */ \
-                                                                                                                         \
-    macro (ompt_callback_parallel_begin,    ompt_callback_parallel_begin_t,     3) /* parallel begin                  */ \
-    macro (ompt_callback_parallel_end,      ompt_callback_parallel_end_t,       4) /* parallel end                    */ \
-                                                                                                                         \
-    macro (ompt_callback_task_create,       ompt_callback_task_create_t,        5) /* task begin                      */ \
-    macro (ompt_callback_task_schedule,     ompt_callback_task_schedule_t,      6) /* task schedule                   */ \
-    macro (ompt_callback_implicit_task,     ompt_callback_implicit_task_t,      7) /* implicit task                   */ \
-                                                                                                                         \
-    macro (ompt_callback_target,            ompt_callback_target_t,             8) /* target                          */ \
-    macro (ompt_callback_target_data_op,    ompt_callback_target_data_op_t,     9) /* target data op                  */ \
-    macro (ompt_callback_target_submit,     ompt_callback_target_submit_t,     10) /* target  submit                  */ \
-                                                                                                                         \
-    macro (ompt_callback_control_tool,      ompt_callback_control_tool_t,      11) /* control tool                    */ \
-                                                                                                                         \
-    macro (ompt_callback_device_initialize, ompt_callback_device_initialize_t, 12) /* device initialize               */ \
-    macro (ompt_callback_device_finalize,   ompt_callback_device_finalize_t,   13) /* device finalize                 */ \
-                                                                                                                         \
-    macro (ompt_callback_device_load,       ompt_callback_device_load_t,       14) /* device load                     */ \
-    macro (ompt_callback_device_unload,     ompt_callback_device_unload_t,     15) /* device unload                   */ \
-                                                                                                                         \
-    /* Optional Events */                                                                                                \
-    macro (ompt_callback_sync_region_wait,  ompt_callback_sync_region_t,       16) /* sync region wait begin or end   */ \
-                                                                                                                         \
-    macro (ompt_callback_mutex_released,    ompt_callback_mutex_t,             17) /* mutex released                  */ \
-                                                                                                                         \
-    macro (ompt_callback_dependences,       ompt_callback_dependences_t,       18) /* report task dependences         */ \
-    macro (ompt_callback_task_dependence,   ompt_callback_task_dependence_t,   19) /* report task dependence          */ \
-                                                                                                                         \
-    macro (ompt_callback_work,              ompt_callback_work_t,              20) /* task at work begin or end       */ \
-                                                                                                                         \
-    macro (ompt_callback_master,            ompt_callback_master_t,            21) /* task at master begin or end     */ \
-                                                                                                                         \
-    macro (ompt_callback_target_map,        ompt_callback_target_map_t,        22) /* target map                      */ \
-                                                                                                                         \
-    macro (ompt_callback_sync_region,       ompt_callback_sync_region_t,       23) /* sync region begin or end        */ \
-                                                                                                                         \
-    macro (ompt_callback_lock_init,         ompt_callback_mutex_acquire_t,     24) /* lock init                       */ \
-    macro (ompt_callback_lock_destroy,      ompt_callback_mutex_t,             25) /* lock destroy                    */ \
-                                                                                                                         \
-    macro (ompt_callback_mutex_acquire,     ompt_callback_mutex_acquire_t,     26) /* mutex acquire                   */ \
-    macro (ompt_callback_mutex_acquired,    ompt_callback_mutex_t,             27) /* mutex acquired                  */ \
-                                                                                                                         \
-    macro (ompt_callback_nest_lock,         ompt_callback_nest_lock_t,         28) /* nest lock                       */ \
-                                                                                                                         \
-    macro (ompt_callback_flush,             ompt_callback_flush_t,             29) /* after executing flush           */ \
-                                                                                                                         \
-    macro (ompt_callback_cancel,            ompt_callback_cancel_t,            30) /* cancel innermost binding region */ \
-                                                                                                                         \
-    macro (ompt_callback_reduction,         ompt_callback_sync_region_t,       31) /* reduction                       */ \
-                                                                                                                         \
-    macro (ompt_callback_dispatch,          ompt_callback_dispatch_t,          32) /* dispatch of work                */
-
-/*****************************************************************************
- * implementation specific types
- *****************************************************************************/
-
-typedef enum kmp_mutex_impl_t {
-#define kmp_mutex_impl_macro(impl, code) impl = code,
-    FOREACH_KMP_MUTEX_IMPL(kmp_mutex_impl_macro)
-#undef kmp_mutex_impl_macro
-} kmp_mutex_impl_t;
-
-/*****************************************************************************
- * definitions generated from spec
- *****************************************************************************/
-
-typedef enum ompt_callbacks_t {
-  ompt_callback_thread_begin             = 1,
-  ompt_callback_thread_end               = 2,
-  ompt_callback_parallel_begin           = 3,
-  ompt_callback_parallel_end             = 4,
-  ompt_callback_task_create              = 5,
-  ompt_callback_task_schedule            = 6,
-  ompt_callback_implicit_task            = 7,
-  ompt_callback_target                   = 8,
-  ompt_callback_target_data_op           = 9,
-  ompt_callback_target_submit            = 10,
-  ompt_callback_control_tool             = 11,
-  ompt_callback_device_initialize        = 12,
-  ompt_callback_device_finalize          = 13,
-  ompt_callback_device_load              = 14,
-  ompt_callback_device_unload            = 15,
-  ompt_callback_sync_region_wait         = 16,
-  ompt_callback_mutex_released           = 17,
-  ompt_callback_dependences              = 18,
-  ompt_callback_task_dependence          = 19,
-  ompt_callback_work                     = 20,
-  ompt_callback_master                   = 21,
-  ompt_callback_target_map               = 22,
-  ompt_callback_sync_region              = 23,
-  ompt_callback_lock_init                = 24,
-  ompt_callback_lock_destroy             = 25,
-  ompt_callback_mutex_acquire            = 26,
-  ompt_callback_mutex_acquired           = 27,
-  ompt_callback_nest_lock                = 28,
-  ompt_callback_flush                    = 29,
-  ompt_callback_cancel                   = 30,
-  ompt_callback_reduction                = 31,
-  ompt_callback_dispatch                 = 32
-} ompt_callbacks_t;
-
-typedef enum ompt_record_t {
-  ompt_record_ompt               = 1,
-  ompt_record_native             = 2,
-  ompt_record_invalid            = 3
-} ompt_record_t;
-
-typedef enum ompt_record_native_t {
-  ompt_record_native_info  = 1,
-  ompt_record_native_event = 2
-} ompt_record_native_t;
-
-typedef enum ompt_set_result_t {
-  ompt_set_error            = 0,
-  ompt_set_never            = 1,
-  ompt_set_impossible       = 2,
-  ompt_set_sometimes        = 3,
-  ompt_set_sometimes_paired = 4,
-  ompt_set_always           = 5
-} ompt_set_result_t;
-
-typedef uint64_t ompt_id_t;
-
-typedef uint64_t ompt_device_time_t;
-
-typedef uint64_t ompt_buffer_cursor_t;
-
-typedef enum ompt_thread_t {
-  ompt_thread_initial                 = 1,
-  ompt_thread_worker                  = 2,
-  ompt_thread_other                   = 3,
-  ompt_thread_unknown                 = 4
-} ompt_thread_t;
-
-typedef enum ompt_scope_endpoint_t {
-  ompt_scope_begin                    = 1,
-  ompt_scope_end                      = 2
-} ompt_scope_endpoint_t;
-
-typedef enum ompt_dispatch_t {
-  ompt_dispatch_iteration             = 1,
-  ompt_dispatch_section               = 2
-} ompt_dispatch_t;
-
-typedef enum ompt_sync_region_t {
-  ompt_sync_region_barrier                = 1,
-  ompt_sync_region_barrier_implicit       = 2,
-  ompt_sync_region_barrier_explicit       = 3,
-  ompt_sync_region_barrier_implementation = 4,
-  ompt_sync_region_taskwait               = 5,
-  ompt_sync_region_taskgroup              = 6,
-  ompt_sync_region_reduction              = 7
-} ompt_sync_region_t;
-
-typedef enum ompt_target_data_op_t {
-  ompt_target_data_alloc                = 1,
-  ompt_target_data_transfer_to_device   = 2,
-  ompt_target_data_transfer_from_device = 3,
-  ompt_target_data_delete               = 4,
-  ompt_target_data_associate            = 5,
-  ompt_target_data_disassociate         = 6
-} ompt_target_data_op_t;
-
-typedef enum ompt_work_t {
-  ompt_work_loop               = 1,
-  ompt_work_sections           = 2,
-  ompt_work_single_executor    = 3,
-  ompt_work_single_other       = 4,
-  ompt_work_workshare          = 5,
-  ompt_work_distribute         = 6,
-  ompt_work_taskloop           = 7
-} ompt_work_t;
-
-typedef enum ompt_mutex_t {
-  ompt_mutex_lock                     = 1,
-  ompt_mutex_test_lock                = 2,
-  ompt_mutex_nest_lock                = 3,
-  ompt_mutex_test_nest_lock           = 4,
-  ompt_mutex_critical                 = 5,
-  ompt_mutex_atomic                   = 6,
-  ompt_mutex_ordered                  = 7
-} ompt_mutex_t;
-
-typedef enum ompt_native_mon_flag_t {
-  ompt_native_data_motion_explicit    = 0x01,
-  ompt_native_data_motion_implicit    = 0x02,
-  ompt_native_kernel_invocation       = 0x04,
-  ompt_native_kernel_execution        = 0x08,
-  ompt_native_driver                  = 0x10,
-  ompt_native_runtime                 = 0x20,
-  ompt_native_overhead                = 0x40,
-  ompt_native_idleness                = 0x80
-} ompt_native_mon_flag_t;
-
-typedef enum ompt_task_flag_t {
-  ompt_task_initial                   = 0x00000001,
-  ompt_task_implicit                  = 0x00000002,
-  ompt_task_explicit                  = 0x00000004,
-  ompt_task_target                    = 0x00000008,
-  ompt_task_undeferred                = 0x08000000,
-  ompt_task_untied                    = 0x10000000,
-  ompt_task_final                     = 0x20000000,
-  ompt_task_mergeable                 = 0x40000000,
-  ompt_task_merged                    = 0x80000000
-} ompt_task_flag_t;
-
-typedef enum ompt_task_status_t {
-  ompt_task_complete      = 1,
-  ompt_task_yield         = 2,
-  ompt_task_cancel        = 3,
-  ompt_task_detach        = 4,
-  ompt_task_early_fulfill = 5,
-  ompt_task_late_fulfill  = 6,
-  ompt_task_switch        = 7
-} ompt_task_status_t;
-
-typedef enum ompt_target_t {
-  ompt_target                         = 1,
-  ompt_target_enter_data              = 2,
-  ompt_target_exit_data               = 3,
-  ompt_target_update                  = 4
-} ompt_target_t;
-
-typedef enum ompt_parallel_flag_t {
-  ompt_parallel_invoker_program = 0x00000001,
-  ompt_parallel_invoker_runtime = 0x00000002,
-  ompt_parallel_league          = 0x40000000,
-  ompt_parallel_team            = 0x80000000
-} ompt_parallel_flag_t;
-
-typedef enum ompt_target_map_flag_t {
-  ompt_target_map_flag_to             = 0x01,
-  ompt_target_map_flag_from           = 0x02,
-  ompt_target_map_flag_alloc          = 0x04,
-  ompt_target_map_flag_release        = 0x08,
-  ompt_target_map_flag_delete         = 0x10,
-  ompt_target_map_flag_implicit       = 0x20
-} ompt_target_map_flag_t;
-
-typedef enum ompt_dependence_type_t {
-  ompt_dependence_type_in              = 1,
-  ompt_dependence_type_out             = 2,
-  ompt_dependence_type_inout           = 3,
-  ompt_dependence_type_mutexinoutset   = 4,
-  ompt_dependence_type_source          = 5,
-  ompt_dependence_type_sink            = 6
-} ompt_dependence_type_t;
-
-typedef enum ompt_cancel_flag_t {
-  ompt_cancel_parallel       = 0x01,
-  ompt_cancel_sections       = 0x02,
-  ompt_cancel_loop           = 0x04,
-  ompt_cancel_taskgroup      = 0x08,
-  ompt_cancel_activated      = 0x10,
-  ompt_cancel_detected       = 0x20,
-  ompt_cancel_discarded_task = 0x40
-} ompt_cancel_flag_t;
-
-typedef uint64_t ompt_hwid_t;
-
-typedef uint64_t ompt_wait_id_t;
-
-typedef enum ompt_frame_flag_t {
-  ompt_frame_runtime        = 0x00,
-  ompt_frame_application    = 0x01,
-  ompt_frame_cfa            = 0x10,
-  ompt_frame_framepointer   = 0x20,
-  ompt_frame_stackaddress   = 0x30
-} ompt_frame_flag_t; 
-
-typedef enum ompt_state_t {
-  ompt_state_work_serial                      = 0x000,
-  ompt_state_work_parallel                    = 0x001,
-  ompt_state_work_reduction                   = 0x002,
-
-  ompt_state_wait_barrier                     = 0x010,
-  ompt_state_wait_barrier_implicit_parallel   = 0x011,
-  ompt_state_wait_barrier_implicit_workshare  = 0x012,
-  ompt_state_wait_barrier_implicit            = 0x013,
-  ompt_state_wait_barrier_explicit            = 0x014,
-
-  ompt_state_wait_taskwait                    = 0x020,
-  ompt_state_wait_taskgroup                   = 0x021,
-
-  ompt_state_wait_mutex                       = 0x040,
-  ompt_state_wait_lock                        = 0x041,
-  ompt_state_wait_critical                    = 0x042,
-  ompt_state_wait_atomic                      = 0x043,
-  ompt_state_wait_ordered                     = 0x044,
-
-  ompt_state_wait_target                      = 0x080,
-  ompt_state_wait_target_map                  = 0x081,
-  ompt_state_wait_target_update               = 0x082,
-
-  ompt_state_idle                             = 0x100,
-  ompt_state_overhead                         = 0x101,
-  ompt_state_undefined                        = 0x102
-} ompt_state_t;
-
-typedef uint64_t (*ompt_get_unique_id_t) (void);
-
-typedef uint64_t ompd_size_t;
-
-typedef uint64_t ompd_wait_id_t;
-
-typedef uint64_t ompd_addr_t;
-typedef int64_t  ompd_word_t;
-typedef uint64_t ompd_seg_t;
-
-typedef uint64_t ompd_device_t;
-
-typedef uint64_t ompd_thread_id_t;
-
-typedef enum ompd_scope_t {
-  ompd_scope_global = 1,
-  ompd_scope_address_space = 2,
-  ompd_scope_thread = 3,
-  ompd_scope_parallel = 4,
-  ompd_scope_implicit_task = 5,
-  ompd_scope_task = 6
-} ompd_scope_t;
-
-typedef uint64_t ompd_icv_id_t;
-
-typedef enum ompd_rc_t {
-  ompd_rc_ok = 0,
-  ompd_rc_unavailable = 1,
-  ompd_rc_stale_handle = 2,
-  ompd_rc_bad_input = 3,
-  ompd_rc_error = 4,
-  ompd_rc_unsupported = 5,
-  ompd_rc_needs_state_tracking = 6,
-  ompd_rc_incompatible = 7,
-  ompd_rc_device_read_error = 8,
-  ompd_rc_device_write_error = 9,
-  ompd_rc_nomem = 10,
-} ompd_rc_t;
-
-typedef void (*ompt_interface_fn_t) (void);
-
-typedef ompt_interface_fn_t (*ompt_function_lookup_t) (
-  const char *interface_function_name
-);
-
-typedef union ompt_data_t {
-  uint64_t value;
-  void *ptr;
-} ompt_data_t;
-
-typedef struct ompt_frame_t {
-  ompt_data_t exit_frame;
-  ompt_data_t enter_frame;
-  int exit_frame_flags;
-  int enter_frame_flags;
-} ompt_frame_t;
-
-typedef void (*ompt_callback_t) (void);
-
-typedef void ompt_device_t;
-
-typedef void ompt_buffer_t;
-
-typedef void (*ompt_callback_buffer_request_t) (
-  int device_num,
-  ompt_buffer_t **buffer,
-  size_t *bytes
-);
-
-typedef void (*ompt_callback_buffer_complete_t) (
-  int device_num,
-  ompt_buffer_t *buffer,
-  size_t bytes,
-  ompt_buffer_cursor_t begin,
-  int buffer_owned
-);
-
-typedef void (*ompt_finalize_t) (
-  ompt_data_t *tool_data
-);
-
-typedef int (*ompt_initialize_t) (
-  ompt_function_lookup_t lookup,
-  int initial_device_num,
-  ompt_data_t *tool_data
-);
-
-typedef struct ompt_start_tool_result_t {
-  ompt_initialize_t initialize;
-  ompt_finalize_t finalize;
-  ompt_data_t tool_data;
-} ompt_start_tool_result_t;
-
-typedef struct ompt_record_abstract_t {
-  ompt_record_native_t rclass;
-  const char *type;
-  ompt_device_time_t start_time;
-  ompt_device_time_t end_time;
-  ompt_hwid_t hwid;
-} ompt_record_abstract_t;
-
-typedef struct ompt_dependence_t {
-  ompt_data_t variable;
-  ompt_dependence_type_t dependence_type;
-} ompt_dependence_t;
-
-typedef int (*ompt_enumerate_states_t) (
-  int current_state,
-  int *next_state,
-  const char **next_state_name
-);
-
-typedef int (*ompt_enumerate_mutex_impls_t) (
-  int current_impl,
-  int *next_impl,
-  const char **next_impl_name
-);
-
-typedef ompt_set_result_t (*ompt_set_callback_t) (
-  ompt_callbacks_t event,
-  ompt_callback_t callback
-);
-
-typedef int (*ompt_get_callback_t) (
-  ompt_callbacks_t event,
-  ompt_callback_t *callback
-);
-
-typedef ompt_data_t *(*ompt_get_thread_data_t) (void);
-
-typedef int (*ompt_get_num_procs_t) (void);
-
-typedef int (*ompt_get_num_places_t) (void);
-
-typedef int (*ompt_get_place_proc_ids_t) (
-  int place_num,
-  int ids_size,
-  int *ids
-);
-
-typedef int (*ompt_get_place_num_t) (void);
-
-typedef int (*ompt_get_partition_place_nums_t) (
-  int place_nums_size,
-  int *place_nums
-);
-
-typedef int (*ompt_get_proc_id_t) (void);
-
-typedef int (*ompt_get_state_t) (
-  ompt_wait_id_t *wait_id
-);
-
-typedef int (*ompt_get_parallel_info_t) (
-  int ancestor_level,
-  ompt_data_t **parallel_data,
-  int *team_size
-);
-
-typedef int (*ompt_get_task_info_t) (
-  int ancestor_level,
-  int *flags,
-  ompt_data_t **task_data,
-  ompt_frame_t **task_frame,
-  ompt_data_t **parallel_data,
-  int *thread_num
-);
-
-typedef int (*ompt_get_task_memory_t)(
-  void **addr,
-  size_t *size,
-  int block
-);
-
-typedef int (*ompt_get_target_info_t) (
-  uint64_t *device_num,
-  ompt_id_t *target_id,
-  ompt_id_t *host_op_id
-);
-
-typedef int (*ompt_get_num_devices_t) (void);
-
-typedef void (*ompt_finalize_tool_t) (void);
-
-typedef int (*ompt_get_device_num_procs_t) (
-  ompt_device_t *device
-);
-
-typedef ompt_device_time_t (*ompt_get_device_time_t) (
-  ompt_device_t *device
-);
-
-typedef double (*ompt_translate_time_t) (
-  ompt_device_t *device,
-  ompt_device_time_t time
-);
-
-typedef ompt_set_result_t (*ompt_set_trace_ompt_t) (
-  ompt_device_t *device,
-  unsigned int enable,
-  unsigned int etype
-);
-
-typedef ompt_set_result_t (*ompt_set_trace_native_t) (
-  ompt_device_t *device,
-  int enable,
-  int flags
-);
-
-typedef int (*ompt_start_trace_t) (
-  ompt_device_t *device,
-  ompt_callback_buffer_request_t request,
-  ompt_callback_buffer_complete_t complete
-);
-
-typedef int (*ompt_pause_trace_t) (
-  ompt_device_t *device,
-  int begin_pause
-);
-
-typedef int (*ompt_flush_trace_t) (
-  ompt_device_t *device
-);
-
-typedef int (*ompt_stop_trace_t) (
-  ompt_device_t *device
-);
-
-typedef int (*ompt_advance_buffer_cursor_t) (
-  ompt_device_t *device,
-  ompt_buffer_t *buffer,
-  size_t size,
-  ompt_buffer_cursor_t current,
-  ompt_buffer_cursor_t *next
-);
-
-typedef ompt_record_t (*ompt_get_record_type_t) (
-  ompt_buffer_t *buffer,
-  ompt_buffer_cursor_t current
-);
-
-typedef void *(*ompt_get_record_native_t) (
-  ompt_buffer_t *buffer,
-  ompt_buffer_cursor_t current,
-  ompt_id_t *host_op_id
-);
-
-typedef ompt_record_abstract_t *
-(*ompt_get_record_abstract_t) (
-  void *native_record
-);
-
-typedef void (*ompt_callback_thread_begin_t) (
-  ompt_thread_t thread_type,
-  ompt_data_t *thread_data
-);
-
-typedef struct ompt_record_thread_begin_t {
-  ompt_thread_t thread_type;
-} ompt_record_thread_begin_t;
-
-typedef void (*ompt_callback_thread_end_t) (
-  ompt_data_t *thread_data
-);
-
-typedef void (*ompt_callback_parallel_begin_t) (
-  ompt_data_t *encountering_task_data,
-  const ompt_frame_t *encountering_task_frame,
-  ompt_data_t *parallel_data,
-  unsigned int requested_parallelism,
-  int flags,
-  const void *codeptr_ra
-);
-
-typedef struct ompt_record_parallel_begin_t {
-  ompt_id_t encountering_task_id;
-  ompt_id_t parallel_id;
-  unsigned int requested_parallelism;
-  int flags;
-  const void *codeptr_ra;
-} ompt_record_parallel_begin_t;
-
-typedef void (*ompt_callback_parallel_end_t) (
-  ompt_data_t *parallel_data,
-  ompt_data_t *encountering_task_data,
-  int flags,
-  const void *codeptr_ra
-);
-
-typedef struct ompt_record_parallel_end_t {
-  ompt_id_t parallel_id;
-  ompt_id_t encountering_task_id;
-  int flags;
-  const void *codeptr_ra;
-} ompt_record_parallel_end_t;
-
-typedef void (*ompt_callback_work_t) (
-  ompt_work_t wstype,
-  ompt_scope_endpoint_t endpoint,
-  ompt_data_t *parallel_data,
-  ompt_data_t *task_data,
-  uint64_t count,
-  const void *codeptr_ra
-);
-
-typedef struct ompt_record_work_t {
-  ompt_work_t wstype;
-  ompt_scope_endpoint_t endpoint;
-  ompt_id_t parallel_id;
-  ompt_id_t task_id;
-  uint64_t count;
-  const void *codeptr_ra;
-} ompt_record_work_t;
-
-typedef void (*ompt_callback_dispatch_t) (
-  ompt_data_t *parallel_data,
-  ompt_data_t *task_data,
-  ompt_dispatch_t kind,
-  ompt_data_t instance 
-);
-
-typedef struct ompt_record_dispatch_t {
-  ompt_id_t parallel_id;
-  ompt_id_t task_id;
-  ompt_dispatch_t kind;
-  ompt_data_t instance; 
-} ompt_record_dispatch_t;
-
-typedef void (*ompt_callback_task_create_t) (
-  ompt_data_t *encountering_task_data,
-  const ompt_frame_t *encountering_task_frame,
-  ompt_data_t *new_task_data,
-  int flags,
-  int has_dependences,
-  const void *codeptr_ra
-);
-
-typedef struct ompt_record_task_create_t {
-  ompt_id_t encountering_task_id;
-  ompt_id_t new_task_id;
-  int flags;
-  int has_dependences;
-  const void *codeptr_ra;
-} ompt_record_task_create_t;
-
-typedef void (*ompt_callback_dependences_t) (
-  ompt_data_t *task_data,
-  const ompt_dependence_t *deps,
-  int ndeps
-);
-
-typedef struct ompt_record_dependences_t {
-  ompt_id_t task_id;
-  ompt_dependence_t dep;
-  int ndeps;
-} ompt_record_dependences_t;
-
-typedef void (*ompt_callback_task_dependence_t) (
-  ompt_data_t *src_task_data,
-  ompt_data_t *sink_task_data
-);
-
-typedef struct ompt_record_task_dependence_t {
-  ompt_id_t src_task_id;
-  ompt_id_t sink_task_id;
-} ompt_record_task_dependence_t;
-
-typedef void (*ompt_callback_task_schedule_t) (
-  ompt_data_t *prior_task_data,
-  ompt_task_status_t prior_task_status,
-  ompt_data_t *next_task_data
-);
-
-typedef struct ompt_record_task_schedule_t {
-  ompt_id_t prior_task_id;
-  ompt_task_status_t prior_task_status;
-  ompt_id_t next_task_id;
-} ompt_record_task_schedule_t;
-
-typedef void (*ompt_callback_implicit_task_t) (
-  ompt_scope_endpoint_t endpoint,
-  ompt_data_t *parallel_data,
-  ompt_data_t *task_data,
-  unsigned int actual_parallelism,
-  unsigned int index,
-  int flags
-);
-
-typedef struct ompt_record_implicit_task_t {
-  ompt_scope_endpoint_t endpoint;
-  ompt_id_t parallel_id;
-  ompt_id_t task_id;
-  unsigned int actual_parallelism;
-  unsigned int index;
-  int flags;
-} ompt_record_implicit_task_t;
-
-typedef void (*ompt_callback_master_t) (
-  ompt_scope_endpoint_t endpoint,
-  ompt_data_t *parallel_data,
-  ompt_data_t *task_data,
-  const void *codeptr_ra
-);
-
-typedef struct ompt_record_master_t {
-  ompt_scope_endpoint_t endpoint;
-  ompt_id_t parallel_id;
-  ompt_id_t task_id;
-  const void *codeptr_ra;
-} ompt_record_master_t;
-
-typedef void (*ompt_callback_sync_region_t) (
-  ompt_sync_region_t kind,
-  ompt_scope_endpoint_t endpoint,
-  ompt_data_t *parallel_data,
-  ompt_data_t *task_data,
-  const void *codeptr_ra
-);
-
-typedef struct ompt_record_sync_region_t {
-  ompt_sync_region_t kind;
-  ompt_scope_endpoint_t endpoint;
-  ompt_id_t parallel_id;
-  ompt_id_t task_id;
-  const void *codeptr_ra;
-} ompt_record_sync_region_t;
-
-typedef void (*ompt_callback_mutex_acquire_t) (
-  ompt_mutex_t kind,
-  unsigned int hint,
-  unsigned int impl,
-  ompt_wait_id_t wait_id,
-  const void *codeptr_ra
-);
-
-typedef struct ompt_record_mutex_acquire_t {
-  ompt_mutex_t kind;
-  unsigned int hint;
-  unsigned int impl;
-  ompt_wait_id_t wait_id;
-  const void *codeptr_ra;
-} ompt_record_mutex_acquire_t;
-
-typedef void (*ompt_callback_mutex_t) (
-  ompt_mutex_t kind,
-  ompt_wait_id_t wait_id,
-  const void *codeptr_ra
-);
-
-typedef struct ompt_record_mutex_t {
-  ompt_mutex_t kind;
-  ompt_wait_id_t wait_id;
-  const void *codeptr_ra;
-} ompt_record_mutex_t;
-
-typedef void (*ompt_callback_nest_lock_t) (
-  ompt_scope_endpoint_t endpoint,
-  ompt_wait_id_t wait_id,
-  const void *codeptr_ra
-);
-
-typedef struct ompt_record_nest_lock_t {
-  ompt_scope_endpoint_t endpoint;
-  ompt_wait_id_t wait_id;
-  const void *codeptr_ra;
-} ompt_record_nest_lock_t;
-
-typedef void (*ompt_callback_flush_t) (
-  ompt_data_t *thread_data,
-  const void *codeptr_ra
-);
-
-typedef struct ompt_record_flush_t {
-  const void *codeptr_ra;
-} ompt_record_flush_t;
-
-typedef void (*ompt_callback_cancel_t) (
-  ompt_data_t *task_data,
-  int flags,
-  const void *codeptr_ra
-);
-
-typedef struct ompt_record_cancel_t {
-  ompt_id_t task_id;
-  int flags;
-  const void *codeptr_ra;
-} ompt_record_cancel_t;
-
-typedef void (*ompt_callback_device_initialize_t) (
-  int device_num,
-  const char *type,
-  ompt_device_t *device,
-  ompt_function_lookup_t lookup,
-  const char *documentation
-);
-
-typedef void (*ompt_callback_device_finalize_t) (
-  int device_num
-);
-
-typedef void (*ompt_callback_device_load_t) (
-  int device_num,
-  const char *filename,
-  int64_t offset_in_file,
-  void *vma_in_file,
-  size_t bytes,
-  void *host_addr,
-  void *device_addr,
-  uint64_t module_id
-);
-
-typedef void (*ompt_callback_device_unload_t) (
-  int device_num,
-  uint64_t module_id
-);
-
-typedef void (*ompt_callback_target_data_op_t) (
-  ompt_id_t target_id,
-  ompt_id_t host_op_id,
-  ompt_target_data_op_t optype,
-  void *src_addr,
-  int src_device_num,
-  void *dest_addr,
-  int dest_device_num,
-  size_t bytes,
-  const void *codeptr_ra
-);
-
-typedef struct ompt_record_target_data_op_t {
-  ompt_id_t host_op_id;
-  ompt_target_data_op_t optype;
-  void *src_addr;
-  int src_device_num;
-  void *dest_addr;
-  int dest_device_num;
-  size_t bytes;
-  ompt_device_time_t end_time;
-  const void *codeptr_ra;
-} ompt_record_target_data_op_t;
-
-typedef void (*ompt_callback_target_t) (
-  ompt_target_t kind,
-  ompt_scope_endpoint_t endpoint,
-  int device_num,
-  ompt_data_t *task_data,
-  ompt_id_t target_id,
-  const void *codeptr_ra
-);
-
-typedef struct ompt_record_target_t {
-  ompt_target_t kind;
-  ompt_scope_endpoint_t endpoint;
-  int device_num;
-  ompt_id_t task_id;
-  ompt_id_t target_id;
-  const void *codeptr_ra;
-} ompt_record_target_t;
-
-typedef void (*ompt_callback_target_map_t) (
-  ompt_id_t target_id,
-  unsigned int nitems,
-  void **host_addr,
-  void **device_addr,
-  size_t *bytes,
-  unsigned int *mapping_flags,
-  const void *codeptr_ra
-);
-
-typedef struct ompt_record_target_map_t {
-  ompt_id_t target_id;
-  unsigned int nitems;
-  void **host_addr;
-  void **device_addr;
-  size_t *bytes;
-  unsigned int *mapping_flags;
-  const void *codeptr_ra;
-} ompt_record_target_map_t;
-
-typedef void (*ompt_callback_target_submit_t) (
-  ompt_id_t target_id,
-  ompt_id_t host_op_id,
-  unsigned int requested_num_teams
-);
-
-typedef struct ompt_record_target_kernel_t {
-  ompt_id_t host_op_id;
-  unsigned int requested_num_teams;
-  unsigned int granted_num_teams;
-  ompt_device_time_t end_time;
-} ompt_record_target_kernel_t;
-
-typedef int (*ompt_callback_control_tool_t) (
-  uint64_t command,
-  uint64_t modifier,
-  void *arg,
-  const void *codeptr_ra
-);
-
-typedef struct ompt_record_control_tool_t {
-  uint64_t command;
-  uint64_t modifier;
-  const void *codeptr_ra;
-} ompt_record_control_tool_t;
-
-typedef struct ompd_address_t {
-  ompd_seg_t segment;
-  ompd_addr_t address;
-} ompd_address_t;
-
-typedef struct ompd_frame_info_t {
-  ompd_address_t frame_address;
-  ompd_word_t frame_flag;
-} ompd_frame_info_t;
-
-typedef struct _ompd_aspace_handle ompd_address_space_handle_t;
-typedef struct _ompd_thread_handle ompd_thread_handle_t;
-typedef struct _ompd_parallel_handle ompd_parallel_handle_t;
-typedef struct _ompd_task_handle ompd_task_handle_t;
-
-typedef struct _ompd_aspace_cont ompd_address_space_context_t;
-typedef struct _ompd_thread_cont ompd_thread_context_t;
-
-typedef struct ompd_device_type_sizes_t {
-  uint8_t sizeof_char;
-  uint8_t sizeof_short;
-  uint8_t sizeof_int;
-  uint8_t sizeof_long;
-  uint8_t sizeof_long_long;
-  uint8_t sizeof_pointer;
-} ompd_device_type_sizes_t;
-
-typedef struct ompt_record_ompt_t {
-  ompt_callbacks_t type;
-  ompt_device_time_t time;
-  ompt_id_t thread_id;
-  ompt_id_t target_id;
-  union {
-    ompt_record_thread_begin_t thread_begin;
-    ompt_record_parallel_begin_t parallel_begin;
-    ompt_record_parallel_end_t parallel_end;
-    ompt_record_work_t work;
-    ompt_record_dispatch_t dispatch;
-    ompt_record_task_create_t task_create;
-    ompt_record_dependences_t dependences;
-    ompt_record_task_dependence_t task_dependence;
-    ompt_record_task_schedule_t task_schedule;
-    ompt_record_implicit_task_t implicit_task;
-    ompt_record_master_t master;
-    ompt_record_sync_region_t sync_region;
-    ompt_record_mutex_acquire_t mutex_acquire;
-    ompt_record_mutex_t mutex;
-    ompt_record_nest_lock_t nest_lock;
-    ompt_record_flush_t flush;
-    ompt_record_cancel_t cancel;
-    ompt_record_target_t target;
-    ompt_record_target_data_op_t target_data_op;
-    ompt_record_target_map_t target_map;
-    ompt_record_target_kernel_t target_kernel;
-    ompt_record_control_tool_t control_tool;
-  } record;
-} ompt_record_ompt_t;
-
-typedef ompt_record_ompt_t *(*ompt_get_record_ompt_t) (
-  ompt_buffer_t *buffer,
-  ompt_buffer_cursor_t current
-);
-
-#define ompt_id_none 0
-#define ompt_data_none {0}
-#define ompt_time_none 0
-#define ompt_hwid_none 0
-#define ompt_addr_none ~0
-#define ompt_mutex_impl_none 0
-#define ompt_wait_id_none 0
-
-#define ompd_segment_none 0
-
-#endif /* __OMPT__ */
diff --git a/darwin-x86/lib64/clang/9.0.2/include/omp.h b/darwin-x86/lib64/clang/9.0.2/include/omp.h
deleted file mode 100644
index 28db2f4..0000000
--- a/darwin-x86/lib64/clang/9.0.2/include/omp.h
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * include/50/omp.h.var
- */
-
-
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-
-#ifndef __OMP_H
-#   define __OMP_H
-
-#   define KMP_VERSION_MAJOR    5
-#   define KMP_VERSION_MINOR    0
-#   define KMP_VERSION_BUILD    20140926
-#   define KMP_BUILD_DATE       "No_Timestamp"
-
-#   ifdef __cplusplus
-    extern "C" {
-#   endif
-
-#   define omp_set_affinity_format   ompc_set_affinity_format
-#   define omp_get_affinity_format   ompc_get_affinity_format
-#   define omp_display_affinity      ompc_display_affinity
-#   define omp_capture_affinity      ompc_capture_affinity
-
-#   if defined(_WIN32)
-#       define __KAI_KMPC_CONVENTION __cdecl
-#       ifndef __KMP_IMP
-#           define __KMP_IMP __declspec(dllimport)
-#       endif
-#   else
-#       define __KAI_KMPC_CONVENTION
-#       ifndef __KMP_IMP
-#           define __KMP_IMP
-#       endif
-#   endif
-
-    /* schedule kind constants */
-    typedef enum omp_sched_t {
-	omp_sched_static  = 1,
-	omp_sched_dynamic = 2,
-	omp_sched_guided  = 3,
-	omp_sched_auto    = 4
-    } omp_sched_t;
-
-    /* set API functions */
-    extern void   __KAI_KMPC_CONVENTION  omp_set_num_threads (int);
-    extern void   __KAI_KMPC_CONVENTION  omp_set_dynamic     (int);
-    extern void   __KAI_KMPC_CONVENTION  omp_set_nested      (int);
-    extern void   __KAI_KMPC_CONVENTION  omp_set_max_active_levels (int);
-    extern void   __KAI_KMPC_CONVENTION  omp_set_schedule          (omp_sched_t, int);
-
-    /* query API functions */
-    extern int    __KAI_KMPC_CONVENTION  omp_get_num_threads  (void);
-    extern int    __KAI_KMPC_CONVENTION  omp_get_dynamic      (void);
-    extern int    __KAI_KMPC_CONVENTION  omp_get_nested       (void);
-    extern int    __KAI_KMPC_CONVENTION  omp_get_max_threads  (void);
-    extern int    __KAI_KMPC_CONVENTION  omp_get_thread_num   (void);
-    extern int    __KAI_KMPC_CONVENTION  omp_get_num_procs    (void);
-    extern int    __KAI_KMPC_CONVENTION  omp_in_parallel      (void);
-    extern int    __KAI_KMPC_CONVENTION  omp_in_final         (void);
-    extern int    __KAI_KMPC_CONVENTION  omp_get_active_level        (void);
-    extern int    __KAI_KMPC_CONVENTION  omp_get_level               (void);
-    extern int    __KAI_KMPC_CONVENTION  omp_get_ancestor_thread_num (int);
-    extern int    __KAI_KMPC_CONVENTION  omp_get_team_size           (int);
-    extern int    __KAI_KMPC_CONVENTION  omp_get_thread_limit        (void);
-    extern int    __KAI_KMPC_CONVENTION  omp_get_max_active_levels   (void);
-    extern void   __KAI_KMPC_CONVENTION  omp_get_schedule            (omp_sched_t *, int *);
-    extern int    __KAI_KMPC_CONVENTION  omp_get_max_task_priority   (void);
-
-    /* lock API functions */
-    typedef struct omp_lock_t {
-        void * _lk;
-    } omp_lock_t;
-
-    extern void   __KAI_KMPC_CONVENTION  omp_init_lock    (omp_lock_t *);
-    extern void   __KAI_KMPC_CONVENTION  omp_set_lock     (omp_lock_t *);
-    extern void   __KAI_KMPC_CONVENTION  omp_unset_lock   (omp_lock_t *);
-    extern void   __KAI_KMPC_CONVENTION  omp_destroy_lock (omp_lock_t *);
-    extern int    __KAI_KMPC_CONVENTION  omp_test_lock    (omp_lock_t *);
-
-    /* nested lock API functions */
-    typedef struct omp_nest_lock_t {
-        void * _lk;
-    } omp_nest_lock_t;
-
-    extern void   __KAI_KMPC_CONVENTION  omp_init_nest_lock    (omp_nest_lock_t *);
-    extern void   __KAI_KMPC_CONVENTION  omp_set_nest_lock     (omp_nest_lock_t *);
-    extern void   __KAI_KMPC_CONVENTION  omp_unset_nest_lock   (omp_nest_lock_t *);
-    extern void   __KAI_KMPC_CONVENTION  omp_destroy_nest_lock (omp_nest_lock_t *);
-    extern int    __KAI_KMPC_CONVENTION  omp_test_nest_lock    (omp_nest_lock_t *);
-
-    /* OpenMP 5.0  Synchronization hints*/
-    typedef enum omp_sync_hint_t {
-        omp_sync_hint_none           = 0,
-        omp_lock_hint_none           = omp_sync_hint_none,
-        omp_sync_hint_uncontended    = 1,
-        omp_lock_hint_uncontended    = omp_sync_hint_uncontended,
-        omp_sync_hint_contended      = (1<<1),
-        omp_lock_hint_contended      = omp_sync_hint_contended,
-        omp_sync_hint_nonspeculative = (1<<2),
-        omp_lock_hint_nonspeculative = omp_sync_hint_nonspeculative,
-        omp_sync_hint_speculative    = (1<<3),
-        omp_lock_hint_speculative    = omp_sync_hint_speculative,
-        kmp_lock_hint_hle            = (1<<16),
-        kmp_lock_hint_rtm            = (1<<17),
-        kmp_lock_hint_adaptive       = (1<<18)
-    } omp_sync_hint_t;
-
-    /* lock hint type for dynamic user lock */
-    typedef omp_sync_hint_t omp_lock_hint_t;
-
-    /* hinted lock initializers */
-    extern void __KAI_KMPC_CONVENTION omp_init_lock_with_hint(omp_lock_t *, omp_lock_hint_t);
-    extern void __KAI_KMPC_CONVENTION omp_init_nest_lock_with_hint(omp_nest_lock_t *, omp_lock_hint_t);
-
-    /* time API functions */
-    extern double __KAI_KMPC_CONVENTION  omp_get_wtime (void);
-    extern double __KAI_KMPC_CONVENTION  omp_get_wtick (void);
-
-    /* OpenMP 4.0 */
-    extern int  __KAI_KMPC_CONVENTION  omp_get_default_device (void);
-    extern void __KAI_KMPC_CONVENTION  omp_set_default_device (int);
-    extern int  __KAI_KMPC_CONVENTION  omp_is_initial_device (void);
-    extern int  __KAI_KMPC_CONVENTION  omp_get_num_devices (void);
-    extern int  __KAI_KMPC_CONVENTION  omp_get_num_teams (void);
-    extern int  __KAI_KMPC_CONVENTION  omp_get_team_num (void);
-    extern int  __KAI_KMPC_CONVENTION  omp_get_cancellation (void);
-
-#   include <stdlib.h>
-    /* OpenMP 4.5 */
-    extern int   __KAI_KMPC_CONVENTION  omp_get_initial_device (void);
-    extern void* __KAI_KMPC_CONVENTION  omp_target_alloc(size_t, int);
-    extern void  __KAI_KMPC_CONVENTION  omp_target_free(void *, int);
-    extern int   __KAI_KMPC_CONVENTION  omp_target_is_present(void *, int);
-    extern int   __KAI_KMPC_CONVENTION  omp_target_memcpy(void *, void *, size_t, size_t, size_t, int, int);
-    extern int   __KAI_KMPC_CONVENTION  omp_target_memcpy_rect(void *, void *, size_t, int, const size_t *,
-                                            const size_t *, const size_t *, const size_t *, const size_t *, int, int);
-    extern int   __KAI_KMPC_CONVENTION  omp_target_associate_ptr(void *, void *, size_t, size_t, int);
-    extern int   __KAI_KMPC_CONVENTION  omp_target_disassociate_ptr(void *, int);
-
-    /* OpenMP 5.0 */
-    extern int   __KAI_KMPC_CONVENTION  omp_get_device_num (void);
-
-    /* kmp API functions */
-    extern int    __KAI_KMPC_CONVENTION  kmp_get_stacksize          (void);
-    extern void   __KAI_KMPC_CONVENTION  kmp_set_stacksize          (int);
-    extern size_t __KAI_KMPC_CONVENTION  kmp_get_stacksize_s        (void);
-    extern void   __KAI_KMPC_CONVENTION  kmp_set_stacksize_s        (size_t);
-    extern int    __KAI_KMPC_CONVENTION  kmp_get_blocktime          (void);
-    extern int    __KAI_KMPC_CONVENTION  kmp_get_library            (void);
-    extern void   __KAI_KMPC_CONVENTION  kmp_set_blocktime          (int);
-    extern void   __KAI_KMPC_CONVENTION  kmp_set_library            (int);
-    extern void   __KAI_KMPC_CONVENTION  kmp_set_library_serial     (void);
-    extern void   __KAI_KMPC_CONVENTION  kmp_set_library_turnaround (void);
-    extern void   __KAI_KMPC_CONVENTION  kmp_set_library_throughput (void);
-    extern void   __KAI_KMPC_CONVENTION  kmp_set_defaults           (char const *);
-    extern void   __KAI_KMPC_CONVENTION  kmp_set_disp_num_buffers   (int);
-
-    /* Intel affinity API */
-    typedef void * kmp_affinity_mask_t;
-
-    extern int    __KAI_KMPC_CONVENTION  kmp_set_affinity             (kmp_affinity_mask_t *);
-    extern int    __KAI_KMPC_CONVENTION  kmp_get_affinity             (kmp_affinity_mask_t *);
-    extern int    __KAI_KMPC_CONVENTION  kmp_get_affinity_max_proc    (void);
-    extern void   __KAI_KMPC_CONVENTION  kmp_create_affinity_mask     (kmp_affinity_mask_t *);
-    extern void   __KAI_KMPC_CONVENTION  kmp_destroy_affinity_mask    (kmp_affinity_mask_t *);
-    extern int    __KAI_KMPC_CONVENTION  kmp_set_affinity_mask_proc   (int, kmp_affinity_mask_t *);
-    extern int    __KAI_KMPC_CONVENTION  kmp_unset_affinity_mask_proc (int, kmp_affinity_mask_t *);
-    extern int    __KAI_KMPC_CONVENTION  kmp_get_affinity_mask_proc   (int, kmp_affinity_mask_t *);
-
-    /* OpenMP 4.0 affinity API */
-    typedef enum omp_proc_bind_t {
-        omp_proc_bind_false = 0,
-        omp_proc_bind_true = 1,
-        omp_proc_bind_master = 2,
-        omp_proc_bind_close = 3,
-        omp_proc_bind_spread = 4
-    } omp_proc_bind_t;
-
-    extern omp_proc_bind_t __KAI_KMPC_CONVENTION omp_get_proc_bind (void);
-
-    /* OpenMP 4.5 affinity API */
-    extern int  __KAI_KMPC_CONVENTION omp_get_num_places (void);
-    extern int  __KAI_KMPC_CONVENTION omp_get_place_num_procs (int);
-    extern void __KAI_KMPC_CONVENTION omp_get_place_proc_ids (int, int *);
-    extern int  __KAI_KMPC_CONVENTION omp_get_place_num (void);
-    extern int  __KAI_KMPC_CONVENTION omp_get_partition_num_places (void);
-    extern void __KAI_KMPC_CONVENTION omp_get_partition_place_nums (int *);
-
-    extern void * __KAI_KMPC_CONVENTION  kmp_malloc  (size_t);
-    extern void * __KAI_KMPC_CONVENTION  kmp_aligned_malloc  (size_t, size_t);
-    extern void * __KAI_KMPC_CONVENTION  kmp_calloc  (size_t, size_t);
-    extern void * __KAI_KMPC_CONVENTION  kmp_realloc (void *, size_t);
-    extern void   __KAI_KMPC_CONVENTION  kmp_free    (void *);
-
-    extern void   __KAI_KMPC_CONVENTION  kmp_set_warnings_on(void);
-    extern void   __KAI_KMPC_CONVENTION  kmp_set_warnings_off(void);
-
-    /* OpenMP 5.0 Tool Control */
-    typedef enum omp_control_tool_result_t {
-        omp_control_tool_notool = -2,
-        omp_control_tool_nocallback = -1,
-        omp_control_tool_success = 0,
-        omp_control_tool_ignored = 1
-    } omp_control_tool_result_t;
-
-    typedef enum omp_control_tool_t {
-        omp_control_tool_start = 1,
-        omp_control_tool_pause = 2,
-        omp_control_tool_flush = 3,
-        omp_control_tool_end = 4
-    } omp_control_tool_t;
-    
-    extern int __KAI_KMPC_CONVENTION omp_control_tool(int, int, void*);
-
-    /* OpenMP 5.0 Memory Management */
-    typedef void *omp_allocator_t;
-    extern __KMP_IMP const omp_allocator_t *OMP_NULL_ALLOCATOR;
-    extern __KMP_IMP const omp_allocator_t *omp_default_mem_alloc;
-    extern __KMP_IMP const omp_allocator_t *omp_large_cap_mem_alloc;
-    extern __KMP_IMP const omp_allocator_t *omp_const_mem_alloc;
-    extern __KMP_IMP const omp_allocator_t *omp_high_bw_mem_alloc;
-    extern __KMP_IMP const omp_allocator_t *omp_low_lat_mem_alloc;
-    extern __KMP_IMP const omp_allocator_t *omp_cgroup_mem_alloc;
-    extern __KMP_IMP const omp_allocator_t *omp_pteam_mem_alloc;
-    extern __KMP_IMP const omp_allocator_t *omp_thread_mem_alloc;
-
-    extern void __KAI_KMPC_CONVENTION omp_set_default_allocator(const omp_allocator_t *);
-    extern const omp_allocator_t * __KAI_KMPC_CONVENTION omp_get_default_allocator(void);
-#ifdef __cplusplus
-    extern void *__KAI_KMPC_CONVENTION omp_alloc(size_t size, const omp_allocator_t *allocator = OMP_NULL_ALLOCATOR);
-    extern void __KAI_KMPC_CONVENTION omp_free(void * ptr, const omp_allocator_t *allocator = OMP_NULL_ALLOCATOR);
-#else
-    extern void *__KAI_KMPC_CONVENTION omp_alloc(size_t size, const omp_allocator_t *allocator);
-    extern void __KAI_KMPC_CONVENTION omp_free(void *ptr, const omp_allocator_t *allocator);
-#endif
-
-    /* OpenMP 5.0 Affinity Format */
-    extern void __KAI_KMPC_CONVENTION omp_set_affinity_format(char const *);
-    extern size_t __KAI_KMPC_CONVENTION omp_get_affinity_format(char *, size_t);
-    extern void __KAI_KMPC_CONVENTION omp_display_affinity(char const *);
-    extern size_t __KAI_KMPC_CONVENTION omp_capture_affinity(char *, size_t, char const *);
-
-    /* OpenMP 5.0 Pause Resources */
-    typedef enum omp_pause_resource_t {
-      omp_pause_resume = 0,
-      omp_pause_soft = 1,
-      omp_pause_hard = 2
-    } omp_pause_resource_t;
-    extern int __KAI_KMPC_CONVENTION omp_pause_resource(omp_pause_resource_t, int);
-    extern int __KAI_KMPC_CONVENTION omp_pause_resource_all(omp_pause_resource_t);
-
-#   undef __KAI_KMPC_CONVENTION
-#   undef __KMP_IMP
-
-    /* Warning:
-       The following typedefs are not standard, deprecated and will be removed in a future release.
-    */
-    typedef int     omp_int_t;
-    typedef double  omp_wtime_t;
-
-#   ifdef __cplusplus
-    }
-#   endif
-
-#endif /* __OMP_H */
diff --git a/darwin-x86/lib64/clang/9.0.2/include/ompt.h b/darwin-x86/lib64/clang/9.0.2/include/ompt.h
deleted file mode 100644
index d04a2b7..0000000
--- a/darwin-x86/lib64/clang/9.0.2/include/ompt.h
+++ /dev/null
@@ -1,1082 +0,0 @@
-/*
- * include/50/omp-tools.h.var
- */
-
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef __OMPT__
-#define __OMPT__
-
-/*****************************************************************************
- * system include files
- *****************************************************************************/
-
-#include <stdint.h>
-#include <stddef.h>
-
-/*****************************************************************************
- * iteration macros
- *****************************************************************************/
-
-#define FOREACH_OMPT_INQUIRY_FN(macro)      \
-    macro (ompt_enumerate_states)           \
-    macro (ompt_enumerate_mutex_impls)      \
-                                            \
-    macro (ompt_set_callback)               \
-    macro (ompt_get_callback)               \
-                                            \
-    macro (ompt_get_state)                  \
-                                            \
-    macro (ompt_get_parallel_info)          \
-    macro (ompt_get_task_info)              \
-    macro (ompt_get_task_memory)            \
-    macro (ompt_get_thread_data)            \
-    macro (ompt_get_unique_id)              \
-    macro (ompt_finalize_tool)              \
-                                            \
-    macro(ompt_get_num_procs)               \
-    macro(ompt_get_num_places)              \
-    macro(ompt_get_place_proc_ids)          \
-    macro(ompt_get_place_num)               \
-    macro(ompt_get_partition_place_nums)    \
-    macro(ompt_get_proc_id)                 \
-                                            \
-    macro(ompt_get_target_info)             \
-    macro(ompt_get_num_devices)
-
-#define FOREACH_OMPT_STATE(macro)                                                                \
-                                                                                                \
-    /* first available state */                                                                 \
-    macro (ompt_state_undefined, 0x102)      /* undefined thread state */                        \
-                                                                                                \
-    /* work states (0..15) */                                                                   \
-    macro (ompt_state_work_serial, 0x000)    /* working outside parallel */                      \
-    macro (ompt_state_work_parallel, 0x001)  /* working within parallel */                       \
-    macro (ompt_state_work_reduction, 0x002) /* performing a reduction */                        \
-                                                                                                \
-    /* barrier wait states (16..31) */                                                          \
-    macro (ompt_state_wait_barrier, 0x010)   /* waiting at a barrier */                          \
-    macro (ompt_state_wait_barrier_implicit_parallel, 0x011)                                     \
-                                            /* implicit barrier at the end of parallel region */\
-    macro (ompt_state_wait_barrier_implicit_workshare, 0x012)                                    \
-                                            /* implicit barrier at the end of worksharing */    \
-    macro (ompt_state_wait_barrier_implicit, 0x013)  /* implicit barrier */                      \
-    macro (ompt_state_wait_barrier_explicit, 0x014)  /* explicit barrier */                      \
-                                                                                                \
-    /* task wait states (32..63) */                                                             \
-    macro (ompt_state_wait_taskwait, 0x020)  /* waiting at a taskwait */                         \
-    macro (ompt_state_wait_taskgroup, 0x021) /* waiting at a taskgroup */                        \
-                                                                                                \
-    /* mutex wait states (64..127) */                                                           \
-    macro (ompt_state_wait_mutex, 0x040)                                                         \
-    macro (ompt_state_wait_lock, 0x041)      /* waiting for lock */                              \
-    macro (ompt_state_wait_critical, 0x042)  /* waiting for critical */                          \
-    macro (ompt_state_wait_atomic, 0x043)    /* waiting for atomic */                            \
-    macro (ompt_state_wait_ordered, 0x044)   /* waiting for ordered */                           \
-                                                                                                \
-    /* target wait states (128..255) */                                                         \
-    macro (ompt_state_wait_target, 0x080)        /* waiting for target region */                 \
-    macro (ompt_state_wait_target_map, 0x081)    /* waiting for target data mapping operation */ \
-    macro (ompt_state_wait_target_update, 0x082) /* waiting for target update operation */       \
-                                                                                                \
-    /* misc (256..511) */                                                                       \
-    macro (ompt_state_idle, 0x100)           /* waiting for work */                              \
-    macro (ompt_state_overhead, 0x101)       /* overhead excluding wait states */                \
-                                                                                                \
-    /* implementation-specific states (512..) */
-
-
-#define FOREACH_KMP_MUTEX_IMPL(macro)                                                \
-    macro (kmp_mutex_impl_none, 0)         /* unknown implementation */              \
-    macro (kmp_mutex_impl_spin, 1)         /* based on spin */                       \
-    macro (kmp_mutex_impl_queuing, 2)      /* based on some fair policy */           \
-    macro (kmp_mutex_impl_speculative, 3)  /* based on HW-supported speculation */
-
-#define FOREACH_OMPT_EVENT(macro)                                                                                        \
-                                                                                                                         \
-    /*--- Mandatory Events ---*/                                                                                         \
-    macro (ompt_callback_thread_begin,      ompt_callback_thread_begin_t,       1) /* thread begin                    */ \
-    macro (ompt_callback_thread_end,        ompt_callback_thread_end_t,         2) /* thread end                      */ \
-                                                                                                                         \
-    macro (ompt_callback_parallel_begin,    ompt_callback_parallel_begin_t,     3) /* parallel begin                  */ \
-    macro (ompt_callback_parallel_end,      ompt_callback_parallel_end_t,       4) /* parallel end                    */ \
-                                                                                                                         \
-    macro (ompt_callback_task_create,       ompt_callback_task_create_t,        5) /* task begin                      */ \
-    macro (ompt_callback_task_schedule,     ompt_callback_task_schedule_t,      6) /* task schedule                   */ \
-    macro (ompt_callback_implicit_task,     ompt_callback_implicit_task_t,      7) /* implicit task                   */ \
-                                                                                                                         \
-    macro (ompt_callback_target,            ompt_callback_target_t,             8) /* target                          */ \
-    macro (ompt_callback_target_data_op,    ompt_callback_target_data_op_t,     9) /* target data op                  */ \
-    macro (ompt_callback_target_submit,     ompt_callback_target_submit_t,     10) /* target  submit                  */ \
-                                                                                                                         \
-    macro (ompt_callback_control_tool,      ompt_callback_control_tool_t,      11) /* control tool                    */ \
-                                                                                                                         \
-    macro (ompt_callback_device_initialize, ompt_callback_device_initialize_t, 12) /* device initialize               */ \
-    macro (ompt_callback_device_finalize,   ompt_callback_device_finalize_t,   13) /* device finalize                 */ \
-                                                                                                                         \
-    macro (ompt_callback_device_load,       ompt_callback_device_load_t,       14) /* device load                     */ \
-    macro (ompt_callback_device_unload,     ompt_callback_device_unload_t,     15) /* device unload                   */ \
-                                                                                                                         \
-    /* Optional Events */                                                                                                \
-    macro (ompt_callback_sync_region_wait,  ompt_callback_sync_region_t,       16) /* sync region wait begin or end   */ \
-                                                                                                                         \
-    macro (ompt_callback_mutex_released,    ompt_callback_mutex_t,             17) /* mutex released                  */ \
-                                                                                                                         \
-    macro (ompt_callback_dependences,       ompt_callback_dependences_t,       18) /* report task dependences         */ \
-    macro (ompt_callback_task_dependence,   ompt_callback_task_dependence_t,   19) /* report task dependence          */ \
-                                                                                                                         \
-    macro (ompt_callback_work,              ompt_callback_work_t,              20) /* task at work begin or end       */ \
-                                                                                                                         \
-    macro (ompt_callback_master,            ompt_callback_master_t,            21) /* task at master begin or end     */ \
-                                                                                                                         \
-    macro (ompt_callback_target_map,        ompt_callback_target_map_t,        22) /* target map                      */ \
-                                                                                                                         \
-    macro (ompt_callback_sync_region,       ompt_callback_sync_region_t,       23) /* sync region begin or end        */ \
-                                                                                                                         \
-    macro (ompt_callback_lock_init,         ompt_callback_mutex_acquire_t,     24) /* lock init                       */ \
-    macro (ompt_callback_lock_destroy,      ompt_callback_mutex_t,             25) /* lock destroy                    */ \
-                                                                                                                         \
-    macro (ompt_callback_mutex_acquire,     ompt_callback_mutex_acquire_t,     26) /* mutex acquire                   */ \
-    macro (ompt_callback_mutex_acquired,    ompt_callback_mutex_t,             27) /* mutex acquired                  */ \
-                                                                                                                         \
-    macro (ompt_callback_nest_lock,         ompt_callback_nest_lock_t,         28) /* nest lock                       */ \
-                                                                                                                         \
-    macro (ompt_callback_flush,             ompt_callback_flush_t,             29) /* after executing flush           */ \
-                                                                                                                         \
-    macro (ompt_callback_cancel,            ompt_callback_cancel_t,            30) /* cancel innermost binding region */ \
-                                                                                                                         \
-    macro (ompt_callback_reduction,         ompt_callback_sync_region_t,       31) /* reduction                       */ \
-                                                                                                                         \
-    macro (ompt_callback_dispatch,          ompt_callback_dispatch_t,          32) /* dispatch of work                */
-
-/*****************************************************************************
- * implementation specific types
- *****************************************************************************/
-
-typedef enum kmp_mutex_impl_t {
-#define kmp_mutex_impl_macro(impl, code) impl = code,
-    FOREACH_KMP_MUTEX_IMPL(kmp_mutex_impl_macro)
-#undef kmp_mutex_impl_macro
-} kmp_mutex_impl_t;
-
-/*****************************************************************************
- * definitions generated from spec
- *****************************************************************************/
-
-typedef enum ompt_callbacks_t {
-  ompt_callback_thread_begin             = 1,
-  ompt_callback_thread_end               = 2,
-  ompt_callback_parallel_begin           = 3,
-  ompt_callback_parallel_end             = 4,
-  ompt_callback_task_create              = 5,
-  ompt_callback_task_schedule            = 6,
-  ompt_callback_implicit_task            = 7,
-  ompt_callback_target                   = 8,
-  ompt_callback_target_data_op           = 9,
-  ompt_callback_target_submit            = 10,
-  ompt_callback_control_tool             = 11,
-  ompt_callback_device_initialize        = 12,
-  ompt_callback_device_finalize          = 13,
-  ompt_callback_device_load              = 14,
-  ompt_callback_device_unload            = 15,
-  ompt_callback_sync_region_wait         = 16,
-  ompt_callback_mutex_released           = 17,
-  ompt_callback_dependences              = 18,
-  ompt_callback_task_dependence          = 19,
-  ompt_callback_work                     = 20,
-  ompt_callback_master                   = 21,
-  ompt_callback_target_map               = 22,
-  ompt_callback_sync_region              = 23,
-  ompt_callback_lock_init                = 24,
-  ompt_callback_lock_destroy             = 25,
-  ompt_callback_mutex_acquire            = 26,
-  ompt_callback_mutex_acquired           = 27,
-  ompt_callback_nest_lock                = 28,
-  ompt_callback_flush                    = 29,
-  ompt_callback_cancel                   = 30,
-  ompt_callback_reduction                = 31,
-  ompt_callback_dispatch                 = 32
-} ompt_callbacks_t;
-
-typedef enum ompt_record_t {
-  ompt_record_ompt               = 1,
-  ompt_record_native             = 2,
-  ompt_record_invalid            = 3
-} ompt_record_t;
-
-typedef enum ompt_record_native_t {
-  ompt_record_native_info  = 1,
-  ompt_record_native_event = 2
-} ompt_record_native_t;
-
-typedef enum ompt_set_result_t {
-  ompt_set_error            = 0,
-  ompt_set_never            = 1,
-  ompt_set_impossible       = 2,
-  ompt_set_sometimes        = 3,
-  ompt_set_sometimes_paired = 4,
-  ompt_set_always           = 5
-} ompt_set_result_t;
-
-typedef uint64_t ompt_id_t;
-
-typedef uint64_t ompt_device_time_t;
-
-typedef uint64_t ompt_buffer_cursor_t;
-
-typedef enum ompt_thread_t {
-  ompt_thread_initial                 = 1,
-  ompt_thread_worker                  = 2,
-  ompt_thread_other                   = 3,
-  ompt_thread_unknown                 = 4
-} ompt_thread_t;
-
-typedef enum ompt_scope_endpoint_t {
-  ompt_scope_begin                    = 1,
-  ompt_scope_end                      = 2
-} ompt_scope_endpoint_t;
-
-typedef enum ompt_dispatch_t {
-  ompt_dispatch_iteration             = 1,
-  ompt_dispatch_section               = 2
-} ompt_dispatch_t;
-
-typedef enum ompt_sync_region_t {
-  ompt_sync_region_barrier                = 1,
-  ompt_sync_region_barrier_implicit       = 2,
-  ompt_sync_region_barrier_explicit       = 3,
-  ompt_sync_region_barrier_implementation = 4,
-  ompt_sync_region_taskwait               = 5,
-  ompt_sync_region_taskgroup              = 6,
-  ompt_sync_region_reduction              = 7
-} ompt_sync_region_t;
-
-typedef enum ompt_target_data_op_t {
-  ompt_target_data_alloc                = 1,
-  ompt_target_data_transfer_to_device   = 2,
-  ompt_target_data_transfer_from_device = 3,
-  ompt_target_data_delete               = 4,
-  ompt_target_data_associate            = 5,
-  ompt_target_data_disassociate         = 6
-} ompt_target_data_op_t;
-
-typedef enum ompt_work_t {
-  ompt_work_loop               = 1,
-  ompt_work_sections           = 2,
-  ompt_work_single_executor    = 3,
-  ompt_work_single_other       = 4,
-  ompt_work_workshare          = 5,
-  ompt_work_distribute         = 6,
-  ompt_work_taskloop           = 7
-} ompt_work_t;
-
-typedef enum ompt_mutex_t {
-  ompt_mutex_lock                     = 1,
-  ompt_mutex_test_lock                = 2,
-  ompt_mutex_nest_lock                = 3,
-  ompt_mutex_test_nest_lock           = 4,
-  ompt_mutex_critical                 = 5,
-  ompt_mutex_atomic                   = 6,
-  ompt_mutex_ordered                  = 7
-} ompt_mutex_t;
-
-typedef enum ompt_native_mon_flag_t {
-  ompt_native_data_motion_explicit    = 0x01,
-  ompt_native_data_motion_implicit    = 0x02,
-  ompt_native_kernel_invocation       = 0x04,
-  ompt_native_kernel_execution        = 0x08,
-  ompt_native_driver                  = 0x10,
-  ompt_native_runtime                 = 0x20,
-  ompt_native_overhead                = 0x40,
-  ompt_native_idleness                = 0x80
-} ompt_native_mon_flag_t;
-
-typedef enum ompt_task_flag_t {
-  ompt_task_initial                   = 0x00000001,
-  ompt_task_implicit                  = 0x00000002,
-  ompt_task_explicit                  = 0x00000004,
-  ompt_task_target                    = 0x00000008,
-  ompt_task_undeferred                = 0x08000000,
-  ompt_task_untied                    = 0x10000000,
-  ompt_task_final                     = 0x20000000,
-  ompt_task_mergeable                 = 0x40000000,
-  ompt_task_merged                    = 0x80000000
-} ompt_task_flag_t;
-
-typedef enum ompt_task_status_t {
-  ompt_task_complete      = 1,
-  ompt_task_yield         = 2,
-  ompt_task_cancel        = 3,
-  ompt_task_detach        = 4,
-  ompt_task_early_fulfill = 5,
-  ompt_task_late_fulfill  = 6,
-  ompt_task_switch        = 7
-} ompt_task_status_t;
-
-typedef enum ompt_target_t {
-  ompt_target                         = 1,
-  ompt_target_enter_data              = 2,
-  ompt_target_exit_data               = 3,
-  ompt_target_update                  = 4
-} ompt_target_t;
-
-typedef enum ompt_parallel_flag_t {
-  ompt_parallel_invoker_program = 0x00000001,
-  ompt_parallel_invoker_runtime = 0x00000002,
-  ompt_parallel_league          = 0x40000000,
-  ompt_parallel_team            = 0x80000000
-} ompt_parallel_flag_t;
-
-typedef enum ompt_target_map_flag_t {
-  ompt_target_map_flag_to             = 0x01,
-  ompt_target_map_flag_from           = 0x02,
-  ompt_target_map_flag_alloc          = 0x04,
-  ompt_target_map_flag_release        = 0x08,
-  ompt_target_map_flag_delete         = 0x10,
-  ompt_target_map_flag_implicit       = 0x20
-} ompt_target_map_flag_t;
-
-typedef enum ompt_dependence_type_t {
-  ompt_dependence_type_in              = 1,
-  ompt_dependence_type_out             = 2,
-  ompt_dependence_type_inout           = 3,
-  ompt_dependence_type_mutexinoutset   = 4,
-  ompt_dependence_type_source          = 5,
-  ompt_dependence_type_sink            = 6
-} ompt_dependence_type_t;
-
-typedef enum ompt_cancel_flag_t {
-  ompt_cancel_parallel       = 0x01,
-  ompt_cancel_sections       = 0x02,
-  ompt_cancel_loop           = 0x04,
-  ompt_cancel_taskgroup      = 0x08,
-  ompt_cancel_activated      = 0x10,
-  ompt_cancel_detected       = 0x20,
-  ompt_cancel_discarded_task = 0x40
-} ompt_cancel_flag_t;
-
-typedef uint64_t ompt_hwid_t;
-
-typedef uint64_t ompt_wait_id_t;
-
-typedef enum ompt_frame_flag_t {
-  ompt_frame_runtime        = 0x00,
-  ompt_frame_application    = 0x01,
-  ompt_frame_cfa            = 0x10,
-  ompt_frame_framepointer   = 0x20,
-  ompt_frame_stackaddress   = 0x30
-} ompt_frame_flag_t; 
-
-typedef enum ompt_state_t {
-  ompt_state_work_serial                      = 0x000,
-  ompt_state_work_parallel                    = 0x001,
-  ompt_state_work_reduction                   = 0x002,
-
-  ompt_state_wait_barrier                     = 0x010,
-  ompt_state_wait_barrier_implicit_parallel   = 0x011,
-  ompt_state_wait_barrier_implicit_workshare  = 0x012,
-  ompt_state_wait_barrier_implicit            = 0x013,
-  ompt_state_wait_barrier_explicit            = 0x014,
-
-  ompt_state_wait_taskwait                    = 0x020,
-  ompt_state_wait_taskgroup                   = 0x021,
-
-  ompt_state_wait_mutex                       = 0x040,
-  ompt_state_wait_lock                        = 0x041,
-  ompt_state_wait_critical                    = 0x042,
-  ompt_state_wait_atomic                      = 0x043,
-  ompt_state_wait_ordered                     = 0x044,
-
-  ompt_state_wait_target                      = 0x080,
-  ompt_state_wait_target_map                  = 0x081,
-  ompt_state_wait_target_update               = 0x082,
-
-  ompt_state_idle                             = 0x100,
-  ompt_state_overhead                         = 0x101,
-  ompt_state_undefined                        = 0x102
-} ompt_state_t;
-
-typedef uint64_t (*ompt_get_unique_id_t) (void);
-
-typedef uint64_t ompd_size_t;
-
-typedef uint64_t ompd_wait_id_t;
-
-typedef uint64_t ompd_addr_t;
-typedef int64_t  ompd_word_t;
-typedef uint64_t ompd_seg_t;
-
-typedef uint64_t ompd_device_t;
-
-typedef uint64_t ompd_thread_id_t;
-
-typedef enum ompd_scope_t {
-  ompd_scope_global = 1,
-  ompd_scope_address_space = 2,
-  ompd_scope_thread = 3,
-  ompd_scope_parallel = 4,
-  ompd_scope_implicit_task = 5,
-  ompd_scope_task = 6
-} ompd_scope_t;
-
-typedef uint64_t ompd_icv_id_t;
-
-typedef enum ompd_rc_t {
-  ompd_rc_ok = 0,
-  ompd_rc_unavailable = 1,
-  ompd_rc_stale_handle = 2,
-  ompd_rc_bad_input = 3,
-  ompd_rc_error = 4,
-  ompd_rc_unsupported = 5,
-  ompd_rc_needs_state_tracking = 6,
-  ompd_rc_incompatible = 7,
-  ompd_rc_device_read_error = 8,
-  ompd_rc_device_write_error = 9,
-  ompd_rc_nomem = 10,
-} ompd_rc_t;
-
-typedef void (*ompt_interface_fn_t) (void);
-
-typedef ompt_interface_fn_t (*ompt_function_lookup_t) (
-  const char *interface_function_name
-);
-
-typedef union ompt_data_t {
-  uint64_t value;
-  void *ptr;
-} ompt_data_t;
-
-typedef struct ompt_frame_t {
-  ompt_data_t exit_frame;
-  ompt_data_t enter_frame;
-  int exit_frame_flags;
-  int enter_frame_flags;
-} ompt_frame_t;
-
-typedef void (*ompt_callback_t) (void);
-
-typedef void ompt_device_t;
-
-typedef void ompt_buffer_t;
-
-typedef void (*ompt_callback_buffer_request_t) (
-  int device_num,
-  ompt_buffer_t **buffer,
-  size_t *bytes
-);
-
-typedef void (*ompt_callback_buffer_complete_t) (
-  int device_num,
-  ompt_buffer_t *buffer,
-  size_t bytes,
-  ompt_buffer_cursor_t begin,
-  int buffer_owned
-);
-
-typedef void (*ompt_finalize_t) (
-  ompt_data_t *tool_data
-);
-
-typedef int (*ompt_initialize_t) (
-  ompt_function_lookup_t lookup,
-  int initial_device_num,
-  ompt_data_t *tool_data
-);
-
-typedef struct ompt_start_tool_result_t {
-  ompt_initialize_t initialize;
-  ompt_finalize_t finalize;
-  ompt_data_t tool_data;
-} ompt_start_tool_result_t;
-
-typedef struct ompt_record_abstract_t {
-  ompt_record_native_t rclass;
-  const char *type;
-  ompt_device_time_t start_time;
-  ompt_device_time_t end_time;
-  ompt_hwid_t hwid;
-} ompt_record_abstract_t;
-
-typedef struct ompt_dependence_t {
-  ompt_data_t variable;
-  ompt_dependence_type_t dependence_type;
-} ompt_dependence_t;
-
-typedef int (*ompt_enumerate_states_t) (
-  int current_state,
-  int *next_state,
-  const char **next_state_name
-);
-
-typedef int (*ompt_enumerate_mutex_impls_t) (
-  int current_impl,
-  int *next_impl,
-  const char **next_impl_name
-);
-
-typedef ompt_set_result_t (*ompt_set_callback_t) (
-  ompt_callbacks_t event,
-  ompt_callback_t callback
-);
-
-typedef int (*ompt_get_callback_t) (
-  ompt_callbacks_t event,
-  ompt_callback_t *callback
-);
-
-typedef ompt_data_t *(*ompt_get_thread_data_t) (void);
-
-typedef int (*ompt_get_num_procs_t) (void);
-
-typedef int (*ompt_get_num_places_t) (void);
-
-typedef int (*ompt_get_place_proc_ids_t) (
-  int place_num,
-  int ids_size,
-  int *ids
-);
-
-typedef int (*ompt_get_place_num_t) (void);
-
-typedef int (*ompt_get_partition_place_nums_t) (
-  int place_nums_size,
-  int *place_nums
-);
-
-typedef int (*ompt_get_proc_id_t) (void);
-
-typedef int (*ompt_get_state_t) (
-  ompt_wait_id_t *wait_id
-);
-
-typedef int (*ompt_get_parallel_info_t) (
-  int ancestor_level,
-  ompt_data_t **parallel_data,
-  int *team_size
-);
-
-typedef int (*ompt_get_task_info_t) (
-  int ancestor_level,
-  int *flags,
-  ompt_data_t **task_data,
-  ompt_frame_t **task_frame,
-  ompt_data_t **parallel_data,
-  int *thread_num
-);
-
-typedef int (*ompt_get_task_memory_t)(
-  void **addr,
-  size_t *size,
-  int block
-);
-
-typedef int (*ompt_get_target_info_t) (
-  uint64_t *device_num,
-  ompt_id_t *target_id,
-  ompt_id_t *host_op_id
-);
-
-typedef int (*ompt_get_num_devices_t) (void);
-
-typedef void (*ompt_finalize_tool_t) (void);
-
-typedef int (*ompt_get_device_num_procs_t) (
-  ompt_device_t *device
-);
-
-typedef ompt_device_time_t (*ompt_get_device_time_t) (
-  ompt_device_t *device
-);
-
-typedef double (*ompt_translate_time_t) (
-  ompt_device_t *device,
-  ompt_device_time_t time
-);
-
-typedef ompt_set_result_t (*ompt_set_trace_ompt_t) (
-  ompt_device_t *device,
-  unsigned int enable,
-  unsigned int etype
-);
-
-typedef ompt_set_result_t (*ompt_set_trace_native_t) (
-  ompt_device_t *device,
-  int enable,
-  int flags
-);
-
-typedef int (*ompt_start_trace_t) (
-  ompt_device_t *device,
-  ompt_callback_buffer_request_t request,
-  ompt_callback_buffer_complete_t complete
-);
-
-typedef int (*ompt_pause_trace_t) (
-  ompt_device_t *device,
-  int begin_pause
-);
-
-typedef int (*ompt_flush_trace_t) (
-  ompt_device_t *device
-);
-
-typedef int (*ompt_stop_trace_t) (
-  ompt_device_t *device
-);
-
-typedef int (*ompt_advance_buffer_cursor_t) (
-  ompt_device_t *device,
-  ompt_buffer_t *buffer,
-  size_t size,
-  ompt_buffer_cursor_t current,
-  ompt_buffer_cursor_t *next
-);
-
-typedef ompt_record_t (*ompt_get_record_type_t) (
-  ompt_buffer_t *buffer,
-  ompt_buffer_cursor_t current
-);
-
-typedef void *(*ompt_get_record_native_t) (
-  ompt_buffer_t *buffer,
-  ompt_buffer_cursor_t current,
-  ompt_id_t *host_op_id
-);
-
-typedef ompt_record_abstract_t *
-(*ompt_get_record_abstract_t) (
-  void *native_record
-);
-
-typedef void (*ompt_callback_thread_begin_t) (
-  ompt_thread_t thread_type,
-  ompt_data_t *thread_data
-);
-
-typedef struct ompt_record_thread_begin_t {
-  ompt_thread_t thread_type;
-} ompt_record_thread_begin_t;
-
-typedef void (*ompt_callback_thread_end_t) (
-  ompt_data_t *thread_data
-);
-
-typedef void (*ompt_callback_parallel_begin_t) (
-  ompt_data_t *encountering_task_data,
-  const ompt_frame_t *encountering_task_frame,
-  ompt_data_t *parallel_data,
-  unsigned int requested_parallelism,
-  int flags,
-  const void *codeptr_ra
-);
-
-typedef struct ompt_record_parallel_begin_t {
-  ompt_id_t encountering_task_id;
-  ompt_id_t parallel_id;
-  unsigned int requested_parallelism;
-  int flags;
-  const void *codeptr_ra;
-} ompt_record_parallel_begin_t;
-
-typedef void (*ompt_callback_parallel_end_t) (
-  ompt_data_t *parallel_data,
-  ompt_data_t *encountering_task_data,
-  int flags,
-  const void *codeptr_ra
-);
-
-typedef struct ompt_record_parallel_end_t {
-  ompt_id_t parallel_id;
-  ompt_id_t encountering_task_id;
-  int flags;
-  const void *codeptr_ra;
-} ompt_record_parallel_end_t;
-
-typedef void (*ompt_callback_work_t) (
-  ompt_work_t wstype,
-  ompt_scope_endpoint_t endpoint,
-  ompt_data_t *parallel_data,
-  ompt_data_t *task_data,
-  uint64_t count,
-  const void *codeptr_ra
-);
-
-typedef struct ompt_record_work_t {
-  ompt_work_t wstype;
-  ompt_scope_endpoint_t endpoint;
-  ompt_id_t parallel_id;
-  ompt_id_t task_id;
-  uint64_t count;
-  const void *codeptr_ra;
-} ompt_record_work_t;
-
-typedef void (*ompt_callback_dispatch_t) (
-  ompt_data_t *parallel_data,
-  ompt_data_t *task_data,
-  ompt_dispatch_t kind,
-  ompt_data_t instance 
-);
-
-typedef struct ompt_record_dispatch_t {
-  ompt_id_t parallel_id;
-  ompt_id_t task_id;
-  ompt_dispatch_t kind;
-  ompt_data_t instance; 
-} ompt_record_dispatch_t;
-
-typedef void (*ompt_callback_task_create_t) (
-  ompt_data_t *encountering_task_data,
-  const ompt_frame_t *encountering_task_frame,
-  ompt_data_t *new_task_data,
-  int flags,
-  int has_dependences,
-  const void *codeptr_ra
-);
-
-typedef struct ompt_record_task_create_t {
-  ompt_id_t encountering_task_id;
-  ompt_id_t new_task_id;
-  int flags;
-  int has_dependences;
-  const void *codeptr_ra;
-} ompt_record_task_create_t;
-
-typedef void (*ompt_callback_dependences_t) (
-  ompt_data_t *task_data,
-  const ompt_dependence_t *deps,
-  int ndeps
-);
-
-typedef struct ompt_record_dependences_t {
-  ompt_id_t task_id;
-  ompt_dependence_t dep;
-  int ndeps;
-} ompt_record_dependences_t;
-
-typedef void (*ompt_callback_task_dependence_t) (
-  ompt_data_t *src_task_data,
-  ompt_data_t *sink_task_data
-);
-
-typedef struct ompt_record_task_dependence_t {
-  ompt_id_t src_task_id;
-  ompt_id_t sink_task_id;
-} ompt_record_task_dependence_t;
-
-typedef void (*ompt_callback_task_schedule_t) (
-  ompt_data_t *prior_task_data,
-  ompt_task_status_t prior_task_status,
-  ompt_data_t *next_task_data
-);
-
-typedef struct ompt_record_task_schedule_t {
-  ompt_id_t prior_task_id;
-  ompt_task_status_t prior_task_status;
-  ompt_id_t next_task_id;
-} ompt_record_task_schedule_t;
-
-typedef void (*ompt_callback_implicit_task_t) (
-  ompt_scope_endpoint_t endpoint,
-  ompt_data_t *parallel_data,
-  ompt_data_t *task_data,
-  unsigned int actual_parallelism,
-  unsigned int index,
-  int flags
-);
-
-typedef struct ompt_record_implicit_task_t {
-  ompt_scope_endpoint_t endpoint;
-  ompt_id_t parallel_id;
-  ompt_id_t task_id;
-  unsigned int actual_parallelism;
-  unsigned int index;
-  int flags;
-} ompt_record_implicit_task_t;
-
-typedef void (*ompt_callback_master_t) (
-  ompt_scope_endpoint_t endpoint,
-  ompt_data_t *parallel_data,
-  ompt_data_t *task_data,
-  const void *codeptr_ra
-);
-
-typedef struct ompt_record_master_t {
-  ompt_scope_endpoint_t endpoint;
-  ompt_id_t parallel_id;
-  ompt_id_t task_id;
-  const void *codeptr_ra;
-} ompt_record_master_t;
-
-typedef void (*ompt_callback_sync_region_t) (
-  ompt_sync_region_t kind,
-  ompt_scope_endpoint_t endpoint,
-  ompt_data_t *parallel_data,
-  ompt_data_t *task_data,
-  const void *codeptr_ra
-);
-
-typedef struct ompt_record_sync_region_t {
-  ompt_sync_region_t kind;
-  ompt_scope_endpoint_t endpoint;
-  ompt_id_t parallel_id;
-  ompt_id_t task_id;
-  const void *codeptr_ra;
-} ompt_record_sync_region_t;
-
-typedef void (*ompt_callback_mutex_acquire_t) (
-  ompt_mutex_t kind,
-  unsigned int hint,
-  unsigned int impl,
-  ompt_wait_id_t wait_id,
-  const void *codeptr_ra
-);
-
-typedef struct ompt_record_mutex_acquire_t {
-  ompt_mutex_t kind;
-  unsigned int hint;
-  unsigned int impl;
-  ompt_wait_id_t wait_id;
-  const void *codeptr_ra;
-} ompt_record_mutex_acquire_t;
-
-typedef void (*ompt_callback_mutex_t) (
-  ompt_mutex_t kind,
-  ompt_wait_id_t wait_id,
-  const void *codeptr_ra
-);
-
-typedef struct ompt_record_mutex_t {
-  ompt_mutex_t kind;
-  ompt_wait_id_t wait_id;
-  const void *codeptr_ra;
-} ompt_record_mutex_t;
-
-typedef void (*ompt_callback_nest_lock_t) (
-  ompt_scope_endpoint_t endpoint,
-  ompt_wait_id_t wait_id,
-  const void *codeptr_ra
-);
-
-typedef struct ompt_record_nest_lock_t {
-  ompt_scope_endpoint_t endpoint;
-  ompt_wait_id_t wait_id;
-  const void *codeptr_ra;
-} ompt_record_nest_lock_t;
-
-typedef void (*ompt_callback_flush_t) (
-  ompt_data_t *thread_data,
-  const void *codeptr_ra
-);
-
-typedef struct ompt_record_flush_t {
-  const void *codeptr_ra;
-} ompt_record_flush_t;
-
-typedef void (*ompt_callback_cancel_t) (
-  ompt_data_t *task_data,
-  int flags,
-  const void *codeptr_ra
-);
-
-typedef struct ompt_record_cancel_t {
-  ompt_id_t task_id;
-  int flags;
-  const void *codeptr_ra;
-} ompt_record_cancel_t;
-
-typedef void (*ompt_callback_device_initialize_t) (
-  int device_num,
-  const char *type,
-  ompt_device_t *device,
-  ompt_function_lookup_t lookup,
-  const char *documentation
-);
-
-typedef void (*ompt_callback_device_finalize_t) (
-  int device_num
-);
-
-typedef void (*ompt_callback_device_load_t) (
-  int device_num,
-  const char *filename,
-  int64_t offset_in_file,
-  void *vma_in_file,
-  size_t bytes,
-  void *host_addr,
-  void *device_addr,
-  uint64_t module_id
-);
-
-typedef void (*ompt_callback_device_unload_t) (
-  int device_num,
-  uint64_t module_id
-);
-
-typedef void (*ompt_callback_target_data_op_t) (
-  ompt_id_t target_id,
-  ompt_id_t host_op_id,
-  ompt_target_data_op_t optype,
-  void *src_addr,
-  int src_device_num,
-  void *dest_addr,
-  int dest_device_num,
-  size_t bytes,
-  const void *codeptr_ra
-);
-
-typedef struct ompt_record_target_data_op_t {
-  ompt_id_t host_op_id;
-  ompt_target_data_op_t optype;
-  void *src_addr;
-  int src_device_num;
-  void *dest_addr;
-  int dest_device_num;
-  size_t bytes;
-  ompt_device_time_t end_time;
-  const void *codeptr_ra;
-} ompt_record_target_data_op_t;
-
-typedef void (*ompt_callback_target_t) (
-  ompt_target_t kind,
-  ompt_scope_endpoint_t endpoint,
-  int device_num,
-  ompt_data_t *task_data,
-  ompt_id_t target_id,
-  const void *codeptr_ra
-);
-
-typedef struct ompt_record_target_t {
-  ompt_target_t kind;
-  ompt_scope_endpoint_t endpoint;
-  int device_num;
-  ompt_id_t task_id;
-  ompt_id_t target_id;
-  const void *codeptr_ra;
-} ompt_record_target_t;
-
-typedef void (*ompt_callback_target_map_t) (
-  ompt_id_t target_id,
-  unsigned int nitems,
-  void **host_addr,
-  void **device_addr,
-  size_t *bytes,
-  unsigned int *mapping_flags,
-  const void *codeptr_ra
-);
-
-typedef struct ompt_record_target_map_t {
-  ompt_id_t target_id;
-  unsigned int nitems;
-  void **host_addr;
-  void **device_addr;
-  size_t *bytes;
-  unsigned int *mapping_flags;
-  const void *codeptr_ra;
-} ompt_record_target_map_t;
-
-typedef void (*ompt_callback_target_submit_t) (
-  ompt_id_t target_id,
-  ompt_id_t host_op_id,
-  unsigned int requested_num_teams
-);
-
-typedef struct ompt_record_target_kernel_t {
-  ompt_id_t host_op_id;
-  unsigned int requested_num_teams;
-  unsigned int granted_num_teams;
-  ompt_device_time_t end_time;
-} ompt_record_target_kernel_t;
-
-typedef int (*ompt_callback_control_tool_t) (
-  uint64_t command,
-  uint64_t modifier,
-  void *arg,
-  const void *codeptr_ra
-);
-
-typedef struct ompt_record_control_tool_t {
-  uint64_t command;
-  uint64_t modifier;
-  const void *codeptr_ra;
-} ompt_record_control_tool_t;
-
-typedef struct ompd_address_t {
-  ompd_seg_t segment;
-  ompd_addr_t address;
-} ompd_address_t;
-
-typedef struct ompd_frame_info_t {
-  ompd_address_t frame_address;
-  ompd_word_t frame_flag;
-} ompd_frame_info_t;
-
-typedef struct _ompd_aspace_handle ompd_address_space_handle_t;
-typedef struct _ompd_thread_handle ompd_thread_handle_t;
-typedef struct _ompd_parallel_handle ompd_parallel_handle_t;
-typedef struct _ompd_task_handle ompd_task_handle_t;
-
-typedef struct _ompd_aspace_cont ompd_address_space_context_t;
-typedef struct _ompd_thread_cont ompd_thread_context_t;
-
-typedef struct ompd_device_type_sizes_t {
-  uint8_t sizeof_char;
-  uint8_t sizeof_short;
-  uint8_t sizeof_int;
-  uint8_t sizeof_long;
-  uint8_t sizeof_long_long;
-  uint8_t sizeof_pointer;
-} ompd_device_type_sizes_t;
-
-typedef struct ompt_record_ompt_t {
-  ompt_callbacks_t type;
-  ompt_device_time_t time;
-  ompt_id_t thread_id;
-  ompt_id_t target_id;
-  union {
-    ompt_record_thread_begin_t thread_begin;
-    ompt_record_parallel_begin_t parallel_begin;
-    ompt_record_parallel_end_t parallel_end;
-    ompt_record_work_t work;
-    ompt_record_dispatch_t dispatch;
-    ompt_record_task_create_t task_create;
-    ompt_record_dependences_t dependences;
-    ompt_record_task_dependence_t task_dependence;
-    ompt_record_task_schedule_t task_schedule;
-    ompt_record_implicit_task_t implicit_task;
-    ompt_record_master_t master;
-    ompt_record_sync_region_t sync_region;
-    ompt_record_mutex_acquire_t mutex_acquire;
-    ompt_record_mutex_t mutex;
-    ompt_record_nest_lock_t nest_lock;
-    ompt_record_flush_t flush;
-    ompt_record_cancel_t cancel;
-    ompt_record_target_t target;
-    ompt_record_target_data_op_t target_data_op;
-    ompt_record_target_map_t target_map;
-    ompt_record_target_kernel_t target_kernel;
-    ompt_record_control_tool_t control_tool;
-  } record;
-} ompt_record_ompt_t;
-
-typedef ompt_record_ompt_t *(*ompt_get_record_ompt_t) (
-  ompt_buffer_t *buffer,
-  ompt_buffer_cursor_t current
-);
-
-#define ompt_id_none 0
-#define ompt_data_none {0}
-#define ompt_time_none 0
-#define ompt_hwid_none 0
-#define ompt_addr_none ~0
-#define ompt_mutex_impl_none 0
-#define ompt_wait_id_none 0
-
-#define ompd_segment_none 0
-
-#endif /* __OMPT__ */
diff --git a/darwin-x86/lib64/clang/9.0.2/include/__clang_cuda_builtin_vars.h b/darwin-x86/lib64/clang/9.0.4/include/__clang_cuda_builtin_vars.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/__clang_cuda_builtin_vars.h
rename to darwin-x86/lib64/clang/9.0.4/include/__clang_cuda_builtin_vars.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/__clang_cuda_cmath.h b/darwin-x86/lib64/clang/9.0.4/include/__clang_cuda_cmath.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/__clang_cuda_cmath.h
rename to darwin-x86/lib64/clang/9.0.4/include/__clang_cuda_cmath.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/__clang_cuda_complex_builtins.h b/darwin-x86/lib64/clang/9.0.4/include/__clang_cuda_complex_builtins.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/__clang_cuda_complex_builtins.h
rename to darwin-x86/lib64/clang/9.0.4/include/__clang_cuda_complex_builtins.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/__clang_cuda_device_functions.h b/darwin-x86/lib64/clang/9.0.4/include/__clang_cuda_device_functions.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/__clang_cuda_device_functions.h
rename to darwin-x86/lib64/clang/9.0.4/include/__clang_cuda_device_functions.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/__clang_cuda_intrinsics.h b/darwin-x86/lib64/clang/9.0.4/include/__clang_cuda_intrinsics.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/__clang_cuda_intrinsics.h
rename to darwin-x86/lib64/clang/9.0.4/include/__clang_cuda_intrinsics.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/__clang_cuda_libdevice_declares.h b/darwin-x86/lib64/clang/9.0.4/include/__clang_cuda_libdevice_declares.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/__clang_cuda_libdevice_declares.h
rename to darwin-x86/lib64/clang/9.0.4/include/__clang_cuda_libdevice_declares.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/__clang_cuda_math_forward_declares.h b/darwin-x86/lib64/clang/9.0.4/include/__clang_cuda_math_forward_declares.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/__clang_cuda_math_forward_declares.h
rename to darwin-x86/lib64/clang/9.0.4/include/__clang_cuda_math_forward_declares.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/__clang_cuda_runtime_wrapper.h b/darwin-x86/lib64/clang/9.0.4/include/__clang_cuda_runtime_wrapper.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/__clang_cuda_runtime_wrapper.h
rename to darwin-x86/lib64/clang/9.0.4/include/__clang_cuda_runtime_wrapper.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/__stddef_max_align_t.h b/darwin-x86/lib64/clang/9.0.4/include/__stddef_max_align_t.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/__stddef_max_align_t.h
rename to darwin-x86/lib64/clang/9.0.4/include/__stddef_max_align_t.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/__wmmintrin_aes.h b/darwin-x86/lib64/clang/9.0.4/include/__wmmintrin_aes.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/__wmmintrin_aes.h
rename to darwin-x86/lib64/clang/9.0.4/include/__wmmintrin_aes.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/__wmmintrin_pclmul.h b/darwin-x86/lib64/clang/9.0.4/include/__wmmintrin_pclmul.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/__wmmintrin_pclmul.h
rename to darwin-x86/lib64/clang/9.0.4/include/__wmmintrin_pclmul.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/adxintrin.h b/darwin-x86/lib64/clang/9.0.4/include/adxintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/adxintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/adxintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/altivec.h b/darwin-x86/lib64/clang/9.0.4/include/altivec.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/altivec.h
rename to darwin-x86/lib64/clang/9.0.4/include/altivec.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/ammintrin.h b/darwin-x86/lib64/clang/9.0.4/include/ammintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/ammintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/ammintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/arm64intr.h b/darwin-x86/lib64/clang/9.0.4/include/arm64intr.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/arm64intr.h
rename to darwin-x86/lib64/clang/9.0.4/include/arm64intr.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/arm_acle.h b/darwin-x86/lib64/clang/9.0.4/include/arm_acle.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/arm_acle.h
rename to darwin-x86/lib64/clang/9.0.4/include/arm_acle.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/arm_fp16.h b/darwin-x86/lib64/clang/9.0.4/include/arm_fp16.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/arm_fp16.h
rename to darwin-x86/lib64/clang/9.0.4/include/arm_fp16.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/arm_neon.h b/darwin-x86/lib64/clang/9.0.4/include/arm_neon.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/arm_neon.h
rename to darwin-x86/lib64/clang/9.0.4/include/arm_neon.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/armintr.h b/darwin-x86/lib64/clang/9.0.4/include/armintr.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/armintr.h
rename to darwin-x86/lib64/clang/9.0.4/include/armintr.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/avx2intrin.h b/darwin-x86/lib64/clang/9.0.4/include/avx2intrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/avx2intrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/avx2intrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/avx512bitalgintrin.h b/darwin-x86/lib64/clang/9.0.4/include/avx512bitalgintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/avx512bitalgintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/avx512bitalgintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/avx512bwintrin.h b/darwin-x86/lib64/clang/9.0.4/include/avx512bwintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/avx512bwintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/avx512bwintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/avx512cdintrin.h b/darwin-x86/lib64/clang/9.0.4/include/avx512cdintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/avx512cdintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/avx512cdintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/avx512dqintrin.h b/darwin-x86/lib64/clang/9.0.4/include/avx512dqintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/avx512dqintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/avx512dqintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/avx512erintrin.h b/darwin-x86/lib64/clang/9.0.4/include/avx512erintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/avx512erintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/avx512erintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/avx512fintrin.h b/darwin-x86/lib64/clang/9.0.4/include/avx512fintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/avx512fintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/avx512fintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/avx512ifmaintrin.h b/darwin-x86/lib64/clang/9.0.4/include/avx512ifmaintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/avx512ifmaintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/avx512ifmaintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/avx512ifmavlintrin.h b/darwin-x86/lib64/clang/9.0.4/include/avx512ifmavlintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/avx512ifmavlintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/avx512ifmavlintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/avx512pfintrin.h b/darwin-x86/lib64/clang/9.0.4/include/avx512pfintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/avx512pfintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/avx512pfintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/avx512vbmi2intrin.h b/darwin-x86/lib64/clang/9.0.4/include/avx512vbmi2intrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/avx512vbmi2intrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/avx512vbmi2intrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/avx512vbmiintrin.h b/darwin-x86/lib64/clang/9.0.4/include/avx512vbmiintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/avx512vbmiintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/avx512vbmiintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/avx512vbmivlintrin.h b/darwin-x86/lib64/clang/9.0.4/include/avx512vbmivlintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/avx512vbmivlintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/avx512vbmivlintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/avx512vlbitalgintrin.h b/darwin-x86/lib64/clang/9.0.4/include/avx512vlbitalgintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/avx512vlbitalgintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/avx512vlbitalgintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/avx512vlbwintrin.h b/darwin-x86/lib64/clang/9.0.4/include/avx512vlbwintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/avx512vlbwintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/avx512vlbwintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/avx512vlcdintrin.h b/darwin-x86/lib64/clang/9.0.4/include/avx512vlcdintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/avx512vlcdintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/avx512vlcdintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/avx512vldqintrin.h b/darwin-x86/lib64/clang/9.0.4/include/avx512vldqintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/avx512vldqintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/avx512vldqintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/avx512vlintrin.h b/darwin-x86/lib64/clang/9.0.4/include/avx512vlintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/avx512vlintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/avx512vlintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/avx512vlvbmi2intrin.h b/darwin-x86/lib64/clang/9.0.4/include/avx512vlvbmi2intrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/avx512vlvbmi2intrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/avx512vlvbmi2intrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/avx512vlvnniintrin.h b/darwin-x86/lib64/clang/9.0.4/include/avx512vlvnniintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/avx512vlvnniintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/avx512vlvnniintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/avx512vnniintrin.h b/darwin-x86/lib64/clang/9.0.4/include/avx512vnniintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/avx512vnniintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/avx512vnniintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/avx512vpopcntdqintrin.h b/darwin-x86/lib64/clang/9.0.4/include/avx512vpopcntdqintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/avx512vpopcntdqintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/avx512vpopcntdqintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/avx512vpopcntdqvlintrin.h b/darwin-x86/lib64/clang/9.0.4/include/avx512vpopcntdqvlintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/avx512vpopcntdqvlintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/avx512vpopcntdqvlintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/avxintrin.h b/darwin-x86/lib64/clang/9.0.4/include/avxintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/avxintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/avxintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/bmi2intrin.h b/darwin-x86/lib64/clang/9.0.4/include/bmi2intrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/bmi2intrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/bmi2intrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/bmiintrin.h b/darwin-x86/lib64/clang/9.0.4/include/bmiintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/bmiintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/bmiintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/cetintrin.h b/darwin-x86/lib64/clang/9.0.4/include/cetintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/cetintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/cetintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/cldemoteintrin.h b/darwin-x86/lib64/clang/9.0.4/include/cldemoteintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/cldemoteintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/cldemoteintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/clflushoptintrin.h b/darwin-x86/lib64/clang/9.0.4/include/clflushoptintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/clflushoptintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/clflushoptintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/clwbintrin.h b/darwin-x86/lib64/clang/9.0.4/include/clwbintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/clwbintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/clwbintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/clzerointrin.h b/darwin-x86/lib64/clang/9.0.4/include/clzerointrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/clzerointrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/clzerointrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/cpuid.h b/darwin-x86/lib64/clang/9.0.4/include/cpuid.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/cpuid.h
rename to darwin-x86/lib64/clang/9.0.4/include/cpuid.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/cuda_wrappers/algorithm b/darwin-x86/lib64/clang/9.0.4/include/cuda_wrappers/algorithm
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/cuda_wrappers/algorithm
rename to darwin-x86/lib64/clang/9.0.4/include/cuda_wrappers/algorithm
diff --git a/darwin-x86/lib64/clang/9.0.2/include/cuda_wrappers/complex b/darwin-x86/lib64/clang/9.0.4/include/cuda_wrappers/complex
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/cuda_wrappers/complex
rename to darwin-x86/lib64/clang/9.0.4/include/cuda_wrappers/complex
diff --git a/darwin-x86/lib64/clang/9.0.2/include/cuda_wrappers/new b/darwin-x86/lib64/clang/9.0.4/include/cuda_wrappers/new
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/cuda_wrappers/new
rename to darwin-x86/lib64/clang/9.0.4/include/cuda_wrappers/new
diff --git a/darwin-x86/lib64/clang/9.0.2/include/emmintrin.h b/darwin-x86/lib64/clang/9.0.4/include/emmintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/emmintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/emmintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/f16cintrin.h b/darwin-x86/lib64/clang/9.0.4/include/f16cintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/f16cintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/f16cintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/float.h b/darwin-x86/lib64/clang/9.0.4/include/float.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/float.h
rename to darwin-x86/lib64/clang/9.0.4/include/float.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/fma4intrin.h b/darwin-x86/lib64/clang/9.0.4/include/fma4intrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/fma4intrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/fma4intrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/fmaintrin.h b/darwin-x86/lib64/clang/9.0.4/include/fmaintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/fmaintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/fmaintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/fxsrintrin.h b/darwin-x86/lib64/clang/9.0.4/include/fxsrintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/fxsrintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/fxsrintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/gfniintrin.h b/darwin-x86/lib64/clang/9.0.4/include/gfniintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/gfniintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/gfniintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/htmintrin.h b/darwin-x86/lib64/clang/9.0.4/include/htmintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/htmintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/htmintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/htmxlintrin.h b/darwin-x86/lib64/clang/9.0.4/include/htmxlintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/htmxlintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/htmxlintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/ia32intrin.h b/darwin-x86/lib64/clang/9.0.4/include/ia32intrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/ia32intrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/ia32intrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/immintrin.h b/darwin-x86/lib64/clang/9.0.4/include/immintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/immintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/immintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/intrin.h b/darwin-x86/lib64/clang/9.0.4/include/intrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/intrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/intrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/inttypes.h b/darwin-x86/lib64/clang/9.0.4/include/inttypes.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/inttypes.h
rename to darwin-x86/lib64/clang/9.0.4/include/inttypes.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/invpcidintrin.h b/darwin-x86/lib64/clang/9.0.4/include/invpcidintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/invpcidintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/invpcidintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/iso646.h b/darwin-x86/lib64/clang/9.0.4/include/iso646.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/iso646.h
rename to darwin-x86/lib64/clang/9.0.4/include/iso646.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/limits.h b/darwin-x86/lib64/clang/9.0.4/include/limits.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/limits.h
rename to darwin-x86/lib64/clang/9.0.4/include/limits.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/lwpintrin.h b/darwin-x86/lib64/clang/9.0.4/include/lwpintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/lwpintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/lwpintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/lzcntintrin.h b/darwin-x86/lib64/clang/9.0.4/include/lzcntintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/lzcntintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/lzcntintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/mm3dnow.h b/darwin-x86/lib64/clang/9.0.4/include/mm3dnow.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/mm3dnow.h
rename to darwin-x86/lib64/clang/9.0.4/include/mm3dnow.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/mm_malloc.h b/darwin-x86/lib64/clang/9.0.4/include/mm_malloc.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/mm_malloc.h
rename to darwin-x86/lib64/clang/9.0.4/include/mm_malloc.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/mmintrin.h b/darwin-x86/lib64/clang/9.0.4/include/mmintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/mmintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/mmintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/module.modulemap b/darwin-x86/lib64/clang/9.0.4/include/module.modulemap
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/module.modulemap
rename to darwin-x86/lib64/clang/9.0.4/include/module.modulemap
diff --git a/darwin-x86/lib64/clang/9.0.2/include/movdirintrin.h b/darwin-x86/lib64/clang/9.0.4/include/movdirintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/movdirintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/movdirintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/msa.h b/darwin-x86/lib64/clang/9.0.4/include/msa.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/msa.h
rename to darwin-x86/lib64/clang/9.0.4/include/msa.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/mwaitxintrin.h b/darwin-x86/lib64/clang/9.0.4/include/mwaitxintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/mwaitxintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/mwaitxintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/nmmintrin.h b/darwin-x86/lib64/clang/9.0.4/include/nmmintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/nmmintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/nmmintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/opencl-c.h b/darwin-x86/lib64/clang/9.0.4/include/opencl-c.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/opencl-c.h
rename to darwin-x86/lib64/clang/9.0.4/include/opencl-c.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/pconfigintrin.h b/darwin-x86/lib64/clang/9.0.4/include/pconfigintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/pconfigintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/pconfigintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/pkuintrin.h b/darwin-x86/lib64/clang/9.0.4/include/pkuintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/pkuintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/pkuintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/pmmintrin.h b/darwin-x86/lib64/clang/9.0.4/include/pmmintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/pmmintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/pmmintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/popcntintrin.h b/darwin-x86/lib64/clang/9.0.4/include/popcntintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/popcntintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/popcntintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/prfchwintrin.h b/darwin-x86/lib64/clang/9.0.4/include/prfchwintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/prfchwintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/prfchwintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/ptwriteintrin.h b/darwin-x86/lib64/clang/9.0.4/include/ptwriteintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/ptwriteintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/ptwriteintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/rdseedintrin.h b/darwin-x86/lib64/clang/9.0.4/include/rdseedintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/rdseedintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/rdseedintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/rtmintrin.h b/darwin-x86/lib64/clang/9.0.4/include/rtmintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/rtmintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/rtmintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/s390intrin.h b/darwin-x86/lib64/clang/9.0.4/include/s390intrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/s390intrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/s390intrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/sanitizer/allocator_interface.h b/darwin-x86/lib64/clang/9.0.4/include/sanitizer/allocator_interface.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/sanitizer/allocator_interface.h
rename to darwin-x86/lib64/clang/9.0.4/include/sanitizer/allocator_interface.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/sanitizer/asan_interface.h b/darwin-x86/lib64/clang/9.0.4/include/sanitizer/asan_interface.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/sanitizer/asan_interface.h
rename to darwin-x86/lib64/clang/9.0.4/include/sanitizer/asan_interface.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/sanitizer/common_interface_defs.h b/darwin-x86/lib64/clang/9.0.4/include/sanitizer/common_interface_defs.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/sanitizer/common_interface_defs.h
rename to darwin-x86/lib64/clang/9.0.4/include/sanitizer/common_interface_defs.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/sanitizer/coverage_interface.h b/darwin-x86/lib64/clang/9.0.4/include/sanitizer/coverage_interface.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/sanitizer/coverage_interface.h
rename to darwin-x86/lib64/clang/9.0.4/include/sanitizer/coverage_interface.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/sanitizer/dfsan_interface.h b/darwin-x86/lib64/clang/9.0.4/include/sanitizer/dfsan_interface.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/sanitizer/dfsan_interface.h
rename to darwin-x86/lib64/clang/9.0.4/include/sanitizer/dfsan_interface.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/sanitizer/esan_interface.h b/darwin-x86/lib64/clang/9.0.4/include/sanitizer/esan_interface.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/sanitizer/esan_interface.h
rename to darwin-x86/lib64/clang/9.0.4/include/sanitizer/esan_interface.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/sanitizer/hwasan_interface.h b/darwin-x86/lib64/clang/9.0.4/include/sanitizer/hwasan_interface.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/sanitizer/hwasan_interface.h
rename to darwin-x86/lib64/clang/9.0.4/include/sanitizer/hwasan_interface.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/sanitizer/linux_syscall_hooks.h b/darwin-x86/lib64/clang/9.0.4/include/sanitizer/linux_syscall_hooks.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/sanitizer/linux_syscall_hooks.h
rename to darwin-x86/lib64/clang/9.0.4/include/sanitizer/linux_syscall_hooks.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/sanitizer/lsan_interface.h b/darwin-x86/lib64/clang/9.0.4/include/sanitizer/lsan_interface.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/sanitizer/lsan_interface.h
rename to darwin-x86/lib64/clang/9.0.4/include/sanitizer/lsan_interface.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/sanitizer/msan_interface.h b/darwin-x86/lib64/clang/9.0.4/include/sanitizer/msan_interface.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/sanitizer/msan_interface.h
rename to darwin-x86/lib64/clang/9.0.4/include/sanitizer/msan_interface.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/sanitizer/netbsd_syscall_hooks.h b/darwin-x86/lib64/clang/9.0.4/include/sanitizer/netbsd_syscall_hooks.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/sanitizer/netbsd_syscall_hooks.h
rename to darwin-x86/lib64/clang/9.0.4/include/sanitizer/netbsd_syscall_hooks.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/sanitizer/scudo_interface.h b/darwin-x86/lib64/clang/9.0.4/include/sanitizer/scudo_interface.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/sanitizer/scudo_interface.h
rename to darwin-x86/lib64/clang/9.0.4/include/sanitizer/scudo_interface.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/sanitizer/tsan_interface.h b/darwin-x86/lib64/clang/9.0.4/include/sanitizer/tsan_interface.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/sanitizer/tsan_interface.h
rename to darwin-x86/lib64/clang/9.0.4/include/sanitizer/tsan_interface.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/sanitizer/tsan_interface_atomic.h b/darwin-x86/lib64/clang/9.0.4/include/sanitizer/tsan_interface_atomic.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/sanitizer/tsan_interface_atomic.h
rename to darwin-x86/lib64/clang/9.0.4/include/sanitizer/tsan_interface_atomic.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/sgxintrin.h b/darwin-x86/lib64/clang/9.0.4/include/sgxintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/sgxintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/sgxintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/shaintrin.h b/darwin-x86/lib64/clang/9.0.4/include/shaintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/shaintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/shaintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/smmintrin.h b/darwin-x86/lib64/clang/9.0.4/include/smmintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/smmintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/smmintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/stdalign.h b/darwin-x86/lib64/clang/9.0.4/include/stdalign.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/stdalign.h
rename to darwin-x86/lib64/clang/9.0.4/include/stdalign.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/stdarg.h b/darwin-x86/lib64/clang/9.0.4/include/stdarg.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/stdarg.h
rename to darwin-x86/lib64/clang/9.0.4/include/stdarg.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/stdatomic.h b/darwin-x86/lib64/clang/9.0.4/include/stdatomic.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/stdatomic.h
rename to darwin-x86/lib64/clang/9.0.4/include/stdatomic.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/stdbool.h b/darwin-x86/lib64/clang/9.0.4/include/stdbool.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/stdbool.h
rename to darwin-x86/lib64/clang/9.0.4/include/stdbool.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/stddef.h b/darwin-x86/lib64/clang/9.0.4/include/stddef.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/stddef.h
rename to darwin-x86/lib64/clang/9.0.4/include/stddef.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/stdint.h b/darwin-x86/lib64/clang/9.0.4/include/stdint.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/stdint.h
rename to darwin-x86/lib64/clang/9.0.4/include/stdint.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/stdnoreturn.h b/darwin-x86/lib64/clang/9.0.4/include/stdnoreturn.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/stdnoreturn.h
rename to darwin-x86/lib64/clang/9.0.4/include/stdnoreturn.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/tbmintrin.h b/darwin-x86/lib64/clang/9.0.4/include/tbmintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/tbmintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/tbmintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/tgmath.h b/darwin-x86/lib64/clang/9.0.4/include/tgmath.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/tgmath.h
rename to darwin-x86/lib64/clang/9.0.4/include/tgmath.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/tmmintrin.h b/darwin-x86/lib64/clang/9.0.4/include/tmmintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/tmmintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/tmmintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/unwind.h b/darwin-x86/lib64/clang/9.0.4/include/unwind.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/unwind.h
rename to darwin-x86/lib64/clang/9.0.4/include/unwind.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/vadefs.h b/darwin-x86/lib64/clang/9.0.4/include/vadefs.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/vadefs.h
rename to darwin-x86/lib64/clang/9.0.4/include/vadefs.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/vaesintrin.h b/darwin-x86/lib64/clang/9.0.4/include/vaesintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/vaesintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/vaesintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/varargs.h b/darwin-x86/lib64/clang/9.0.4/include/varargs.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/varargs.h
rename to darwin-x86/lib64/clang/9.0.4/include/varargs.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/vecintrin.h b/darwin-x86/lib64/clang/9.0.4/include/vecintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/vecintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/vecintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/vpclmulqdqintrin.h b/darwin-x86/lib64/clang/9.0.4/include/vpclmulqdqintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/vpclmulqdqintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/vpclmulqdqintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/waitpkgintrin.h b/darwin-x86/lib64/clang/9.0.4/include/waitpkgintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/waitpkgintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/waitpkgintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/wbnoinvdintrin.h b/darwin-x86/lib64/clang/9.0.4/include/wbnoinvdintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/wbnoinvdintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/wbnoinvdintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/wmmintrin.h b/darwin-x86/lib64/clang/9.0.4/include/wmmintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/wmmintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/wmmintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/x86intrin.h b/darwin-x86/lib64/clang/9.0.4/include/x86intrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/x86intrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/x86intrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/xmmintrin.h b/darwin-x86/lib64/clang/9.0.4/include/xmmintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/xmmintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/xmmintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/xopintrin.h b/darwin-x86/lib64/clang/9.0.4/include/xopintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/xopintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/xopintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/xsavecintrin.h b/darwin-x86/lib64/clang/9.0.4/include/xsavecintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/xsavecintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/xsavecintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/xsaveintrin.h b/darwin-x86/lib64/clang/9.0.4/include/xsaveintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/xsaveintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/xsaveintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/xsaveoptintrin.h b/darwin-x86/lib64/clang/9.0.4/include/xsaveoptintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/xsaveoptintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/xsaveoptintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/xsavesintrin.h b/darwin-x86/lib64/clang/9.0.4/include/xsavesintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/xsavesintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/xsavesintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/include/xtestintrin.h b/darwin-x86/lib64/clang/9.0.4/include/xtestintrin.h
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/include/xtestintrin.h
rename to darwin-x86/lib64/clang/9.0.4/include/xtestintrin.h
diff --git a/darwin-x86/lib64/clang/9.0.2/share/asan_blacklist.txt b/darwin-x86/lib64/clang/9.0.4/share/asan_blacklist.txt
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/share/asan_blacklist.txt
rename to darwin-x86/lib64/clang/9.0.4/share/asan_blacklist.txt
diff --git a/darwin-x86/lib64/clang/9.0.2/share/cfi_blacklist.txt b/darwin-x86/lib64/clang/9.0.4/share/cfi_blacklist.txt
similarity index 100%
rename from darwin-x86/lib64/clang/9.0.2/share/cfi_blacklist.txt
rename to darwin-x86/lib64/clang/9.0.4/share/cfi_blacklist.txt
diff --git a/darwin-x86/lib64/libLLVM.dylib b/darwin-x86/lib64/libLLVM.dylib
index d3c2dc3..c3fbe7a 100755
--- a/darwin-x86/lib64/libLLVM.dylib
+++ b/darwin-x86/lib64/libLLVM.dylib
Binary files differ
diff --git a/darwin-x86/lib64/libbase.dylib b/darwin-x86/lib64/libbase.dylib
index 6d3c269..b786936 100755
--- a/darwin-x86/lib64/libbase.dylib
+++ b/darwin-x86/lib64/libbase.dylib
Binary files differ
diff --git a/darwin-x86/lib64/libc++.dylib b/darwin-x86/lib64/libc++.dylib
index 93ce793..1d8e41b 100755
--- a/darwin-x86/lib64/libc++.dylib
+++ b/darwin-x86/lib64/libc++.dylib
Binary files differ
diff --git a/darwin-x86/lib64/libc++abi.1.dylib b/darwin-x86/lib64/libc++abi.1.dylib
index f675b99..e4777ae 100755
--- a/darwin-x86/lib64/libc++abi.1.dylib
+++ b/darwin-x86/lib64/libc++abi.1.dylib
Binary files differ
diff --git a/darwin-x86/lib64/libclang_cxx.dylib b/darwin-x86/lib64/libclang_cxx.dylib
index eb58689..c23aa3c 100755
--- a/darwin-x86/lib64/libclang_cxx.dylib
+++ b/darwin-x86/lib64/libclang_cxx.dylib
Binary files differ
diff --git a/darwin-x86/lib64/liblog.dylib b/darwin-x86/lib64/liblog.dylib
index c1135e2..3cddecb 100755
--- a/darwin-x86/lib64/liblog.dylib
+++ b/darwin-x86/lib64/liblog.dylib
Binary files differ
diff --git a/darwin-x86/lib64/libprotobuf-cpp-full.dylib b/darwin-x86/lib64/libprotobuf-cpp-full.dylib
index b879005..185c250 100755
--- a/darwin-x86/lib64/libprotobuf-cpp-full.dylib
+++ b/darwin-x86/lib64/libprotobuf-cpp-full.dylib
Binary files differ
diff --git a/darwin-x86/lib64/libz-host.dylib b/darwin-x86/lib64/libz-host.dylib
index a58ec11..a4fdfaf 100755
--- a/darwin-x86/lib64/libz-host.dylib
+++ b/darwin-x86/lib64/libz-host.dylib
Binary files differ
diff --git a/linux-x86/bin/header-abi-diff b/linux-x86/bin/header-abi-diff
index cad2b35..71f41e4 100755
--- a/linux-x86/bin/header-abi-diff
+++ b/linux-x86/bin/header-abi-diff
Binary files differ
diff --git a/linux-x86/bin/header-abi-dumper b/linux-x86/bin/header-abi-dumper
index 6e66401..8d25d9e 100755
--- a/linux-x86/bin/header-abi-dumper
+++ b/linux-x86/bin/header-abi-dumper
Binary files differ
diff --git a/linux-x86/bin/header-abi-linker b/linux-x86/bin/header-abi-linker
index fc50814..de1a090 100755
--- a/linux-x86/bin/header-abi-linker
+++ b/linux-x86/bin/header-abi-linker
Binary files differ
diff --git a/linux-x86/bin/merge-abi-diff b/linux-x86/bin/merge-abi-diff
index 2321ed7..84a7144 100755
--- a/linux-x86/bin/merge-abi-diff
+++ b/linux-x86/bin/merge-abi-diff
Binary files differ
diff --git a/linux-x86/bin/versioner b/linux-x86/bin/versioner
index 1b54abc..6a91e3b 100755
--- a/linux-x86/bin/versioner
+++ b/linux-x86/bin/versioner
Binary files differ
diff --git a/linux-x86/clang-headers b/linux-x86/clang-headers
index c320a11..3522aa7 120000
--- a/linux-x86/clang-headers
+++ b/linux-x86/clang-headers
@@ -1 +1 @@
-lib64/clang/9.0.2/include
\ No newline at end of file
+lib64/clang/9.0.4/include
\ No newline at end of file
diff --git a/linux-x86/lib64/clang/9.0.2/include/omp.h b/linux-x86/lib64/clang/9.0.2/include/omp.h
deleted file mode 100644
index 28db2f4..0000000
--- a/linux-x86/lib64/clang/9.0.2/include/omp.h
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * include/50/omp.h.var
- */
-
-
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-
-#ifndef __OMP_H
-#   define __OMP_H
-
-#   define KMP_VERSION_MAJOR    5
-#   define KMP_VERSION_MINOR    0
-#   define KMP_VERSION_BUILD    20140926
-#   define KMP_BUILD_DATE       "No_Timestamp"
-
-#   ifdef __cplusplus
-    extern "C" {
-#   endif
-
-#   define omp_set_affinity_format   ompc_set_affinity_format
-#   define omp_get_affinity_format   ompc_get_affinity_format
-#   define omp_display_affinity      ompc_display_affinity
-#   define omp_capture_affinity      ompc_capture_affinity
-
-#   if defined(_WIN32)
-#       define __KAI_KMPC_CONVENTION __cdecl
-#       ifndef __KMP_IMP
-#           define __KMP_IMP __declspec(dllimport)
-#       endif
-#   else
-#       define __KAI_KMPC_CONVENTION
-#       ifndef __KMP_IMP
-#           define __KMP_IMP
-#       endif
-#   endif
-
-    /* schedule kind constants */
-    typedef enum omp_sched_t {
-	omp_sched_static  = 1,
-	omp_sched_dynamic = 2,
-	omp_sched_guided  = 3,
-	omp_sched_auto    = 4
-    } omp_sched_t;
-
-    /* set API functions */
-    extern void   __KAI_KMPC_CONVENTION  omp_set_num_threads (int);
-    extern void   __KAI_KMPC_CONVENTION  omp_set_dynamic     (int);
-    extern void   __KAI_KMPC_CONVENTION  omp_set_nested      (int);
-    extern void   __KAI_KMPC_CONVENTION  omp_set_max_active_levels (int);
-    extern void   __KAI_KMPC_CONVENTION  omp_set_schedule          (omp_sched_t, int);
-
-    /* query API functions */
-    extern int    __KAI_KMPC_CONVENTION  omp_get_num_threads  (void);
-    extern int    __KAI_KMPC_CONVENTION  omp_get_dynamic      (void);
-    extern int    __KAI_KMPC_CONVENTION  omp_get_nested       (void);
-    extern int    __KAI_KMPC_CONVENTION  omp_get_max_threads  (void);
-    extern int    __KAI_KMPC_CONVENTION  omp_get_thread_num   (void);
-    extern int    __KAI_KMPC_CONVENTION  omp_get_num_procs    (void);
-    extern int    __KAI_KMPC_CONVENTION  omp_in_parallel      (void);
-    extern int    __KAI_KMPC_CONVENTION  omp_in_final         (void);
-    extern int    __KAI_KMPC_CONVENTION  omp_get_active_level        (void);
-    extern int    __KAI_KMPC_CONVENTION  omp_get_level               (void);
-    extern int    __KAI_KMPC_CONVENTION  omp_get_ancestor_thread_num (int);
-    extern int    __KAI_KMPC_CONVENTION  omp_get_team_size           (int);
-    extern int    __KAI_KMPC_CONVENTION  omp_get_thread_limit        (void);
-    extern int    __KAI_KMPC_CONVENTION  omp_get_max_active_levels   (void);
-    extern void   __KAI_KMPC_CONVENTION  omp_get_schedule            (omp_sched_t *, int *);
-    extern int    __KAI_KMPC_CONVENTION  omp_get_max_task_priority   (void);
-
-    /* lock API functions */
-    typedef struct omp_lock_t {
-        void * _lk;
-    } omp_lock_t;
-
-    extern void   __KAI_KMPC_CONVENTION  omp_init_lock    (omp_lock_t *);
-    extern void   __KAI_KMPC_CONVENTION  omp_set_lock     (omp_lock_t *);
-    extern void   __KAI_KMPC_CONVENTION  omp_unset_lock   (omp_lock_t *);
-    extern void   __KAI_KMPC_CONVENTION  omp_destroy_lock (omp_lock_t *);
-    extern int    __KAI_KMPC_CONVENTION  omp_test_lock    (omp_lock_t *);
-
-    /* nested lock API functions */
-    typedef struct omp_nest_lock_t {
-        void * _lk;
-    } omp_nest_lock_t;
-
-    extern void   __KAI_KMPC_CONVENTION  omp_init_nest_lock    (omp_nest_lock_t *);
-    extern void   __KAI_KMPC_CONVENTION  omp_set_nest_lock     (omp_nest_lock_t *);
-    extern void   __KAI_KMPC_CONVENTION  omp_unset_nest_lock   (omp_nest_lock_t *);
-    extern void   __KAI_KMPC_CONVENTION  omp_destroy_nest_lock (omp_nest_lock_t *);
-    extern int    __KAI_KMPC_CONVENTION  omp_test_nest_lock    (omp_nest_lock_t *);
-
-    /* OpenMP 5.0  Synchronization hints*/
-    typedef enum omp_sync_hint_t {
-        omp_sync_hint_none           = 0,
-        omp_lock_hint_none           = omp_sync_hint_none,
-        omp_sync_hint_uncontended    = 1,
-        omp_lock_hint_uncontended    = omp_sync_hint_uncontended,
-        omp_sync_hint_contended      = (1<<1),
-        omp_lock_hint_contended      = omp_sync_hint_contended,
-        omp_sync_hint_nonspeculative = (1<<2),
-        omp_lock_hint_nonspeculative = omp_sync_hint_nonspeculative,
-        omp_sync_hint_speculative    = (1<<3),
-        omp_lock_hint_speculative    = omp_sync_hint_speculative,
-        kmp_lock_hint_hle            = (1<<16),
-        kmp_lock_hint_rtm            = (1<<17),
-        kmp_lock_hint_adaptive       = (1<<18)
-    } omp_sync_hint_t;
-
-    /* lock hint type for dynamic user lock */
-    typedef omp_sync_hint_t omp_lock_hint_t;
-
-    /* hinted lock initializers */
-    extern void __KAI_KMPC_CONVENTION omp_init_lock_with_hint(omp_lock_t *, omp_lock_hint_t);
-    extern void __KAI_KMPC_CONVENTION omp_init_nest_lock_with_hint(omp_nest_lock_t *, omp_lock_hint_t);
-
-    /* time API functions */
-    extern double __KAI_KMPC_CONVENTION  omp_get_wtime (void);
-    extern double __KAI_KMPC_CONVENTION  omp_get_wtick (void);
-
-    /* OpenMP 4.0 */
-    extern int  __KAI_KMPC_CONVENTION  omp_get_default_device (void);
-    extern void __KAI_KMPC_CONVENTION  omp_set_default_device (int);
-    extern int  __KAI_KMPC_CONVENTION  omp_is_initial_device (void);
-    extern int  __KAI_KMPC_CONVENTION  omp_get_num_devices (void);
-    extern int  __KAI_KMPC_CONVENTION  omp_get_num_teams (void);
-    extern int  __KAI_KMPC_CONVENTION  omp_get_team_num (void);
-    extern int  __KAI_KMPC_CONVENTION  omp_get_cancellation (void);
-
-#   include <stdlib.h>
-    /* OpenMP 4.5 */
-    extern int   __KAI_KMPC_CONVENTION  omp_get_initial_device (void);
-    extern void* __KAI_KMPC_CONVENTION  omp_target_alloc(size_t, int);
-    extern void  __KAI_KMPC_CONVENTION  omp_target_free(void *, int);
-    extern int   __KAI_KMPC_CONVENTION  omp_target_is_present(void *, int);
-    extern int   __KAI_KMPC_CONVENTION  omp_target_memcpy(void *, void *, size_t, size_t, size_t, int, int);
-    extern int   __KAI_KMPC_CONVENTION  omp_target_memcpy_rect(void *, void *, size_t, int, const size_t *,
-                                            const size_t *, const size_t *, const size_t *, const size_t *, int, int);
-    extern int   __KAI_KMPC_CONVENTION  omp_target_associate_ptr(void *, void *, size_t, size_t, int);
-    extern int   __KAI_KMPC_CONVENTION  omp_target_disassociate_ptr(void *, int);
-
-    /* OpenMP 5.0 */
-    extern int   __KAI_KMPC_CONVENTION  omp_get_device_num (void);
-
-    /* kmp API functions */
-    extern int    __KAI_KMPC_CONVENTION  kmp_get_stacksize          (void);
-    extern void   __KAI_KMPC_CONVENTION  kmp_set_stacksize          (int);
-    extern size_t __KAI_KMPC_CONVENTION  kmp_get_stacksize_s        (void);
-    extern void   __KAI_KMPC_CONVENTION  kmp_set_stacksize_s        (size_t);
-    extern int    __KAI_KMPC_CONVENTION  kmp_get_blocktime          (void);
-    extern int    __KAI_KMPC_CONVENTION  kmp_get_library            (void);
-    extern void   __KAI_KMPC_CONVENTION  kmp_set_blocktime          (int);
-    extern void   __KAI_KMPC_CONVENTION  kmp_set_library            (int);
-    extern void   __KAI_KMPC_CONVENTION  kmp_set_library_serial     (void);
-    extern void   __KAI_KMPC_CONVENTION  kmp_set_library_turnaround (void);
-    extern void   __KAI_KMPC_CONVENTION  kmp_set_library_throughput (void);
-    extern void   __KAI_KMPC_CONVENTION  kmp_set_defaults           (char const *);
-    extern void   __KAI_KMPC_CONVENTION  kmp_set_disp_num_buffers   (int);
-
-    /* Intel affinity API */
-    typedef void * kmp_affinity_mask_t;
-
-    extern int    __KAI_KMPC_CONVENTION  kmp_set_affinity             (kmp_affinity_mask_t *);
-    extern int    __KAI_KMPC_CONVENTION  kmp_get_affinity             (kmp_affinity_mask_t *);
-    extern int    __KAI_KMPC_CONVENTION  kmp_get_affinity_max_proc    (void);
-    extern void   __KAI_KMPC_CONVENTION  kmp_create_affinity_mask     (kmp_affinity_mask_t *);
-    extern void   __KAI_KMPC_CONVENTION  kmp_destroy_affinity_mask    (kmp_affinity_mask_t *);
-    extern int    __KAI_KMPC_CONVENTION  kmp_set_affinity_mask_proc   (int, kmp_affinity_mask_t *);
-    extern int    __KAI_KMPC_CONVENTION  kmp_unset_affinity_mask_proc (int, kmp_affinity_mask_t *);
-    extern int    __KAI_KMPC_CONVENTION  kmp_get_affinity_mask_proc   (int, kmp_affinity_mask_t *);
-
-    /* OpenMP 4.0 affinity API */
-    typedef enum omp_proc_bind_t {
-        omp_proc_bind_false = 0,
-        omp_proc_bind_true = 1,
-        omp_proc_bind_master = 2,
-        omp_proc_bind_close = 3,
-        omp_proc_bind_spread = 4
-    } omp_proc_bind_t;
-
-    extern omp_proc_bind_t __KAI_KMPC_CONVENTION omp_get_proc_bind (void);
-
-    /* OpenMP 4.5 affinity API */
-    extern int  __KAI_KMPC_CONVENTION omp_get_num_places (void);
-    extern int  __KAI_KMPC_CONVENTION omp_get_place_num_procs (int);
-    extern void __KAI_KMPC_CONVENTION omp_get_place_proc_ids (int, int *);
-    extern int  __KAI_KMPC_CONVENTION omp_get_place_num (void);
-    extern int  __KAI_KMPC_CONVENTION omp_get_partition_num_places (void);
-    extern void __KAI_KMPC_CONVENTION omp_get_partition_place_nums (int *);
-
-    extern void * __KAI_KMPC_CONVENTION  kmp_malloc  (size_t);
-    extern void * __KAI_KMPC_CONVENTION  kmp_aligned_malloc  (size_t, size_t);
-    extern void * __KAI_KMPC_CONVENTION  kmp_calloc  (size_t, size_t);
-    extern void * __KAI_KMPC_CONVENTION  kmp_realloc (void *, size_t);
-    extern void   __KAI_KMPC_CONVENTION  kmp_free    (void *);
-
-    extern void   __KAI_KMPC_CONVENTION  kmp_set_warnings_on(void);
-    extern void   __KAI_KMPC_CONVENTION  kmp_set_warnings_off(void);
-
-    /* OpenMP 5.0 Tool Control */
-    typedef enum omp_control_tool_result_t {
-        omp_control_tool_notool = -2,
-        omp_control_tool_nocallback = -1,
-        omp_control_tool_success = 0,
-        omp_control_tool_ignored = 1
-    } omp_control_tool_result_t;
-
-    typedef enum omp_control_tool_t {
-        omp_control_tool_start = 1,
-        omp_control_tool_pause = 2,
-        omp_control_tool_flush = 3,
-        omp_control_tool_end = 4
-    } omp_control_tool_t;
-    
-    extern int __KAI_KMPC_CONVENTION omp_control_tool(int, int, void*);
-
-    /* OpenMP 5.0 Memory Management */
-    typedef void *omp_allocator_t;
-    extern __KMP_IMP const omp_allocator_t *OMP_NULL_ALLOCATOR;
-    extern __KMP_IMP const omp_allocator_t *omp_default_mem_alloc;
-    extern __KMP_IMP const omp_allocator_t *omp_large_cap_mem_alloc;
-    extern __KMP_IMP const omp_allocator_t *omp_const_mem_alloc;
-    extern __KMP_IMP const omp_allocator_t *omp_high_bw_mem_alloc;
-    extern __KMP_IMP const omp_allocator_t *omp_low_lat_mem_alloc;
-    extern __KMP_IMP const omp_allocator_t *omp_cgroup_mem_alloc;
-    extern __KMP_IMP const omp_allocator_t *omp_pteam_mem_alloc;
-    extern __KMP_IMP const omp_allocator_t *omp_thread_mem_alloc;
-
-    extern void __KAI_KMPC_CONVENTION omp_set_default_allocator(const omp_allocator_t *);
-    extern const omp_allocator_t * __KAI_KMPC_CONVENTION omp_get_default_allocator(void);
-#ifdef __cplusplus
-    extern void *__KAI_KMPC_CONVENTION omp_alloc(size_t size, const omp_allocator_t *allocator = OMP_NULL_ALLOCATOR);
-    extern void __KAI_KMPC_CONVENTION omp_free(void * ptr, const omp_allocator_t *allocator = OMP_NULL_ALLOCATOR);
-#else
-    extern void *__KAI_KMPC_CONVENTION omp_alloc(size_t size, const omp_allocator_t *allocator);
-    extern void __KAI_KMPC_CONVENTION omp_free(void *ptr, const omp_allocator_t *allocator);
-#endif
-
-    /* OpenMP 5.0 Affinity Format */
-    extern void __KAI_KMPC_CONVENTION omp_set_affinity_format(char const *);
-    extern size_t __KAI_KMPC_CONVENTION omp_get_affinity_format(char *, size_t);
-    extern void __KAI_KMPC_CONVENTION omp_display_affinity(char const *);
-    extern size_t __KAI_KMPC_CONVENTION omp_capture_affinity(char *, size_t, char const *);
-
-    /* OpenMP 5.0 Pause Resources */
-    typedef enum omp_pause_resource_t {
-      omp_pause_resume = 0,
-      omp_pause_soft = 1,
-      omp_pause_hard = 2
-    } omp_pause_resource_t;
-    extern int __KAI_KMPC_CONVENTION omp_pause_resource(omp_pause_resource_t, int);
-    extern int __KAI_KMPC_CONVENTION omp_pause_resource_all(omp_pause_resource_t);
-
-#   undef __KAI_KMPC_CONVENTION
-#   undef __KMP_IMP
-
-    /* Warning:
-       The following typedefs are not standard, deprecated and will be removed in a future release.
-    */
-    typedef int     omp_int_t;
-    typedef double  omp_wtime_t;
-
-#   ifdef __cplusplus
-    }
-#   endif
-
-#endif /* __OMP_H */
diff --git a/linux-x86/lib64/clang/9.0.2/include/__clang_cuda_builtin_vars.h b/linux-x86/lib64/clang/9.0.4/include/__clang_cuda_builtin_vars.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/__clang_cuda_builtin_vars.h
rename to linux-x86/lib64/clang/9.0.4/include/__clang_cuda_builtin_vars.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/__clang_cuda_cmath.h b/linux-x86/lib64/clang/9.0.4/include/__clang_cuda_cmath.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/__clang_cuda_cmath.h
rename to linux-x86/lib64/clang/9.0.4/include/__clang_cuda_cmath.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/__clang_cuda_complex_builtins.h b/linux-x86/lib64/clang/9.0.4/include/__clang_cuda_complex_builtins.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/__clang_cuda_complex_builtins.h
rename to linux-x86/lib64/clang/9.0.4/include/__clang_cuda_complex_builtins.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/__clang_cuda_device_functions.h b/linux-x86/lib64/clang/9.0.4/include/__clang_cuda_device_functions.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/__clang_cuda_device_functions.h
rename to linux-x86/lib64/clang/9.0.4/include/__clang_cuda_device_functions.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/__clang_cuda_intrinsics.h b/linux-x86/lib64/clang/9.0.4/include/__clang_cuda_intrinsics.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/__clang_cuda_intrinsics.h
rename to linux-x86/lib64/clang/9.0.4/include/__clang_cuda_intrinsics.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/__clang_cuda_libdevice_declares.h b/linux-x86/lib64/clang/9.0.4/include/__clang_cuda_libdevice_declares.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/__clang_cuda_libdevice_declares.h
rename to linux-x86/lib64/clang/9.0.4/include/__clang_cuda_libdevice_declares.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/__clang_cuda_math_forward_declares.h b/linux-x86/lib64/clang/9.0.4/include/__clang_cuda_math_forward_declares.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/__clang_cuda_math_forward_declares.h
rename to linux-x86/lib64/clang/9.0.4/include/__clang_cuda_math_forward_declares.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/__clang_cuda_runtime_wrapper.h b/linux-x86/lib64/clang/9.0.4/include/__clang_cuda_runtime_wrapper.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/__clang_cuda_runtime_wrapper.h
rename to linux-x86/lib64/clang/9.0.4/include/__clang_cuda_runtime_wrapper.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/__stddef_max_align_t.h b/linux-x86/lib64/clang/9.0.4/include/__stddef_max_align_t.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/__stddef_max_align_t.h
rename to linux-x86/lib64/clang/9.0.4/include/__stddef_max_align_t.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/__wmmintrin_aes.h b/linux-x86/lib64/clang/9.0.4/include/__wmmintrin_aes.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/__wmmintrin_aes.h
rename to linux-x86/lib64/clang/9.0.4/include/__wmmintrin_aes.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/__wmmintrin_pclmul.h b/linux-x86/lib64/clang/9.0.4/include/__wmmintrin_pclmul.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/__wmmintrin_pclmul.h
rename to linux-x86/lib64/clang/9.0.4/include/__wmmintrin_pclmul.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/adxintrin.h b/linux-x86/lib64/clang/9.0.4/include/adxintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/adxintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/adxintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/altivec.h b/linux-x86/lib64/clang/9.0.4/include/altivec.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/altivec.h
rename to linux-x86/lib64/clang/9.0.4/include/altivec.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/ammintrin.h b/linux-x86/lib64/clang/9.0.4/include/ammintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/ammintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/ammintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/arm64intr.h b/linux-x86/lib64/clang/9.0.4/include/arm64intr.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/arm64intr.h
rename to linux-x86/lib64/clang/9.0.4/include/arm64intr.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/arm_acle.h b/linux-x86/lib64/clang/9.0.4/include/arm_acle.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/arm_acle.h
rename to linux-x86/lib64/clang/9.0.4/include/arm_acle.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/arm_fp16.h b/linux-x86/lib64/clang/9.0.4/include/arm_fp16.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/arm_fp16.h
rename to linux-x86/lib64/clang/9.0.4/include/arm_fp16.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/arm_neon.h b/linux-x86/lib64/clang/9.0.4/include/arm_neon.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/arm_neon.h
rename to linux-x86/lib64/clang/9.0.4/include/arm_neon.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/armintr.h b/linux-x86/lib64/clang/9.0.4/include/armintr.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/armintr.h
rename to linux-x86/lib64/clang/9.0.4/include/armintr.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/avx2intrin.h b/linux-x86/lib64/clang/9.0.4/include/avx2intrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/avx2intrin.h
rename to linux-x86/lib64/clang/9.0.4/include/avx2intrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/avx512bitalgintrin.h b/linux-x86/lib64/clang/9.0.4/include/avx512bitalgintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/avx512bitalgintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/avx512bitalgintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/avx512bwintrin.h b/linux-x86/lib64/clang/9.0.4/include/avx512bwintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/avx512bwintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/avx512bwintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/avx512cdintrin.h b/linux-x86/lib64/clang/9.0.4/include/avx512cdintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/avx512cdintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/avx512cdintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/avx512dqintrin.h b/linux-x86/lib64/clang/9.0.4/include/avx512dqintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/avx512dqintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/avx512dqintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/avx512erintrin.h b/linux-x86/lib64/clang/9.0.4/include/avx512erintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/avx512erintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/avx512erintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/avx512fintrin.h b/linux-x86/lib64/clang/9.0.4/include/avx512fintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/avx512fintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/avx512fintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/avx512ifmaintrin.h b/linux-x86/lib64/clang/9.0.4/include/avx512ifmaintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/avx512ifmaintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/avx512ifmaintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/avx512ifmavlintrin.h b/linux-x86/lib64/clang/9.0.4/include/avx512ifmavlintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/avx512ifmavlintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/avx512ifmavlintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/avx512pfintrin.h b/linux-x86/lib64/clang/9.0.4/include/avx512pfintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/avx512pfintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/avx512pfintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/avx512vbmi2intrin.h b/linux-x86/lib64/clang/9.0.4/include/avx512vbmi2intrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/avx512vbmi2intrin.h
rename to linux-x86/lib64/clang/9.0.4/include/avx512vbmi2intrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/avx512vbmiintrin.h b/linux-x86/lib64/clang/9.0.4/include/avx512vbmiintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/avx512vbmiintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/avx512vbmiintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/avx512vbmivlintrin.h b/linux-x86/lib64/clang/9.0.4/include/avx512vbmivlintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/avx512vbmivlintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/avx512vbmivlintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/avx512vlbitalgintrin.h b/linux-x86/lib64/clang/9.0.4/include/avx512vlbitalgintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/avx512vlbitalgintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/avx512vlbitalgintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/avx512vlbwintrin.h b/linux-x86/lib64/clang/9.0.4/include/avx512vlbwintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/avx512vlbwintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/avx512vlbwintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/avx512vlcdintrin.h b/linux-x86/lib64/clang/9.0.4/include/avx512vlcdintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/avx512vlcdintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/avx512vlcdintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/avx512vldqintrin.h b/linux-x86/lib64/clang/9.0.4/include/avx512vldqintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/avx512vldqintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/avx512vldqintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/avx512vlintrin.h b/linux-x86/lib64/clang/9.0.4/include/avx512vlintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/avx512vlintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/avx512vlintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/avx512vlvbmi2intrin.h b/linux-x86/lib64/clang/9.0.4/include/avx512vlvbmi2intrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/avx512vlvbmi2intrin.h
rename to linux-x86/lib64/clang/9.0.4/include/avx512vlvbmi2intrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/avx512vlvnniintrin.h b/linux-x86/lib64/clang/9.0.4/include/avx512vlvnniintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/avx512vlvnniintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/avx512vlvnniintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/avx512vnniintrin.h b/linux-x86/lib64/clang/9.0.4/include/avx512vnniintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/avx512vnniintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/avx512vnniintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/avx512vpopcntdqintrin.h b/linux-x86/lib64/clang/9.0.4/include/avx512vpopcntdqintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/avx512vpopcntdqintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/avx512vpopcntdqintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/avx512vpopcntdqvlintrin.h b/linux-x86/lib64/clang/9.0.4/include/avx512vpopcntdqvlintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/avx512vpopcntdqvlintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/avx512vpopcntdqvlintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/avxintrin.h b/linux-x86/lib64/clang/9.0.4/include/avxintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/avxintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/avxintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/bmi2intrin.h b/linux-x86/lib64/clang/9.0.4/include/bmi2intrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/bmi2intrin.h
rename to linux-x86/lib64/clang/9.0.4/include/bmi2intrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/bmiintrin.h b/linux-x86/lib64/clang/9.0.4/include/bmiintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/bmiintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/bmiintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/cetintrin.h b/linux-x86/lib64/clang/9.0.4/include/cetintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/cetintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/cetintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/cldemoteintrin.h b/linux-x86/lib64/clang/9.0.4/include/cldemoteintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/cldemoteintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/cldemoteintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/clflushoptintrin.h b/linux-x86/lib64/clang/9.0.4/include/clflushoptintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/clflushoptintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/clflushoptintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/clwbintrin.h b/linux-x86/lib64/clang/9.0.4/include/clwbintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/clwbintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/clwbintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/clzerointrin.h b/linux-x86/lib64/clang/9.0.4/include/clzerointrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/clzerointrin.h
rename to linux-x86/lib64/clang/9.0.4/include/clzerointrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/cpuid.h b/linux-x86/lib64/clang/9.0.4/include/cpuid.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/cpuid.h
rename to linux-x86/lib64/clang/9.0.4/include/cpuid.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/cuda_wrappers/algorithm b/linux-x86/lib64/clang/9.0.4/include/cuda_wrappers/algorithm
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/cuda_wrappers/algorithm
rename to linux-x86/lib64/clang/9.0.4/include/cuda_wrappers/algorithm
diff --git a/linux-x86/lib64/clang/9.0.2/include/cuda_wrappers/complex b/linux-x86/lib64/clang/9.0.4/include/cuda_wrappers/complex
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/cuda_wrappers/complex
rename to linux-x86/lib64/clang/9.0.4/include/cuda_wrappers/complex
diff --git a/linux-x86/lib64/clang/9.0.2/include/cuda_wrappers/new b/linux-x86/lib64/clang/9.0.4/include/cuda_wrappers/new
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/cuda_wrappers/new
rename to linux-x86/lib64/clang/9.0.4/include/cuda_wrappers/new
diff --git a/linux-x86/lib64/clang/9.0.2/include/emmintrin.h b/linux-x86/lib64/clang/9.0.4/include/emmintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/emmintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/emmintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/f16cintrin.h b/linux-x86/lib64/clang/9.0.4/include/f16cintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/f16cintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/f16cintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/float.h b/linux-x86/lib64/clang/9.0.4/include/float.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/float.h
rename to linux-x86/lib64/clang/9.0.4/include/float.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/fma4intrin.h b/linux-x86/lib64/clang/9.0.4/include/fma4intrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/fma4intrin.h
rename to linux-x86/lib64/clang/9.0.4/include/fma4intrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/fmaintrin.h b/linux-x86/lib64/clang/9.0.4/include/fmaintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/fmaintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/fmaintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/fxsrintrin.h b/linux-x86/lib64/clang/9.0.4/include/fxsrintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/fxsrintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/fxsrintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/gfniintrin.h b/linux-x86/lib64/clang/9.0.4/include/gfniintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/gfniintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/gfniintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/htmintrin.h b/linux-x86/lib64/clang/9.0.4/include/htmintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/htmintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/htmintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/htmxlintrin.h b/linux-x86/lib64/clang/9.0.4/include/htmxlintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/htmxlintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/htmxlintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/ia32intrin.h b/linux-x86/lib64/clang/9.0.4/include/ia32intrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/ia32intrin.h
rename to linux-x86/lib64/clang/9.0.4/include/ia32intrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/immintrin.h b/linux-x86/lib64/clang/9.0.4/include/immintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/immintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/immintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/intrin.h b/linux-x86/lib64/clang/9.0.4/include/intrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/intrin.h
rename to linux-x86/lib64/clang/9.0.4/include/intrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/inttypes.h b/linux-x86/lib64/clang/9.0.4/include/inttypes.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/inttypes.h
rename to linux-x86/lib64/clang/9.0.4/include/inttypes.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/invpcidintrin.h b/linux-x86/lib64/clang/9.0.4/include/invpcidintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/invpcidintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/invpcidintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/iso646.h b/linux-x86/lib64/clang/9.0.4/include/iso646.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/iso646.h
rename to linux-x86/lib64/clang/9.0.4/include/iso646.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/limits.h b/linux-x86/lib64/clang/9.0.4/include/limits.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/limits.h
rename to linux-x86/lib64/clang/9.0.4/include/limits.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/lwpintrin.h b/linux-x86/lib64/clang/9.0.4/include/lwpintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/lwpintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/lwpintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/lzcntintrin.h b/linux-x86/lib64/clang/9.0.4/include/lzcntintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/lzcntintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/lzcntintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/mm3dnow.h b/linux-x86/lib64/clang/9.0.4/include/mm3dnow.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/mm3dnow.h
rename to linux-x86/lib64/clang/9.0.4/include/mm3dnow.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/mm_malloc.h b/linux-x86/lib64/clang/9.0.4/include/mm_malloc.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/mm_malloc.h
rename to linux-x86/lib64/clang/9.0.4/include/mm_malloc.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/mmintrin.h b/linux-x86/lib64/clang/9.0.4/include/mmintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/mmintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/mmintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/module.modulemap b/linux-x86/lib64/clang/9.0.4/include/module.modulemap
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/module.modulemap
rename to linux-x86/lib64/clang/9.0.4/include/module.modulemap
diff --git a/linux-x86/lib64/clang/9.0.2/include/movdirintrin.h b/linux-x86/lib64/clang/9.0.4/include/movdirintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/movdirintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/movdirintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/msa.h b/linux-x86/lib64/clang/9.0.4/include/msa.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/msa.h
rename to linux-x86/lib64/clang/9.0.4/include/msa.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/mwaitxintrin.h b/linux-x86/lib64/clang/9.0.4/include/mwaitxintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/mwaitxintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/mwaitxintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/nmmintrin.h b/linux-x86/lib64/clang/9.0.4/include/nmmintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/nmmintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/nmmintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/opencl-c.h b/linux-x86/lib64/clang/9.0.4/include/opencl-c.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/opencl-c.h
rename to linux-x86/lib64/clang/9.0.4/include/opencl-c.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/pconfigintrin.h b/linux-x86/lib64/clang/9.0.4/include/pconfigintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/pconfigintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/pconfigintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/pkuintrin.h b/linux-x86/lib64/clang/9.0.4/include/pkuintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/pkuintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/pkuintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/pmmintrin.h b/linux-x86/lib64/clang/9.0.4/include/pmmintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/pmmintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/pmmintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/popcntintrin.h b/linux-x86/lib64/clang/9.0.4/include/popcntintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/popcntintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/popcntintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/prfchwintrin.h b/linux-x86/lib64/clang/9.0.4/include/prfchwintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/prfchwintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/prfchwintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/ptwriteintrin.h b/linux-x86/lib64/clang/9.0.4/include/ptwriteintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/ptwriteintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/ptwriteintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/rdseedintrin.h b/linux-x86/lib64/clang/9.0.4/include/rdseedintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/rdseedintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/rdseedintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/rtmintrin.h b/linux-x86/lib64/clang/9.0.4/include/rtmintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/rtmintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/rtmintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/s390intrin.h b/linux-x86/lib64/clang/9.0.4/include/s390intrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/s390intrin.h
rename to linux-x86/lib64/clang/9.0.4/include/s390intrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/sanitizer/allocator_interface.h b/linux-x86/lib64/clang/9.0.4/include/sanitizer/allocator_interface.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/sanitizer/allocator_interface.h
rename to linux-x86/lib64/clang/9.0.4/include/sanitizer/allocator_interface.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/sanitizer/asan_interface.h b/linux-x86/lib64/clang/9.0.4/include/sanitizer/asan_interface.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/sanitizer/asan_interface.h
rename to linux-x86/lib64/clang/9.0.4/include/sanitizer/asan_interface.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/sanitizer/common_interface_defs.h b/linux-x86/lib64/clang/9.0.4/include/sanitizer/common_interface_defs.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/sanitizer/common_interface_defs.h
rename to linux-x86/lib64/clang/9.0.4/include/sanitizer/common_interface_defs.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/sanitizer/coverage_interface.h b/linux-x86/lib64/clang/9.0.4/include/sanitizer/coverage_interface.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/sanitizer/coverage_interface.h
rename to linux-x86/lib64/clang/9.0.4/include/sanitizer/coverage_interface.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/sanitizer/dfsan_interface.h b/linux-x86/lib64/clang/9.0.4/include/sanitizer/dfsan_interface.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/sanitizer/dfsan_interface.h
rename to linux-x86/lib64/clang/9.0.4/include/sanitizer/dfsan_interface.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/sanitizer/esan_interface.h b/linux-x86/lib64/clang/9.0.4/include/sanitizer/esan_interface.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/sanitizer/esan_interface.h
rename to linux-x86/lib64/clang/9.0.4/include/sanitizer/esan_interface.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/sanitizer/hwasan_interface.h b/linux-x86/lib64/clang/9.0.4/include/sanitizer/hwasan_interface.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/sanitizer/hwasan_interface.h
rename to linux-x86/lib64/clang/9.0.4/include/sanitizer/hwasan_interface.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/sanitizer/linux_syscall_hooks.h b/linux-x86/lib64/clang/9.0.4/include/sanitizer/linux_syscall_hooks.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/sanitizer/linux_syscall_hooks.h
rename to linux-x86/lib64/clang/9.0.4/include/sanitizer/linux_syscall_hooks.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/sanitizer/lsan_interface.h b/linux-x86/lib64/clang/9.0.4/include/sanitizer/lsan_interface.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/sanitizer/lsan_interface.h
rename to linux-x86/lib64/clang/9.0.4/include/sanitizer/lsan_interface.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/sanitizer/msan_interface.h b/linux-x86/lib64/clang/9.0.4/include/sanitizer/msan_interface.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/sanitizer/msan_interface.h
rename to linux-x86/lib64/clang/9.0.4/include/sanitizer/msan_interface.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/sanitizer/netbsd_syscall_hooks.h b/linux-x86/lib64/clang/9.0.4/include/sanitizer/netbsd_syscall_hooks.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/sanitizer/netbsd_syscall_hooks.h
rename to linux-x86/lib64/clang/9.0.4/include/sanitizer/netbsd_syscall_hooks.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/sanitizer/scudo_interface.h b/linux-x86/lib64/clang/9.0.4/include/sanitizer/scudo_interface.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/sanitizer/scudo_interface.h
rename to linux-x86/lib64/clang/9.0.4/include/sanitizer/scudo_interface.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/sanitizer/tsan_interface.h b/linux-x86/lib64/clang/9.0.4/include/sanitizer/tsan_interface.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/sanitizer/tsan_interface.h
rename to linux-x86/lib64/clang/9.0.4/include/sanitizer/tsan_interface.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/sanitizer/tsan_interface_atomic.h b/linux-x86/lib64/clang/9.0.4/include/sanitizer/tsan_interface_atomic.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/sanitizer/tsan_interface_atomic.h
rename to linux-x86/lib64/clang/9.0.4/include/sanitizer/tsan_interface_atomic.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/sgxintrin.h b/linux-x86/lib64/clang/9.0.4/include/sgxintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/sgxintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/sgxintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/shaintrin.h b/linux-x86/lib64/clang/9.0.4/include/shaintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/shaintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/shaintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/smmintrin.h b/linux-x86/lib64/clang/9.0.4/include/smmintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/smmintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/smmintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/stdalign.h b/linux-x86/lib64/clang/9.0.4/include/stdalign.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/stdalign.h
rename to linux-x86/lib64/clang/9.0.4/include/stdalign.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/stdarg.h b/linux-x86/lib64/clang/9.0.4/include/stdarg.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/stdarg.h
rename to linux-x86/lib64/clang/9.0.4/include/stdarg.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/stdatomic.h b/linux-x86/lib64/clang/9.0.4/include/stdatomic.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/stdatomic.h
rename to linux-x86/lib64/clang/9.0.4/include/stdatomic.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/stdbool.h b/linux-x86/lib64/clang/9.0.4/include/stdbool.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/stdbool.h
rename to linux-x86/lib64/clang/9.0.4/include/stdbool.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/stddef.h b/linux-x86/lib64/clang/9.0.4/include/stddef.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/stddef.h
rename to linux-x86/lib64/clang/9.0.4/include/stddef.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/stdint.h b/linux-x86/lib64/clang/9.0.4/include/stdint.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/stdint.h
rename to linux-x86/lib64/clang/9.0.4/include/stdint.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/stdnoreturn.h b/linux-x86/lib64/clang/9.0.4/include/stdnoreturn.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/stdnoreturn.h
rename to linux-x86/lib64/clang/9.0.4/include/stdnoreturn.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/tbmintrin.h b/linux-x86/lib64/clang/9.0.4/include/tbmintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/tbmintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/tbmintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/tgmath.h b/linux-x86/lib64/clang/9.0.4/include/tgmath.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/tgmath.h
rename to linux-x86/lib64/clang/9.0.4/include/tgmath.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/tmmintrin.h b/linux-x86/lib64/clang/9.0.4/include/tmmintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/tmmintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/tmmintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/unwind.h b/linux-x86/lib64/clang/9.0.4/include/unwind.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/unwind.h
rename to linux-x86/lib64/clang/9.0.4/include/unwind.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/vadefs.h b/linux-x86/lib64/clang/9.0.4/include/vadefs.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/vadefs.h
rename to linux-x86/lib64/clang/9.0.4/include/vadefs.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/vaesintrin.h b/linux-x86/lib64/clang/9.0.4/include/vaesintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/vaesintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/vaesintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/varargs.h b/linux-x86/lib64/clang/9.0.4/include/varargs.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/varargs.h
rename to linux-x86/lib64/clang/9.0.4/include/varargs.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/vecintrin.h b/linux-x86/lib64/clang/9.0.4/include/vecintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/vecintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/vecintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/vpclmulqdqintrin.h b/linux-x86/lib64/clang/9.0.4/include/vpclmulqdqintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/vpclmulqdqintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/vpclmulqdqintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/waitpkgintrin.h b/linux-x86/lib64/clang/9.0.4/include/waitpkgintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/waitpkgintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/waitpkgintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/wbnoinvdintrin.h b/linux-x86/lib64/clang/9.0.4/include/wbnoinvdintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/wbnoinvdintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/wbnoinvdintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/wmmintrin.h b/linux-x86/lib64/clang/9.0.4/include/wmmintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/wmmintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/wmmintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/x86intrin.h b/linux-x86/lib64/clang/9.0.4/include/x86intrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/x86intrin.h
rename to linux-x86/lib64/clang/9.0.4/include/x86intrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/xmmintrin.h b/linux-x86/lib64/clang/9.0.4/include/xmmintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/xmmintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/xmmintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/xopintrin.h b/linux-x86/lib64/clang/9.0.4/include/xopintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/xopintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/xopintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/xsavecintrin.h b/linux-x86/lib64/clang/9.0.4/include/xsavecintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/xsavecintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/xsavecintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/xsaveintrin.h b/linux-x86/lib64/clang/9.0.4/include/xsaveintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/xsaveintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/xsaveintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/xsaveoptintrin.h b/linux-x86/lib64/clang/9.0.4/include/xsaveoptintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/xsaveoptintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/xsaveoptintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/xsavesintrin.h b/linux-x86/lib64/clang/9.0.4/include/xsavesintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/xsavesintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/xsavesintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/include/xtestintrin.h b/linux-x86/lib64/clang/9.0.4/include/xtestintrin.h
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/include/xtestintrin.h
rename to linux-x86/lib64/clang/9.0.4/include/xtestintrin.h
diff --git a/linux-x86/lib64/clang/9.0.2/share/asan_blacklist.txt b/linux-x86/lib64/clang/9.0.4/share/asan_blacklist.txt
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/share/asan_blacklist.txt
rename to linux-x86/lib64/clang/9.0.4/share/asan_blacklist.txt
diff --git a/linux-x86/lib64/clang/9.0.2/share/cfi_blacklist.txt b/linux-x86/lib64/clang/9.0.4/share/cfi_blacklist.txt
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/share/cfi_blacklist.txt
rename to linux-x86/lib64/clang/9.0.4/share/cfi_blacklist.txt
diff --git a/linux-x86/lib64/clang/9.0.2/share/dfsan_abilist.txt b/linux-x86/lib64/clang/9.0.4/share/dfsan_abilist.txt
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/share/dfsan_abilist.txt
rename to linux-x86/lib64/clang/9.0.4/share/dfsan_abilist.txt
diff --git a/linux-x86/lib64/clang/9.0.2/share/hwasan_blacklist.txt b/linux-x86/lib64/clang/9.0.4/share/hwasan_blacklist.txt
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/share/hwasan_blacklist.txt
rename to linux-x86/lib64/clang/9.0.4/share/hwasan_blacklist.txt
diff --git a/linux-x86/lib64/clang/9.0.2/share/msan_blacklist.txt b/linux-x86/lib64/clang/9.0.4/share/msan_blacklist.txt
similarity index 100%
rename from linux-x86/lib64/clang/9.0.2/share/msan_blacklist.txt
rename to linux-x86/lib64/clang/9.0.4/share/msan_blacklist.txt
diff --git a/linux-x86/lib64/libLLVM-9svn.so b/linux-x86/lib64/libLLVM-9svn.so
index 159abee..c1416de 100755
--- a/linux-x86/lib64/libLLVM-9svn.so
+++ b/linux-x86/lib64/libLLVM-9svn.so
Binary files differ
diff --git a/linux-x86/lib64/libbase.so b/linux-x86/lib64/libbase.so
index 7960444..05bdbfe 100755
--- a/linux-x86/lib64/libbase.so
+++ b/linux-x86/lib64/libbase.so
Binary files differ
diff --git a/linux-x86/lib64/libc++.so b/linux-x86/lib64/libc++.so
index a6f3db6..f5eee6e 100755
--- a/linux-x86/lib64/libc++.so
+++ b/linux-x86/lib64/libc++.so
Binary files differ
diff --git a/linux-x86/lib64/libc++.so.1 b/linux-x86/lib64/libc++.so.1
index c96372a..47274e8 100755
--- a/linux-x86/lib64/libc++.so.1
+++ b/linux-x86/lib64/libc++.so.1
Binary files differ
diff --git a/linux-x86/lib64/libclang_cxx.so.9svn b/linux-x86/lib64/libclang_cxx.so.9svn
index 08c84f3..fcdd8f7 100755
--- a/linux-x86/lib64/libclang_cxx.so.9svn
+++ b/linux-x86/lib64/libclang_cxx.so.9svn
Binary files differ
diff --git a/linux-x86/lib64/liblog.so b/linux-x86/lib64/liblog.so
index b3ab3f4..1f57c91 100755
--- a/linux-x86/lib64/liblog.so
+++ b/linux-x86/lib64/liblog.so
Binary files differ
diff --git a/linux-x86/lib64/libprotobuf-cpp-full.so b/linux-x86/lib64/libprotobuf-cpp-full.so
index cd86b5e..c625f7a 100755
--- a/linux-x86/lib64/libprotobuf-cpp-full.so
+++ b/linux-x86/lib64/libprotobuf-cpp-full.so
Binary files differ
diff --git a/linux-x86/lib64/libz-host.so b/linux-x86/lib64/libz-host.so
index d45c13a..1802e7d 100755
--- a/linux-x86/lib64/libz-host.so
+++ b/linux-x86/lib64/libz-host.so
Binary files differ
diff --git a/manifest.xml b/manifest.xml
index a05b111..ea232e9 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -5,29 +5,29 @@
 
   <default remote="aosp" revision="master" />
 
-  <project name="platform/development" path="development" revision="845050dfb7a0f2504b38ba4b9c67b09bcb94283f" />
+  <project name="platform/development" path="development" revision="df6ed868b943c41ee1fa734b78145ac9e1e5428f" />
 
   <project clone-depth="1" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" revision="38a84132fa01609e19beaa3552621313df41ffaf" />
 
-  <project name="platform/build/soong" path="build/soong" revision="bc975e8b897eaff7e5729fc362c31d35e838526a">
+  <project name="platform/build/soong" path="build/soong" revision="7d7cae85abe8059da109618f79aa6ac42fee3e02">
     <linkfile dest="Android.bp" src="root.bp" />
 
     <linkfile dest="bootstrap.bash" src="bootstrap.bash" />
 </project>
 
-  <project name="platform/external/ninja" path="external/ninja" revision="4f8e35afdca5caee718e38687af5497cbc4a48b5" />
+  <project name="platform/external/ninja" path="external/ninja" revision="059335d867310d6e8bf9fa44de69755575e763d2" />
 
-  <project name="platform/external/jsoncpp" path="external/jsoncpp" revision="e2b32fb8c0ae00887949d8ccd98f11ae02e4e47a" />
+  <project name="platform/external/jsoncpp" path="external/jsoncpp" revision="805300e85055a1c647168b679c10ecb66fe5d7db" />
 
-  <project name="platform/external/googletest" path="external/googletest" revision="055b9e9c10a1f338c9bac14b40369d4022f62adc" />
+  <project name="platform/external/googletest" path="external/googletest" revision="e4ff1aac05e6e1d18acc83fde7c4f620e081b078" />
 
-  <project clone-depth="1" name="platform/prebuilts/build-tools" path="prebuilts/build-tools" revision="03f9124ace502f319ccf5d058c4f2e36badb3d1c" />
+  <project clone-depth="1" name="platform/prebuilts/build-tools" path="prebuilts/build-tools" revision="5a31567b6593821c2250b1c02f2f6db390a8f48e" />
 
-  <project name="platform/bionic" path="bionic" revision="235ccfd19be5caa8028f6a6e12fe3da195fcea6e" />
+  <project name="platform/bionic" path="bionic" revision="b2bd7c575eaa91e35ff40450bb4c514a2088a5d7" />
 
   <project clone-depth="1" groups="linux" name="platform/prebuilts/go/linux-x86" path="prebuilts/go/linux-x86" revision="7090742e29742aa23b3c3dc2818e403e418139a2" />
 
-  <project name="platform/external/zlib" path="external/zlib" revision="dfa0646a03b4e1707469e04dc931b09774968fe6" />
+  <project name="platform/external/zlib" path="external/zlib" revision="6601fb831a21103eb8d9d4a1c0b395c94af2c2e9" />
 
   <project name="platform/external/zopfli" path="external/zopfli" revision="ac17b699bec31c3969bec5669e84d074ebef4544" />
 
@@ -45,37 +45,39 @@
 
   <project clone-depth="1" groups="darwin" name="platform/prebuilts/gcc/darwin-x86/host/headers" path="prebuilts/gcc/darwin-x86/host/headers" revision="4ac4f7cc41cf3c9e36fc3d6cf37fd1cfa9587a68" />
 
-  <project name="platform/external/libunwind" path="external/libunwind" revision="5f00d948eaa216c5606b77cb623eec177632ab78" />
+  <project name="platform/external/libunwind" path="external/libunwind" revision="086e0c2a159d1b639725315f79eaa87e6f7d71c4" />
 
-  <project name="platform/system/core" path="system/core" revision="b4631fc775676a611b0465456346e777680ac8f2" />
+  <project name="platform/system/core" path="system/core" revision="84fc269b6ea83b437243a2dbbdb7b415316bf127" />
 
-  <project clone-depth="1" groups="linux" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" revision="8700a86759f97fa9b837498aee800e04945d1ac3" />
+  <project clone-depth="1" groups="linux" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" revision="32845a7b484765507461fa5baadf94c75905316f" />
 
-  <project clone-depth="3" name="platform/prebuilts/clang-tools" path="prebuilts/clang-tools" revision="6ad4e0732f79a339a24c189b1f1aa7758e619e0d" />
+  <project clone-depth="3" name="platform/prebuilts/clang-tools" path="prebuilts/clang-tools" revision="eb644b9595da960c8ba8ce9a901a3b241112295a" />
 
   <project name="platform/external/golang-protobuf" path="external/golang-protobuf" revision="bd46f6d13b7e62e5cae7ababbf081fe13704c939" />
 
-  <project clone-depth="1" name="platform/prebuilts/jdk/jdk9" path="prebuilts/jdk/jdk9" revision="c8e362a0d33c127bb00506eeed84ffb75ed1d09c" />
+  <project clone-depth="1" name="platform/prebuilts/jdk/jdk9" path="prebuilts/jdk/jdk9" revision="375786699dcb340ab2d08de7f5d13dba6637f221" />
 
   <project clone-depth="1" groups="darwin" name="platform/prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" path="prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" revision="ec5aa66aaa4964c27564d0ec84dc1f18a2d72b7e" />
 
   <project name="platform/external/python/cpython3" path="external/python/cpython3" revision="a96e7088a2af2183aef894b5f9a80358d8cadb3b" />
 
-  <project name="platform/external/compiler-rt" path="external/compiler-rt" revision="0023b32996b8fbffa6cc1feff3afbf2d6356039c" />
+  <project name="platform/external/compiler-rt" path="external/compiler-rt" revision="45fa029b005498895181b2385131471dc206c4bd" />
 
-  <project name="platform/build/blueprint" path="build/blueprint" revision="4cc6c5f58ccebdb2876d9cf1a2b6e6b4371048ce" />
+  <project name="platform/build/blueprint" path="build/blueprint" revision="e21c14594e4e1f879629bb7b945649361ec7ff44" />
 
-  <project name="platform/external/libunwind_llvm" path="external/libunwind_llvm" revision="ec94f195368be4df4baa245e9b59c6de3b260bdb" />
+  <project name="platform/external/libunwind_llvm" path="external/libunwind_llvm" revision="d88b1fc62511d02ee2021628af7c571528a09b8c" />
 
-  <project name="platform/external/llvm" path="external/llvm" revision="c0c7875ec732bdd16082ed161b4778ff38afa2bb" />
+  <project name="platform/external/fmtlib" path="external/fmtlib" revision="17b3fc8df3a7c9dc7ebb240d9a9698153b8429cb" />
 
-  <project name="platform/build" path="build/make" revision="87c470e127be8a0e37c522bb531b51ea65830fc5">
+  <project name="platform/external/llvm" path="external/llvm" revision="ba5d4cafb78946be436f583faf7baa40dc75d853" />
+
+  <project name="platform/build" path="build/make" revision="9392fb3905991555d42812934e3755ef77bb65e2">
     <linkfile dest="build/tools" src="tools" />
 </project>
 
-  <project clone-depth="1" name="platform/prebuilts/misc" path="prebuilts/misc" revision="44faf9176a8bbb08ce1511f6865697b7279bbe05" />
+  <project clone-depth="1" name="platform/prebuilts/misc" path="prebuilts/misc" revision="1edb0870e186b0e653d747377e08f5eeb86d6e9e" />
 
-  <project clone-depth="1" groups="darwin" name="platform/prebuilts/clang/host/darwin-x86" path="prebuilts/clang/host/darwin-x86" revision="24a22b7a1f2b5e386210af2634a12411e0257310" />
+  <project clone-depth="1" groups="darwin" name="platform/prebuilts/clang/host/darwin-x86" path="prebuilts/clang/host/darwin-x86" revision="19d378165468ae83997b8817ce60ede4d30c3ff1" />
 
   <project name="platform/external/protobuf" path="external/protobuf" revision="5b973490097e2c2b44e6744263c9cc0a237e1e0a" />