aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorRichard Henderson <rth@redhat.com>2007-03-29 16:35:33 -0700
committerRichard Henderson <rth@gcc.gnu.org>2007-03-29 16:35:33 -0700
commit58c114673775c1240de8e20d430fdacd2eb10061 (patch)
tree7b4ac6deddae561479884c7acf55b609b13e44a9 /gcc
parent5b77de89ae8a85507bcb536800633b1a0cb18bdc (diff)
downloadgcc-58c114673775c1240de8e20d430fdacd2eb10061.zip
gcc-58c114673775c1240de8e20d430fdacd2eb10061.tar.gz
gcc-58c114673775c1240de8e20d430fdacd2eb10061.tar.bz2
unwind-generic.h (_sleb128_t, _uleb128_t): Don't use HAVE_LONG_LONG to decide, but __SIZEOF_LONG_LONG__.
* unwind-generic.h (_sleb128_t, _uleb128_t): Don't use HAVE_LONG_LONG to decide, but __SIZEOF_LONG_LONG__. From-SVN: r123352
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/unwind-generic.h12
2 files changed, 10 insertions, 7 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5af2da3..31cddc0 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
2007-03-29 Richard Henderson <rth@redhat.com>
+ * unwind-generic.h (_sleb128_t, _uleb128_t): Don't use HAVE_LONG_LONG
+ to decide, but __SIZEOF_LONG_LONG__.
+
+2007-03-29 Richard Henderson <rth@redhat.com>
+
* emutls.c (struct __emutls_array): New.
(emutls_destroy): Use it instead of casting element 0 from void*.
(__emutls_get_address): Likewise.
diff --git a/gcc/unwind-generic.h b/gcc/unwind-generic.h
index 1218d8c..4d5d14d 100644
--- a/gcc/unwind-generic.h
+++ b/gcc/unwind-generic.h
@@ -247,16 +247,14 @@ extern void * _Unwind_FindEnclosingFunction (void *pc);
except when a unsigned long data type on the target machine is not
capable of storing a pointer. */
-#if __SIZEOF_LONG__ < __SIZEOF_POINTER__
-#ifdef HAVE_LONG_LONG
+#if __SIZEOF_LONG__ >= __SIZEOF_POINTER__
+ typedef long _sleb128_t;
+ typedef unsigned long _uleb128_t;
+#elif __SIZEOF_LONG_LONG__ >= __SIZEOF_POINTER__
typedef long long _sleb128_t;
typedef unsigned long long _uleb128_t;
#else
- #error "long long data type is needed to define _sleb128_t"
-#endif
-#else
- typedef long _sleb128_t;
- typedef unsigned long _uleb128_t;
+# error "What type shall we use for _sleb128_t?"
#endif
#ifdef __cplusplus