aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/c-pragma.h5
-rw-r--r--gcc/testsuite/ChangeLog4
-rw-r--r--gcc/testsuite/gcc.dg/asm-names.c2
4 files changed, 11 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 027a53f..2ffbf89 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-16 J"orn Rennecke <joern.rennecke@superh.com>
+
+ * c-pragma.h (HANDLE_PRAGMA_WEAK): Always define to SUPPORTS_WEAK.
+
2003-07-16 Jakub Jelinek <jakub@redhat.com>
* unwind-dw2.c (MD_FROB_UPDATE_CONTEXT): Define.
diff --git a/gcc/c-pragma.h b/gcc/c-pragma.h
index b14a0c4..cea410b 100644
--- a/gcc/c-pragma.h
+++ b/gcc/c-pragma.h
@@ -28,12 +28,9 @@ extern int yydebug;
extern struct cpp_reader* parse_in;
-#ifdef HANDLE_SYSV_PRAGMA
-#if ((defined (ASM_WEAKEN_LABEL) && defined (ASM_OUTPUT_WEAK_ALIAS)) \
- || defined (ASM_WEAKEN_DECL))
#define HANDLE_PRAGMA_WEAK SUPPORTS_WEAK
-#endif
+#ifdef HANDLE_SYSV_PRAGMA
/* We always support #pragma pack for SYSV pragmas. */
#ifndef HANDLE_PRAGMA_PACK
#define HANDLE_PRAGMA_PACK 1
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 68f98a1..09b5a63 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-16 J"orn Rennecke <joern.rennecke@superh.com>
+
+ * gcc.dg/asm-names.c (ymain): Make it weak.
+
2003-07-16 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net>
PR c++/5421
diff --git a/gcc/testsuite/gcc.dg/asm-names.c b/gcc/testsuite/gcc.dg/asm-names.c
index dbfa792..d2841a0 100644
--- a/gcc/testsuite/gcc.dg/asm-names.c
+++ b/gcc/testsuite/gcc.dg/asm-names.c
@@ -23,5 +23,7 @@ extern int xmain (void) asm ("main");
int xmain (void) { return main(); }
/* In case built where the runtime calls __main. */
+/* But make it weak because some targets already define this function. */
+#pragma weak ymain
extern int ymain (void) asm ("___main");
int ymain (void) { return main(); }