diff options
author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2010-09-22 10:08:36 (GMT) |
---|---|---|
committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2010-09-23 09:21:06 (GMT) |
commit | 7be2c5824e0331bbeec87b482e71efe72fb026b0 (patch) | |
tree | 311452fc3a927ba14a25b489e9f404f2a88e7967 /qmake | |
parent | 1c0b32371f912c76ad6a943d6bdab6f024b7ee34 (diff) | |
download | Qt-7be2c5824e0331bbeec87b482e71efe72fb026b0.zip Qt-7be2c5824e0331bbeec87b482e71efe72fb026b0.tar.gz Qt-7be2c5824e0331bbeec87b482e71efe72fb026b0.tar.bz2 |
Merge the armv6 and arm architectures
Instead of having multiple architectures, merge them and select the
appropriate implementation based on what the compiler actually supports.
The original qatomic_arm.h header has been renamed to qatomic_armv5.h,
and qatomic_arm.h now does nothing more than including either
qatomic_armv6.h or qatomic_armv5.h
Since this changes the build-key for targets that previously used armv6,
we need a 3rd compatibility build-key for the architecture. The
configure script will always write out this build-key when building for
arm (and silently converts -arch armv6 to -arch arm).
Reviewed-by: thiago
Diffstat (limited to 'qmake')
0 files changed, 0 insertions, 0 deletions