summaryrefslogtreecommitdiffstats
path: root/base/containers/stack_container_unittest.cc
diff options
context:
space:
mode:
authorsbc@chromium.org <sbc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-24 20:23:42 +0000
committersbc@chromium.org <sbc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-24 20:23:42 +0000
commit90a78b39d62518917009af23f578d81f4bb7295c (patch)
tree1f8cfba8a2b26e4ba3922f6ac634df8f5aeac485 /base/containers/stack_container_unittest.cc
parent4d89944a5e7381728637ef137277dad63320ae4e (diff)
downloadchromium_src-90a78b39d62518917009af23f578d81f4bb7295c.zip
chromium_src-90a78b39d62518917009af23f578d81f4bb7295c.tar.gz
chromium_src-90a78b39d62518917009af23f578d81f4bb7295c.tar.bz2
Fix BufferAlignment test on ARM linux.
It seems that linux's ARM gcc has the same problem that android's did. This change disables the check for 256 byte alignment for all gcc arm compilers, not only android. BUG=169817 Review URL: https://chromiumcodereview.appspot.com/12025021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178635 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/containers/stack_container_unittest.cc')
-rw-r--r--base/containers/stack_container_unittest.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/base/containers/stack_container_unittest.cc b/base/containers/stack_container_unittest.cc
index 3a1b3ed..e6c1914 100644
--- a/base/containers/stack_container_unittest.cc
+++ b/base/containers/stack_container_unittest.cc
@@ -127,9 +127,10 @@ TEST(StackContainer, BufferAlignment) {
aligned16->push_back(AlignedData<16>());
EXPECT_ALIGNED(&aligned16[0], 16);
-#if !defined(OS_ANDROID)
- // It seems that android doesn't respect greater than 16 byte alignment for
- // non-POD data on the stack, even though ALIGNOF(aligned256) == 256.
+#if !defined(__GNUC__) || defined(ARCH_CPU_X86_FAMILY)
+ // It seems that non-X86 gcc doesn't respect greater than 16 byte alignment.
+ // See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=33721 for details.
+ // TODO(sbc):re-enable this if GCC starts respecting higher alignments.
StackVector<AlignedData<256>, 1> aligned256;
aligned256->push_back(AlignedData<256>());
EXPECT_ALIGNED(&aligned256[0], 256);