From 5f4ee1fc5d00ae55c30fa2ce450c69be4c6d6e63 Mon Sep 17 00:00:00 2001 From: Duncan Sands Date: Wed, 11 Mar 2009 08:08:06 +0000 Subject: Remove the one-definition-rule version of extern_weak linkage: this linkage type only applies to declarations, but ODR is only relevant to globals with definitions. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@66650 91177308-0d34-0410-b5e6-96231b3b80d8 --- utils/llvm.grm | 2 -- utils/vim/llvm.vim | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'utils') diff --git a/utils/llvm.grm b/utils/llvm.grm index 641ba01..639d862 100644 --- a/utils/llvm.grm +++ b/utils/llvm.grm @@ -94,7 +94,6 @@ GVInternalLinkage GVExternalLinkage ::= dllimport | "extern_weak" - | "extern_weak_odr" | + external ; @@ -109,7 +108,6 @@ FunctionDeclareLinkage ::= + _ | dllimport | "extern_weak" - | "extern_weak_odr" ; FunctionDefineLinkage diff --git a/utils/vim/llvm.vim b/utils/vim/llvm.vim index 89787f80..7d56a4e 100644 --- a/utils/vim/llvm.vim +++ b/utils/vim/llvm.vim @@ -41,7 +41,7 @@ syn keyword llvmStatement extractvalue insertvalue syn keyword llvmKeyword define declare global constant syn keyword llvmKeyword internal external syn keyword llvmKeyword linkonce linkonce_odr weak weak_odr appending -syn keyword llvmKeyword common common_odr extern_weak extern_weak_odr +syn keyword llvmKeyword common common_odr extern_weak syn keyword llvmKeyword thread_local dllimport dllexport syn keyword llvmKeyword hidden protected default syn keyword llvmKeyword except deplibs -- cgit v1.1