This is the mail archive of the libc-alpha@sources.redhat.com mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: dwarf2 unwind breakage


On Tue, Mar 09, 2004 at 09:32:27PM -0800, Richard Henderson wrote:
> I would also guess that we currently don't do
> the right thing namespace-wise in libc.a.

Of course, we don't even build this code for libc.a.  Duh.

Anyway, problem fixed thus.


r~



2004-03-10  Richard Henderson  <rth@redhat.com>

	* sysdeps/generic/Makefile (elf/shared): Add unwind-pe.
	* sysdeps/generic/unwind-pe.c: New file.
	* sysdeps/generic/unwind-pe.h: Only prototypes for _LIBC
	without _LIBC_DEFINITIONS.

Index: sysdeps/generic/Makefile
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/generic/Makefile,v
retrieving revision 1.35
diff -c -p -d -u -r1.35 Makefile
--- sysdeps/generic/Makefile	24 Mar 2002 01:55:17 -0000	1.35
+++ sysdeps/generic/Makefile	10 Mar 2004 08:16:14 -0000
@@ -38,7 +38,7 @@ endif
 ifeq ($(subdir),elf)
 ifeq (yes:yes,$(build-shared):$(unwind-find-fde))
 # This is needed to support g++ v2 and v3.
-sysdep_routines += framestate
-shared-only-routines += framestate
+sysdep_routines += framestate unwind-pe
+shared-only-routines += framestate unwind-pe
 endif
 endif
Index: sysdeps/generic/unwind-pe.c
===================================================================
RCS file: sysdeps/generic/unwind-pe.c
diff -N sysdeps/generic/unwind-pe.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sysdeps/generic/unwind-pe.c	10 Mar 2004 08:16:14 -0000
@@ -0,0 +1,5 @@
+#include <stdlib.h>
+#include <unwind.h>
+
+#define _LIBC_DEFINITIONS
+#include "unwind-pe.h"
Index: sysdeps/generic/unwind-pe.h
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/generic/unwind-pe.h,v
retrieving revision 1.4
diff -c -p -d -u -r1.4 unwind-pe.h
--- sysdeps/generic/unwind-pe.h	14 Apr 2003 08:52:21 -0000	1.4
+++ sysdeps/generic/unwind-pe.h	10 Mar 2004 08:16:14 -0000
@@ -52,23 +52,43 @@
 #define DW_EH_PE_indirect	0x80
 
 
-#if defined(_LIBC) && !defined(NO_BASE_OF_ENCODED_VALUE)
+#if defined(_LIBC)
+
 /* Prototypes.  */
-extern unsigned int size_of_encoded_value (unsigned char encoding);
+extern unsigned int size_of_encoded_value (unsigned char encoding)
+  attribute_hidden;
+
 extern const unsigned char *read_encoded_value_with_base
   (unsigned char encoding, _Unwind_Ptr base,
-   const unsigned char *p, _Unwind_Ptr *val);
+   const unsigned char *p, _Unwind_Ptr *val)
+  attribute_hidden;
+
+extern const unsigned char * read_encoded_value
+  (struct _Unwind_Context *context, unsigned char encoding,
+   const unsigned char *p, _Unwind_Ptr *val)
+  attribute_hidden;
 
+extern const unsigned char * read_uleb128 (const unsigned char *p,
+					   _Unwind_Word *val)
+  attribute_hidden;
+extern const unsigned char * read_sleb128 (const unsigned char *p,
+					   _Unwind_Sword *val)
+  attribute_hidden;
+
+#endif
+#if defined(_LIBC) && defined(_LIBC_DEFINITIONS)
+
+#ifdef _LIBC
+#define STATIC
 #else
+#define STATIC static
+#endif
 
 /* Given an encoding, return the number of bytes the format occupies.
    This is only defined for fixed-size encodings, and so does not
    include leb128.  */
 
-# ifndef _LIBC
-static
-# endif
-unsigned int
+STATIC unsigned int
 size_of_encoded_value (unsigned char encoding)
 {
   if (encoding == DW_EH_PE_omit)
@@ -87,7 +107,6 @@ size_of_encoded_value (unsigned char enc
     }
   __gxx_abort ();
 }
-#endif
 
 #ifndef NO_BASE_OF_ENCODED_VALUE
 
@@ -96,7 +115,7 @@ size_of_encoded_value (unsigned char enc
    read_encoded_value_with_base for use when the _Unwind_Context is
    not available.  */
 
-static _Unwind_Ptr
+STATIC _Unwind_Ptr
 base_of_encoded_value (unsigned char encoding, struct _Unwind_Context *context)
 {
   if (encoding == DW_EH_PE_omit)
@@ -126,7 +145,7 @@ base_of_encoded_value (unsigned char enc
    hold any value so encoded; if it is smaller than a pointer on some target,
    pointers should not be leb128 encoded on that target.  */
 
-static const unsigned char *
+STATIC const unsigned char *
 read_uleb128 (const unsigned char *p, _Unwind_Word *val)
 {
   unsigned int shift = 0;
@@ -148,7 +167,7 @@ read_uleb128 (const unsigned char *p, _U
 
 /* Similar, but read a signed leb128 value.  */
 
-static const unsigned char *
+STATIC const unsigned char *
 read_sleb128 (const unsigned char *p, _Unwind_Sword *val)
 {
   unsigned int shift = 0;
@@ -172,15 +191,11 @@ read_sleb128 (const unsigned char *p, _U
   return p;
 }
 
-#if !(defined(_LIBC) && !defined(NO_BASE_OF_ENCODED_VALUE))
 /* Load an encoded value from memory at P.  The value is returned in VAL;
    The function returns P incremented past the value.  BASE is as given
    by base_of_encoded_value for this encoding in the appropriate context.  */
 
-# ifndef _LIBC
-static
-# endif
-const unsigned char *
+STATIC const unsigned char *
 read_encoded_value_with_base (unsigned char encoding, _Unwind_Ptr base,
 			      const unsigned char *p, _Unwind_Ptr *val)
 {
@@ -272,14 +287,13 @@ read_encoded_value_with_base (unsigned c
   *val = result;
   return p;
 }
-#endif
 
 #ifndef NO_BASE_OF_ENCODED_VALUE
 
 /* Like read_encoded_value_with_base, but get the base from the context
    rather than providing it directly.  */
 
-static inline const unsigned char *
+STATIC const unsigned char *
 read_encoded_value (struct _Unwind_Context *context, unsigned char encoding,
 		    const unsigned char *p, _Unwind_Ptr *val)
 {
@@ -289,3 +303,4 @@ read_encoded_value (struct _Unwind_Conte
 }
 
 #endif
+#endif /* _LIBC */


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]