diff options
| author | Jim Wilson <wilson@cygnus.com> | 1998-01-02 22:50:23 +0000 |
|---|---|---|
| committer | Jeff Law <law@gcc.gnu.org> | 1998-01-02 15:50:23 -0700 |
| commit | 35a42f5f3320c0eb3cd391955bb6e11e20ef7e4c (patch) | |
| tree | c8fcdad3d35757efe740dbeac92c62d651f26871 | |
| parent | 4aa0a3f4e8beb5f6336ef784676b450078bd31f7 (diff) | |
| download | gcc-35a42f5f3320c0eb3cd391955bb6e11e20ef7e4c.zip gcc-35a42f5f3320c0eb3cd391955bb6e11e20ef7e4c.tar.gz gcc-35a42f5f3320c0eb3cd391955bb6e11e20ef7e4c.tar.bz2 | |
crtstuff.c (__frame_dummy): New function for irix6.
* crtstuff.c (__frame_dummy): New function for irix6.
(__do_global_ctors): Call __frame_dummy for irix6.
* iris6.h (LINK_SPEC): Hide __frame_dummy too.
Co-Authored-By: Jeffrey A Law <law@cygnus.com>
From-SVN: r17281
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/config/mips/iris6.h | 4 | ||||
| -rw-r--r-- | gcc/crtstuff.c | 18 |
3 files changed, 23 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 95b7456..9c3be2f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +Fri Jan 2 23:40:09 1998 Jim Wilson (wilson@cygnus.com) + Jeffrey A Law (law@cygnus.com) + + * crtstuff.c (__frame_dummy): New function for irix6. + (__do_global_ctors): Call __frame_dummy for irix6. + * iris6.h (LINK_SPEC): Hide __frame_dummy too. + Fri Jan 2 04:57:57 1998 Weiwen Liu <liu@hepmail.physics.yale.edu> * alpha.c (vms_valid_decl_attribute_p): Move within #if OPEN_VMS. diff --git a/gcc/config/mips/iris6.h b/gcc/config/mips/iris6.h index 5bc733c..0d88750 100644 --- a/gcc/config/mips/iris6.h +++ b/gcc/config/mips/iris6.h @@ -1,5 +1,5 @@ /* Definitions of target machine for GNU compiler. Iris version 6. - Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. This file is part of GNU CC. @@ -541,5 +541,5 @@ do { \ %{!static: \ %{!shared: %{!non_shared: %{!call_shared: -call_shared -no_unresolved}}}} \ %{rpath} -init __do_global_ctors -fini __do_global_dtors \ -%{shared:-hidden_symbol __do_global_ctors,__do_global_dtors,__EH_FRAME_BEGIN__} \ +%{shared:-hidden_symbol __do_global_ctors,__do_global_dtors,__EH_FRAME_BEGIN__,__frame_dummy} \ -_SYSTYPE_SVR4 %{mabi=32: -32}%{mabi=n32: -n32}%{mabi=64: -64} %{!mabi*: -n32}" diff --git a/gcc/crtstuff.c b/gcc/crtstuff.c index 3f3643f..d296ea9 100644 --- a/gcc/crtstuff.c +++ b/gcc/crtstuff.c @@ -1,6 +1,6 @@ /* Specialized bits of code needed to support construction and destruction of file-scope objects in C++ code. - Copyright (C) 1991, 1994, 1995, 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1991, 94-97, 1998 Free Software Foundation, Inc. Contributed by Ron Guilmette (rfg@monkeys.com). This file is part of GNU CC. @@ -257,6 +257,18 @@ __do_global_dtors () __deregister_frame_info (__EH_FRAME_BEGIN__); #endif } + +#ifdef EH_FRAME_SECTION_ASM_OP +/* Define a function here to call __register_frame. crtend.o is linked in + after libgcc.a, and hence can't call libgcc.a functions directly. That + can lead to unresolved function references. */ +void +__frame_dummy () +{ + static struct object object; + __register_frame_info (__EH_FRAME_BEGIN__, &object); +} +#endif #endif #endif /* defined(INIT_SECTION_ASM_OP) */ @@ -387,15 +399,13 @@ __do_global_ctors_aux () /* prologue goes in .text section */ /* This case is used by the Irix 6 port, which supports named sections but not an SVR4-style .init section. __do_global_ctors can be non-static in this case because we protect it with -hidden_symbol. */ -extern char __EH_FRAME_BEGIN__[]; static func_ptr __CTOR_END__[]; void __do_global_ctors () { func_ptr *p; #ifdef EH_FRAME_SECTION_ASM_OP - static struct object object; - __register_frame_info (__EH_FRAME_BEGIN__, &object); + __frame_dummy (); #endif for (p = __CTOR_END__ - 1; *p != (func_ptr) -1; p--) (*p) (); |