mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-10-19 01:02:15 -07:00
Robin H. Johnson
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
57 lines
1.8 KiB
Diff
57 lines
1.8 KiB
Diff
http://code.google.com/p/google-glog/issues/detail?id=130
|
|
|
|
make the code work with all gcc targets
|
|
|
|
--- a/src/symbolize_unittest.cc
|
|
+++ b/src/symbolize_unittest.cc
|
|
@@ -60,9 +60,7 @@ using namespace GOOGLE_NAMESPACE;
|
|
# endif // __i386__
|
|
# else
|
|
# endif // __GNUC__ >= 4
|
|
-# if defined(__i386__) || defined(__x86_64__)
|
|
-# define TEST_X86_32_AND_64 1
|
|
-# endif // defined(__i386__) || defined(__x86_64__)
|
|
+# define TEST_WITH_LABEL_ADDRESSES
|
|
#endif
|
|
|
|
// A wrapper function for Symbolize() to make the unit test simple.
|
|
@@ -289,22 +287,24 @@ TEST(Symbolize, SymbolizeWithDemanglingStackConsumption) {
|
|
extern "C" {
|
|
inline void* always_inline inline_func() {
|
|
register void *pc = NULL;
|
|
-#ifdef TEST_X86_32_AND_64
|
|
- __asm__ __volatile__("call 1f; 1: pop %0" : "=r"(pc));
|
|
+#ifdef TEST_WITH_LABEL_ADDRESSES
|
|
+ pc = &&curr_pc;
|
|
+ curr_pc:
|
|
#endif
|
|
return pc;
|
|
}
|
|
|
|
void* ATTRIBUTE_NOINLINE non_inline_func() {
|
|
register void *pc = NULL;
|
|
-#ifdef TEST_X86_32_AND_64
|
|
- __asm__ __volatile__("call 1f; 1: pop %0" : "=r"(pc));
|
|
+#ifdef TEST_WITH_LABEL_ADDRESSES
|
|
+ pc = &&curr_pc;
|
|
+ curr_pc:
|
|
#endif
|
|
return pc;
|
|
}
|
|
|
|
void ATTRIBUTE_NOINLINE TestWithPCInsideNonInlineFunction() {
|
|
-#if defined(TEST_X86_32_AND_64) && defined(HAVE_ATTRIBUTE_NOINLINE)
|
|
+#if defined(TEST_WITH_LABEL_ADDRESSES) && defined(HAVE_ATTRIBUTE_NOINLINE)
|
|
void *pc = non_inline_func();
|
|
const char *symbol = TrySymbolize(pc);
|
|
CHECK(symbol != NULL);
|
|
@@ -314,7 +314,7 @@ void ATTRIBUTE_NOINLINE TestWithPCInsideNonInlineFunction() {
|
|
}
|
|
|
|
void ATTRIBUTE_NOINLINE TestWithPCInsideInlineFunction() {
|
|
-#if defined(TEST_X86_32_AND_64) && defined(HAVE_ALWAYS_INLINE)
|
|
+#if defined(TEST_WITH_LABEL_ADDRESSES) && defined(HAVE_ALWAYS_INLINE)
|
|
void *pc = inline_func(); // Must be inlined.
|
|
const char *symbol = TrySymbolize(pc);
|
|
CHECK(symbol != NULL);
|