From 168f1428346f3d51304db0be64e1d5e4a09ca4c2 Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Sat, 31 Mar 2012 10:44:20 +0000 Subject: [PATCH] Cleanup whitespace and remove unneeded 'extern' keyword on function definitions. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@153802 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm-c/lto.h | 33 +++++++++++++++++---------------- tools/lto/lto.cpp | 21 ++++++++++----------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/include/llvm-c/lto.h b/include/llvm-c/lto.h index 43ef9dcd643..f822b475249 100644 --- a/include/llvm-c/lto.h +++ b/include/llvm-c/lto.h @@ -31,20 +31,20 @@ typedef enum { LTO_SYMBOL_ALIGNMENT_MASK = 0x0000001F, /* log2 of alignment */ - LTO_SYMBOL_PERMISSIONS_MASK = 0x000000E0, - LTO_SYMBOL_PERMISSIONS_CODE = 0x000000A0, - LTO_SYMBOL_PERMISSIONS_DATA = 0x000000C0, - LTO_SYMBOL_PERMISSIONS_RODATA = 0x00000080, - LTO_SYMBOL_DEFINITION_MASK = 0x00000700, - LTO_SYMBOL_DEFINITION_REGULAR = 0x00000100, - LTO_SYMBOL_DEFINITION_TENTATIVE = 0x00000200, - LTO_SYMBOL_DEFINITION_WEAK = 0x00000300, - LTO_SYMBOL_DEFINITION_UNDEFINED = 0x00000400, + LTO_SYMBOL_PERMISSIONS_MASK = 0x000000E0, + LTO_SYMBOL_PERMISSIONS_CODE = 0x000000A0, + LTO_SYMBOL_PERMISSIONS_DATA = 0x000000C0, + LTO_SYMBOL_PERMISSIONS_RODATA = 0x00000080, + LTO_SYMBOL_DEFINITION_MASK = 0x00000700, + LTO_SYMBOL_DEFINITION_REGULAR = 0x00000100, + LTO_SYMBOL_DEFINITION_TENTATIVE = 0x00000200, + LTO_SYMBOL_DEFINITION_WEAK = 0x00000300, + LTO_SYMBOL_DEFINITION_UNDEFINED = 0x00000400, LTO_SYMBOL_DEFINITION_WEAKUNDEF = 0x00000500, - LTO_SYMBOL_SCOPE_MASK = 0x00003800, - LTO_SYMBOL_SCOPE_INTERNAL = 0x00000800, - LTO_SYMBOL_SCOPE_HIDDEN = 0x00001000, - LTO_SYMBOL_SCOPE_PROTECTED = 0x00002000, + LTO_SYMBOL_SCOPE_MASK = 0x00003800, + LTO_SYMBOL_SCOPE_INTERNAL = 0x00000800, + LTO_SYMBOL_SCOPE_HIDDEN = 0x00001000, + LTO_SYMBOL_SCOPE_PROTECTED = 0x00002000, LTO_SYMBOL_SCOPE_DEFAULT = 0x00001800, LTO_SYMBOL_SCOPE_DEFAULT_CAN_BE_HIDDEN = 0x00002800 } lto_symbol_attributes; @@ -95,7 +95,7 @@ lto_module_is_object_file(const char* path); * Checks if a file is a loadable object compiled for requested target. */ extern bool -lto_module_is_object_file_for_target(const char* path, +lto_module_is_object_file_for_target(const char* path, const char* target_triple_prefix); @@ -110,7 +110,7 @@ lto_module_is_object_file_in_memory(const void* mem, size_t length); * Checks if a buffer is a loadable object compiled for requested target. */ extern bool -lto_module_is_object_file_in_memory_for_target(const void* mem, size_t length, +lto_module_is_object_file_in_memory_for_target(const void* mem, size_t length, const char* target_triple_prefix); @@ -271,7 +271,7 @@ lto_codegen_write_merged_modules(lto_code_gen_t cg, const char* path); /** * Generates code for all added modules into one native object file. * On success returns a pointer to a generated mach-o/ELF buffer and - * length set to the buffer size. The buffer is owned by the + * length set to the buffer size. The buffer is owned by the * lto_code_gen_t and will be freed when lto_codegen_dispose() * is called, or lto_codegen_compile() is called again. * On failure, returns NULL (check lto_get_error_message() for details). @@ -292,6 +292,7 @@ lto_codegen_compile_to_file(lto_code_gen_t cg, const char** name); */ extern void lto_codegen_debug_options(lto_code_gen_t cg, const char *); + #ifdef __cplusplus } #endif diff --git a/tools/lto/lto.cpp b/tools/lto/lto.cpp index ec67a93f2f1..a7e633d14b9 100644 --- a/tools/lto/lto.cpp +++ b/tools/lto/lto.cpp @@ -159,7 +159,7 @@ bool lto_codegen_set_pic_model(lto_code_gen_t cg, lto_codegen_model model) { } /// lto_codegen_set_cpu - Sets the cpu to generate code for. -void lto_codegen_set_cpu(lto_code_gen_t cg, const char* cpu) { +void lto_codegen_set_cpu(lto_code_gen_t cg, const char *cpu) { return cg->setCpu(cpu); } @@ -170,7 +170,7 @@ void lto_codegen_set_assembler_path(lto_code_gen_t cg, const char *path) { /// lto_codegen_set_assembler_args - Sets extra arguments that libLTO should /// pass to the assembler. -void lto_codegen_set_assembler_args(lto_code_gen_t cg, const char** args, +void lto_codegen_set_assembler_args(lto_code_gen_t cg, const char **args, int nargs) { // In here only for backwards compatibility. We use MC now. } @@ -179,14 +179,14 @@ void lto_codegen_set_assembler_args(lto_code_gen_t cg, const char** args, /// that must exist in the final generated code. If a function is not listed /// there, it might be inlined into every usage and optimized away. void lto_codegen_add_must_preserve_symbol(lto_code_gen_t cg, - const char* symbol) { + const char *symbol) { cg->addMustPreserveSymbol(symbol); } /// lto_codegen_write_merged_modules - Writes a new file at the specified path /// that contains the merged contents of all modules added so far. Returns true /// on error (check lto_get_error_message() for details). -bool lto_codegen_write_merged_modules(lto_code_gen_t cg, const char* path) { +bool lto_codegen_write_merged_modules(lto_code_gen_t cg, const char *path) { return cg->writeMergedModules(path, sLastErrorString); } @@ -196,20 +196,19 @@ bool lto_codegen_write_merged_modules(lto_code_gen_t cg, const char* path) { /// object and will be freed when lto_codegen_dispose() is called, or /// lto_codegen_compile() is called again. On failure, returns NULL (check /// lto_get_error_message() for details). -extern const void* -lto_codegen_compile(lto_code_gen_t cg, size_t* length) { +const void *lto_codegen_compile(lto_code_gen_t cg, size_t *length) { return cg->compile(length, sLastErrorString); } -extern bool -lto_codegen_compile_to_file(lto_code_gen_t cg, const char **name) -{ +/// lto_codegen_compile_to_file - Generates code for all added modules into one +/// native object file. The name of the file is written to name. Returns true on +/// error. +bool lto_codegen_compile_to_file(lto_code_gen_t cg, const char **name) { return cg->compile_to_file(name, sLastErrorString); } /// lto_codegen_debug_options - Used to pass extra options to the code /// generator. -extern void -lto_codegen_debug_options(lto_code_gen_t cg, const char * opt) { +void lto_codegen_debug_options(lto_code_gen_t cg, const char *opt) { cg->setCodeGenDebugOptions(opt); } -- 2.34.1