diff options
| author | Mark Kettenis <kettenis@gnu.org> | 2001-08-01 19:18:42 +0000 |
|---|---|---|
| committer | Andreas Jaeger <aj@gcc.gnu.org> | 2001-08-01 21:18:42 +0200 |
| commit | bda33a6e0fda1d512e237c306c60d9978e596e24 (patch) | |
| tree | c31af4e4c456ad2b6562f9b1f19d6815bb037a46 | |
| parent | 75540af074553f5d39b2c61d753b491ca31f4ce6 (diff) | |
| download | gcc-bda33a6e0fda1d512e237c306c60d9978e596e24.zip gcc-bda33a6e0fda1d512e237c306c60d9978e596e24.tar.gz gcc-bda33a6e0fda1d512e237c306c60d9978e596e24.tar.bz2 | |
unwind-pe.h (base_of_encoded_value, [...]): Define only if NO_BASE_OF_ENCODED_VALUE isn't defined.
* unwind-pe.h (base_of_encoded_value, read_encoded_value): Define
only if NO_BASE_OF_ENCODED_VALUE isn't defined.
* unwind-dw2-fde.c (NO_BASE_OF_ENCODED_VALUE): Define before
including "unwind-pe.h".
From-SVN: r44550
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/unwind-dw2-fde.c | 1 | ||||
| -rw-r--r-- | gcc/unwind-pe.h | 8 |
3 files changed, 16 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2dd587a..c78ff25 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2001-08-01 Mark Kettenis <kettenis@gnu.org> + + * unwind-pe.h (base_of_encoded_value, read_encoded_value): Define + only if NO_BASE_OF_ENCODED_VALUE isn't defined. + * unwind-dw2-fde.c (NO_BASE_OF_ENCODED_VALUE): Define before + including "unwind-pe.h". + Wed Aug 1 20:01:42 CEST 2001 Jan Hubicka <jh@suse.cz> * rs6000.md (define_splits): Kill unused constraints. diff --git a/gcc/unwind-dw2-fde.c b/gcc/unwind-dw2-fde.c index 8370e7a..333daec 100644 --- a/gcc/unwind-dw2-fde.c +++ b/gcc/unwind-dw2-fde.c @@ -32,6 +32,7 @@ Boston, MA 02111-1307, USA. */ #include "tsystem.h" #include "dwarf2.h" #include "unwind.h" +#define NO_BASE_OF_ENCODED_VALUE #include "unwind-pe.h" #include "unwind-dw2-fde.h" #include "gthr.h" diff --git a/gcc/unwind-pe.h b/gcc/unwind-pe.h index d6f368f..9a98f45 100644 --- a/gcc/unwind-pe.h +++ b/gcc/unwind-pe.h @@ -76,6 +76,8 @@ size_of_encoded_value (unsigned char encoding) __gxx_abort (); } +#ifndef NO_BASE_OF_ENCODED_VALUE + /* Given an encoding and an _Unwind_Context, return the base to which the encoding is relative. This base may then be passed to read_encoded_value_with_base for use when the _Unwind_Context is @@ -104,6 +106,8 @@ base_of_encoded_value (unsigned char encoding, struct _Unwind_Context *context) __gxx_abort (); } +#endif + /* 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. */ @@ -220,6 +224,8 @@ read_encoded_value_with_base (unsigned char encoding, _Unwind_Ptr base, return p; } +#ifndef NO_BASE_OF_ENCODED_VALUE + /* Like read_encoded_value_with_base, but get the base from the context rather than providing it directly. */ @@ -232,6 +238,8 @@ read_encoded_value (struct _Unwind_Context *context, unsigned char encoding, p, val); } +#endif + /* Read an unsigned leb128 value from P, store the value in VAL, return P incremented past the value. */ |