Revision: 126077 Author: johannes Date: 2007-04-13 09:36:56 -0700 (Fri, 13 Apr 2007)
Log Message: ----------- Apply FSF patch to make thunks non-comdat Modified Paths: -------------- apple-local/branches/llvm/gcc/cp/method.c Modified: apple-local/branches/llvm/gcc/cp/method.c =================================================================== --- apple-local/branches/llvm/gcc/cp/method.c 2007-04-13 16:25:48 UTC (rev 126076) +++ apple-local/branches/llvm/gcc/cp/method.c 2007-04-13 16:36:56 UTC (rev 126077) @@ -136,8 +136,7 @@ TREE_READONLY (thunk) = TREE_READONLY (function); TREE_THIS_VOLATILE (thunk) = TREE_THIS_VOLATILE (function); TREE_PUBLIC (thunk) = TREE_PUBLIC (function); - if (flag_weak) - comdat_linkage (thunk); + /* APPLE LOCAL mainline do not make thunks comdat */ SET_DECL_THUNK_P (thunk, this_adjusting); THUNK_TARGET (thunk) = function; THUNK_FIXED_OFFSET (thunk) = d; @@ -378,8 +377,10 @@ DECL_VISIBILITY (thunk_fndecl) = DECL_VISIBILITY (function); DECL_VISIBILITY_SPECIFIED (thunk_fndecl) = DECL_VISIBILITY_SPECIFIED (function); - if (flag_weak && TREE_PUBLIC (thunk_fndecl)) - comdat_linkage (thunk_fndecl); + /* APPLE LOCAL begin mainline do not make thunks comdat */ + if (DECL_ONE_ONLY (function)) + make_decl_one_only (thunk_fndecl); + /* APPLE LOCAL end mainline do not make thunks comdat */ if (flag_syntax_only) { _______________________________________________ llvm-commits mailing list [EMAIL PROTECTED] http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits