From c351037d6c097427a7f80da8a86e42c224c2f260 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Thu, 6 Jul 2017 02:15:35 +0200 Subject: [PATCH] gallivm: inline gallivm_init_llvm_targets MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit there is only one user. Reviewed-by: Nicolai Hähnle --- src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 23 +++++++------------ src/gallium/auxiliary/gallivm/lp_bld_misc.h | 3 --- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp index 0e4a5310897..342cb386d63 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp @@ -124,20 +124,6 @@ static void init_native_targets() llvm::InitializeNativeTargetDisassembler(); } -/** - * The llvm target registry is not thread-safe, so drivers and state-trackers - * that want to initialize targets should use the gallivm_init_llvm_targets() - * function to safely initialize targets. - * - * LLVM targets should be initialized before the driver or state-tracker tries - * to access the registry. - */ -extern "C" void -gallivm_init_llvm_targets(void) -{ - call_once(&init_native_targets_once_flag, init_native_targets); -} - extern "C" void lp_set_target_options(void) { @@ -150,7 +136,14 @@ lp_set_target_options(void) llvm::DisablePrettyStackTrace = true; #endif - gallivm_init_llvm_targets(); + /* The llvm target registry is not thread-safe, so drivers and state-trackers + * that want to initialize targets should use the lp_set_target_options() + * function to safely initialize targets. + * + * LLVM targets should be initialized before the driver or state-tracker tries + * to access the registry. + */ + call_once(&init_native_targets_once_flag, init_native_targets); } extern "C" diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.h b/src/gallium/auxiliary/gallivm/lp_bld_misc.h index dafb4cfe068..1b725d10d7c 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_misc.h +++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.h @@ -42,9 +42,6 @@ extern "C" { struct lp_generated_code; -extern void -gallivm_init_llvm_targets(void); - extern LLVMTargetLibraryInfoRef gallivm_create_target_library_info(const char *triple); -- 2.30.2