diff options
| author | chrbr <chrbr@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-10-26 09:50:37 +0000 |
|---|---|---|
| committer | chrbr <chrbr@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-10-26 09:50:37 +0000 |
| commit | dda08454a53e6627ab64ea06f8bb80cb9a949986 (patch) | |
| tree | 90a790213de81ca57c7114076a08cb59d61c9df3 /gcc/cp/lambda.c | |
| parent | 3bf3305960593bd04b7ad2e0c473022d6dfef291 (diff) | |
| download | gcc-dda08454a53e6627ab64ea06f8bb80cb9a949986.tar.gz | |
2015-10-26 Christian Bruel <christian.bruel@st.com>
* function.h (MINIMUM_METHOD_BOUNDARY): New macro.
* cp/decl.c (grokfndecl): Set DECL_ALIGN with MINIMUM_METHOD_BOUNDARY.
* cp/method.c (implicitly_declare_fn): Likewise.
* cp/lambda.c (maybe_add_lambda_conv_op): Likewise. Remove VBIT setting.
* java/class.c (add_method_1): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@229313 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/lambda.c')
| -rw-r--r-- | gcc/cp/lambda.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/gcc/cp/lambda.c b/gcc/cp/lambda.c index b4f19af6eff..c1e747173eb 100644 --- a/gcc/cp/lambda.c +++ b/gcc/cp/lambda.c @@ -1006,11 +1006,7 @@ maybe_add_lambda_conv_op (tree type) tree convfn = build_lang_decl (FUNCTION_DECL, name, fntype); tree fn = convfn; DECL_SOURCE_LOCATION (fn) = DECL_SOURCE_LOCATION (callop); - - if (TARGET_PTRMEMFUNC_VBIT_LOCATION == ptrmemfunc_vbit_in_pfn - && DECL_ALIGN (fn) < 2 * BITS_PER_UNIT) - DECL_ALIGN (fn) = 2 * BITS_PER_UNIT; - + DECL_ALIGN (fn) = MINIMUM_METHOD_BOUNDARY; SET_OVERLOADED_OPERATOR_CODE (fn, TYPE_EXPR); grokclassfn (type, fn, NO_SPECIAL); set_linkage_according_to_type (type, fn); @@ -1042,9 +1038,6 @@ maybe_add_lambda_conv_op (tree type) tree statfn = build_lang_decl (FUNCTION_DECL, name, stattype); fn = statfn; DECL_SOURCE_LOCATION (fn) = DECL_SOURCE_LOCATION (callop); - if (TARGET_PTRMEMFUNC_VBIT_LOCATION == ptrmemfunc_vbit_in_pfn - && DECL_ALIGN (fn) < 2 * BITS_PER_UNIT) - DECL_ALIGN (fn) = 2 * BITS_PER_UNIT; grokclassfn (type, fn, NO_SPECIAL); set_linkage_according_to_type (type, fn); rest_of_decl_compilation (fn, toplevel_bindings_p (), at_eof); |