From c37ac57fd91c4a9659e87a854e22c0ce7db69e81 Mon Sep 17 00:00:00 2001 From: amylaar Date: Wed, 16 Jul 2003 16:25:15 +0000 Subject: [PATCH 1/1] gcc: * c-pragma.h (HANDLE_PRAGMA_WEAK): Always define to SUPPORTS_WEAK. gcc/testsuite: * gcc.dg/asm-names.c (ymain): Make it weak. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@69459 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 4 ++++ gcc/c-pragma.h | 5 +---- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/gcc.dg/asm-names.c | 2 ++ 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 027a53f7406..2ffbf896eab 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2003-07-16 J"orn Rennecke + + * c-pragma.h (HANDLE_PRAGMA_WEAK): Always define to SUPPORTS_WEAK. + 2003-07-16 Jakub Jelinek * unwind-dw2.c (MD_FROB_UPDATE_CONTEXT): Define. diff --git a/gcc/c-pragma.h b/gcc/c-pragma.h index b14a0c4738c..cea410b1580 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 68f98a1366c..09b5a63b8e3 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2003-07-16 J"orn Rennecke + + * gcc.dg/asm-names.c (ymain): Make it weak. + 2003-07-16 Kriang Lerdsuwanakij PR c++/5421 diff --git a/gcc/testsuite/gcc.dg/asm-names.c b/gcc/testsuite/gcc.dg/asm-names.c index dbfa7925427..d2841a0f40c 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(); } -- 2.11.0