From 34f56efcd57a31950d85b83c00b500a63ef46f35 Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Fri, 13 Sep 2013 08:43:17 +0200 Subject: [PATCH] winnt-cxx.c (i386_pe_type_dllexport_p): Don't dll-export inline-functions. 2013-09-13 Kai Tietz * config/i386/winnt-cxx.c (i386_pe_type_dllexport_p): Don't dll-export inline-functions. * config/i386/winnt.c (i386_pe_determine_dllexport_p): Likewise. Additional fix ChangeLog-date of prior commit. From-SVN: r202555 --- gcc/ChangeLog | 9 ++++++++- gcc/config/i386/winnt-cxx.c | 7 +++++++ gcc/config/i386/winnt.c | 5 +++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f47901521355..65170206a285 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,4 +1,11 @@ -2013-09-10 Jeff Law +2013-09-13 Kai Tietz + + * config/i386/winnt-cxx.c (i386_pe_type_dllexport_p): Don't + dll-export inline-functions. + * config/i386/winnt.c (i386_pe_determine_dllexport_p): Likewise. + + +2013-09-13 Jeff Law PR middle-end/58387 Revert: diff --git a/gcc/config/i386/winnt-cxx.c b/gcc/config/i386/winnt-cxx.c index 323844afe41c..92de46abd59a 100644 --- a/gcc/config/i386/winnt-cxx.c +++ b/gcc/config/i386/winnt-cxx.c @@ -65,6 +65,13 @@ i386_pe_type_dllexport_p (tree decl) if (TREE_CODE (TREE_TYPE (decl)) == METHOD_TYPE && DECL_ARTIFICIAL (decl) && !DECL_THUNK_P (decl)) return false; + if (TREE_CODE (decl) == FUNCTION_DECL + && DECL_DECLARED_INLINE_P (decl)) + { + if (DECL_REALLY_EXTERN (decl) + || !flag_keep_inline_dllexport) + return false; + } return true; } diff --git a/gcc/config/i386/winnt.c b/gcc/config/i386/winnt.c index c9e3aa98a377..8cf6b3c527af 100644 --- a/gcc/config/i386/winnt.c +++ b/gcc/config/i386/winnt.c @@ -110,6 +110,11 @@ i386_pe_determine_dllexport_p (tree decl) if (!TREE_PUBLIC (decl)) return false; + if (TREE_CODE (decl) == FUNCTION_DECL + && DECL_DECLARED_INLINE_P (decl) + && !flag_keep_inline_dllexport) + return false; + if (lookup_attribute ("dllexport", DECL_ATTRIBUTES (decl))) return true; -- 2.47.2