From 249e6b636b649387f0e0a537d2c2615c6d36d56f Mon Sep 17 00:00:00 2001 From: "Casper S. Hornstrup" Date: Wed, 27 Nov 2002 12:04:16 -0800 Subject: [PATCH] i386.h (DLL_IMPORT_EXPORT_PREFIX): Define. * config/i386/i386.h (DLL_IMPORT_EXPORT_PREFIX): Define. * config/i386/winnt.c (i386_pe_dllexport_name_p): Use DLL_IMPORT_EXPORT_PREFIX, not '@'. (i386_pe_dllimport_name_p): Likewise. (i386_pe_mark_dllexport): Likewise. (i386_pe_mark_dllimport): Likewise. (i386_pe_encode_section_info): Likewise. (i386_pe_strip_name_encoding): Likewise. From-SVN: r59580 --- gcc/ChangeLog | 65 ++++++++++++++++++++++++----------------- gcc/config/i386/i386.h | 3 ++ gcc/config/i386/winnt.c | 16 +++++----- 3 files changed, 50 insertions(+), 34 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b03495cd1d9..0405ac36998 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,14 @@ +2002-11-27 Casper S. Hornstrup + + * config/i386/i386.h (DLL_IMPORT_EXPORT_PREFIX): Define. + * config/i386/winnt.c (i386_pe_dllexport_name_p): Use + DLL_IMPORT_EXPORT_PREFIX, not '@'. + (i386_pe_dllimport_name_p): Likewise. + (i386_pe_mark_dllexport): Likewise. + (i386_pe_mark_dllimport): Likewise. + (i386_pe_encode_section_info): Likewise. + (i386_pe_strip_name_encoding): Likewise. + 2002-11-27 Richard Henderson * mkmap-symver.awk (BEGIN): Set sawsymbol false. @@ -21,8 +32,8 @@ Wed Nov 27 14:45:46 CET 2002 Jan Hubicka 2002-11-26 Hartmut Penner - * config/s390/s390.c (390_output_constant_pool): Set alignment - before label in 64 bit mode, behind otherwise. + * config/s390/s390.c (390_output_constant_pool): Set alignment + before label in 64 bit mode, behind otherwise. 2002-11-26 Richard Henderson @@ -141,25 +152,25 @@ Wed Nov 27 14:45:46 CET 2002 Jan Hubicka 2002-11-25 Aldy Hernandez - * config/rs6000/spe.h (__ev_create_sfix32_fs): Change macro into - new function. - (__ev_create_ufix32_fs): Same. - (__ev_get_sfix32_fs_internal): New. - (__ev_get_sfix32_fs): Define to use function. - (__ev_get_ufix32_fs_internal): New. - (__ev_get_ufix32_fs): Define to use function. - (__ev_get_upper_ufix32_fs): Call __ev_get_ufix32_fs. - (__ev_get_lower_ufix32_fs): Same. - (__ev_get_upper_sfix32_fs): Call __ev_get_sfix32_fs. - (__ev_get_lower_sfix32_fs): Same. - (__ev_set_sfix32_fs_internal): New. - (__ev_set_ufix32_fs_internal): New. - (__ev_set_sfix32_fs): Call __ev_set_sfix32_fs_internal. - (__ev_set_ufix32_fs): Call __ev_set_ufix32_fs_internal. - (__ev_set_upper_sfix32_fs): Call function. - (__ev_set_lower_sfix32_fs): Same. - (__ev_set_upper_ufix32_fs): Same. - (__ev_set_lower_ufix32_fs): Same. + * config/rs6000/spe.h (__ev_create_sfix32_fs): Change macro into + new function. + (__ev_create_ufix32_fs): Same. + (__ev_get_sfix32_fs_internal): New. + (__ev_get_sfix32_fs): Define to use function. + (__ev_get_ufix32_fs_internal): New. + (__ev_get_ufix32_fs): Define to use function. + (__ev_get_upper_ufix32_fs): Call __ev_get_ufix32_fs. + (__ev_get_lower_ufix32_fs): Same. + (__ev_get_upper_sfix32_fs): Call __ev_get_sfix32_fs. + (__ev_get_lower_sfix32_fs): Same. + (__ev_set_sfix32_fs_internal): New. + (__ev_set_ufix32_fs_internal): New. + (__ev_set_sfix32_fs): Call __ev_set_sfix32_fs_internal. + (__ev_set_ufix32_fs): Call __ev_set_ufix32_fs_internal. + (__ev_set_upper_sfix32_fs): Call function. + (__ev_set_lower_sfix32_fs): Same. + (__ev_set_upper_ufix32_fs): Same. + (__ev_set_lower_ufix32_fs): Same. 2002-11-25 Douglas B Rupp @@ -249,10 +260,10 @@ Wed Nov 27 14:45:46 CET 2002 Jan Hubicka 2002-11-25 Andrew Haley - * libgcc-std.ver (_Unwind_Find_Enclosing_Function): Add. - * config/ia64/unwind-ia64.c (_Unwind_Find_Enclosing_Function): New. - * unwind-sjlj.c (_Unwind_Find_Enclosing_Function): Likewise. - * unwind-dw2.c (_Unwind_Find_Enclosing_Function): Likewise. + * libgcc-std.ver (_Unwind_Find_Enclosing_Function): Add. + * config/ia64/unwind-ia64.c (_Unwind_Find_Enclosing_Function): New. + * unwind-sjlj.c (_Unwind_Find_Enclosing_Function): Likewise. + * unwind-dw2.c (_Unwind_Find_Enclosing_Function): Likewise. 2002-11-24 Kazu Hirata @@ -303,7 +314,7 @@ Wed Nov 27 14:45:46 CET 2002 Jan Hubicka 2002-11-22 Dale Johannesen - * toplev.c (rest_of_compilation): Fix comments. + * toplev.c (rest_of_compilation): Fix comments. 2002-11-22 Geoffrey Keating @@ -529,7 +540,7 @@ Thu Nov 21 23:52:04 CET 2002 Jan Hubicka directory. (MULTILIB_DIRNAMES): Create target dependent directory 'normal'. - (MULTILIB_EXCEPTIONS): Don't turn on -mn on H8/300. + (MULTILIB_EXCEPTIONS): Don't turn on -mn on H8/300. * doc/invoke.texi (gccoptlist): Describe the new switch -mn. Tue Nov 19 23:50:56 CET 2002 Jan Hubicka diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h index 373e3373b64..287cec3e503 100644 --- a/gcc/config/i386/i386.h +++ b/gcc/config/i386/i386.h @@ -3444,6 +3444,9 @@ enum fp_cw_mode {FP_CW_STORED, FP_CW_UNINITIALIZED, FP_CW_ANY}; #define MACHINE_DEPENDENT_REORG(X) x86_machine_dependent_reorg(X) + +#define DLL_IMPORT_EXPORT_PREFIX '@' + /* Local variables: version-control: t diff --git a/gcc/config/i386/winnt.c b/gcc/config/i386/winnt.c index f6417aa30bf..00b3dfd0442 100644 --- a/gcc/config/i386/winnt.c +++ b/gcc/config/i386/winnt.c @@ -199,7 +199,8 @@ int i386_pe_dllexport_name_p (symbol) const char *symbol; { - return symbol[0] == '@' && symbol[1] == 'e' && symbol[2] == '.'; + return symbol[0] == DLL_IMPORT_EXPORT_PREFIX + && symbol[1] == 'e' && symbol[2] == '.'; } /* Return nonzero if SYMBOL is marked as being dllimport'd. */ @@ -208,7 +209,8 @@ int i386_pe_dllimport_name_p (symbol) const char *symbol; { - return symbol[0] == '@' && symbol[1] == 'i' && symbol[2] == '.'; + return symbol[0] == DLL_IMPORT_EXPORT_PREFIX + && symbol[1] == 'i' && symbol[2] == '.'; } /* Mark a DECL as being dllexport'd. @@ -237,7 +239,7 @@ i386_pe_mark_dllexport (decl) return; /* already done */ newname = alloca (strlen (oldname) + 4); - sprintf (newname, "@e.%s", oldname); + sprintf (newname, "%ce.%s", DLL_IMPORT_EXPORT_PREFIX, oldname); /* We pass newname through get_identifier to ensure it has a unique address. RTL processing can sometimes peek inside the symbol ref @@ -312,7 +314,7 @@ i386_pe_mark_dllimport (decl) } newname = alloca (strlen (oldname) + 11); - sprintf (newname, "@i._imp__%s", oldname); + sprintf (newname, "%ci._imp__%s", DLL_IMPORT_EXPORT_PREFIX, oldname); /* We pass newname through get_identifier to ensure it has a unique address. RTL processing can sometimes peek inside the symbol ref @@ -399,8 +401,8 @@ i386_pe_encode_section_info (decl, first) i386_pe_mark_dllimport (decl); /* It might be that DECL has already been marked as dllimport, but a subsequent definition nullified that. The attribute is gone but - DECL_RTL still has @i._imp__foo. We need to remove that. Ditto - for the DECL_NON_ADDR_CONST_P flag. */ + DECL_RTL still has (DLL_IMPORT_EXPORT_PREFIX)i._imp__foo. We need + to remove that. Ditto for the DECL_NON_ADDR_CONST_P flag. */ else if ((TREE_CODE (decl) == FUNCTION_DECL || TREE_CODE (decl) == VAR_DECL) && DECL_RTL (decl) != NULL_RTX @@ -428,7 +430,7 @@ const char * i386_pe_strip_name_encoding (str) const char *str; { - if (*str == '@') + if (*str == DLL_IMPORT_EXPORT_PREFIX) str += 3; if (*str == '*') str += 1; -- 2.30.2