This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
win32 patch to fix patch error
- To: egcs-patches at cygnus dot com
- Subject: win32 patch to fix patch error
- From: Mumit Khan <khan at xraylith dot wisc dot edu>
- Date: Tue, 7 Jul 1998 21:35:18 -0500 (CDT)
There was a duplicate macro defined by the last two win32 patches to
i386/cygwin32.h, and the following merges the two.
Tue Jul 7 21:18:14 1998 Mumit Khan <khan@xraylith.wisc.edu>
* i386/cygwin32.h (ASM_DECLARE_FUNCTION_NAME): Merge duplicate
definitions from last two patches.
Index: gcc/config/i386/cygwin32.h
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/config/i386/cygwin32.h,v
retrieving revision 1.9
diff -u -3 -p -r1.9 cygwin32.h
--- gcc/config/i386/cygwin32.h 1998/07/07 00:05:25 1.9
+++ gcc/config/i386/cygwin32.h 1998/07/08 02:28:15
@@ -253,20 +253,6 @@ do { \
fprintf (STREAM, "%s%s", USER_LABEL_PREFIX, \
I386_PE_STRIP_ENCODING (NAME)) \
-/* Output a function definition label. */
-#undef ASM_DECLARE_FUNCTION_NAME
-#define ASM_DECLARE_FUNCTION_NAME(STREAM, NAME, DECL) \
-do { \
- if (i386_pe_dllexport_name_p (NAME)) \
- { \
- drectve_section (); \
- fprintf ((STREAM), "\t.ascii \" -export:%s\"\n", \
- I386_PE_STRIP_ENCODING (NAME)); \
- function_section (DECL); \
- } \
- ASM_OUTPUT_LABEL ((STREAM), (NAME)); \
-} while (0)
-
/* Output a common block. */
#undef ASM_OUTPUT_COMMON
#define ASM_OUTPUT_COMMON(STREAM, NAME, SIZE, ROUNDED) \
@@ -359,9 +345,17 @@ do { \
/* Write the extra assembler code needed to declare a function
properly. If we are generating SDB debugging information, this
will happen automatically, so we only need to handle other cases. */
+#undef ASM_DECLARE_FUNCTION_NAME
#define ASM_DECLARE_FUNCTION_NAME(FILE, NAME, DECL) \
do \
{ \
+ if (i386_pe_dllexport_name_p (NAME)) \
+ { \
+ drectve_section (); \
+ fprintf ((FILE), "\t.ascii \" -export:%s\"\n", \
+ I386_PE_STRIP_ENCODING (NAME)); \
+ function_section (DECL); \
+ } \
if (write_symbols != SDB_DEBUG) \
i386_pe_declare_function_type (FILE, NAME, TREE_PUBLIC (DECL)); \
ASM_OUTPUT_LABEL (FILE, NAME); \