This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[Janitor] Remove CRT_GET_RFIB_TEXT
- From: Andreas Jaeger <aj at suse dot de>
- To: gcc-patches at gcc dot gnu dot org
- Date: Fri, 30 May 2003 22:00:20 +0200
- Subject: [Janitor] Remove CRT_GET_RFIB_TEXT
This macro is nowhere defined.
Ok to commit if bootstrap passes?
Andreas
2003-05-30 Andreas Jaeger <aj@suse.de>
* crtstuff.c (__do_global_dtors_aux): Remove usage of CRT_GET_RFIB_TEXT
(frame_dummy): Likewise.
* unwind-dw2-fde-glibc.c (_Unwind_IteratePhdrCallback): Likewise.
* system.h: Poison CRT_GET_RFIB_TEXT.
============================================================
Index: gcc/crtstuff.c
--- gcc/crtstuff.c 16 Dec 2002 18:19:19 -0000 1.60
+++ gcc/crtstuff.c 30 May 2003 19:59:39 -0000
@@ -1,7 +1,7 @@
/* Specialized bits of code needed to support construction and
destruction of file-scope objects in C++ code.
Copyright (C) 1991, 1994, 1995, 1996, 1997, 1998,
- 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+ 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
Contributed by Ron Guilmette (rfg@monkeys.com).
This file is part of GCC.
@@ -272,7 +272,7 @@ __do_global_dtors_aux (void)
}
#ifdef USE_EH_FRAME_REGISTRY
-#if defined(CRT_GET_RFIB_TEXT) || defined(CRT_GET_RFIB_DATA)
+#ifdef CRT_GET_RFIB_DATA
/* If we used the new __register_frame_info_bases interface,
make sure that we deregister from the same place. */
if (__deregister_frame_info_bases)
@@ -299,24 +299,16 @@ frame_dummy (void)
{
#ifdef USE_EH_FRAME_REGISTRY
static struct object object;
-#if defined(CRT_GET_RFIB_TEXT) || defined(CRT_GET_RFIB_DATA)
+#ifdef CRT_GET_RFIB_DATA
void *tbase, *dbase;
-#ifdef CRT_GET_RFIB_TEXT
- CRT_GET_RFIB_TEXT (tbase);
-#else
tbase = 0;
-#endif
-#ifdef CRT_GET_RFIB_DATA
CRT_GET_RFIB_DATA (dbase);
-#else
- dbase = 0;
-#endif
if (__register_frame_info_bases)
__register_frame_info_bases (__EH_FRAME_BEGIN__, &object, tbase, dbase);
#else
if (__register_frame_info)
__register_frame_info (__EH_FRAME_BEGIN__, &object);
-#endif
+#endif /* CRT_GET_RFIB_DATA */
#endif /* USE_EH_FRAME_REGISTRY */
#ifdef JCR_SECTION_NAME
if (__JCR_LIST__[0] && _Jv_RegisterClasses)
============================================================
Index: gcc/system.h
--- gcc/system.h 17 May 2003 21:59:25 -0000 1.146
+++ gcc/system.h 30 May 2003 19:59:39 -0000
@@ -640,7 +640,8 @@ typedef char _Bool;
BLOCK_PROFILER BLOCK_PROFILER_CODE FUNCTION_BLOCK_PROFILER \
FUNCTION_BLOCK_PROFILER_EXIT MACHINE_STATE_SAVE \
MACHINE_STATE_RESTORE SCCS_DIRECTIVE SECTION_ASM_OP \
- ASM_OUTPUT_DEFINE_LABEL_DIFFERENCE_SYMBOL ASM_OUTPUT_INTERNAL_LABEL
+ ASM_OUTPUT_DEFINE_LABEL_DIFFERENCE_SYMBOL ASM_OUTPUT_INTERNAL_LABEL\
+ CRT_GET_RFIB_TEXT
/* Hooks that are no longer used. */
#pragma GCC poison LANG_HOOKS_FUNCTION_MARK LANG_HOOKS_FUNCTION_FREE \
============================================================
Index: gcc/unwind-dw2-fde-glibc.c
--- gcc/unwind-dw2-fde-glibc.c 13 Mar 2003 03:48:31 -0000 1.10
+++ gcc/unwind-dw2-fde-glibc.c 30 May 2003 19:59:39 -0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
Contributed by Jakub Jelinek <jakub@redhat.com>.
This file is part of GCC.
@@ -169,9 +169,6 @@ _Unwind_IteratePhdrCallback (struct dl_p
# else
# error What is DW_EH_PE_datarel base on this platform?
# endif
-#endif
-#ifdef CRT_GET_RFIB_TEXT
-# error What is DW_EH_PE_textrel base on this platform?
#endif
p = read_encoded_value_with_base (hdr->eh_frame_ptr_enc,
--
Andreas Jaeger
SuSE Labs aj@suse.de
private aj@arthur.inka.de
http://www.suse.de/~aj