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

1 files changed, 1 insertions, 1 deletions

diff --git a/bin/syncqt b/bin/syncqt
index 648b6d9..b2a2577 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -691,7 +691,7 @@ my $class_lib_map_contents = "";
 my @ignore_for_master_contents = ( "qt.h", "qpaintdevicedefs.h" );
 my @ignore_for_include_check = ( "qatomic.h" );
 my @ignore_for_qt_begin_header_check = ( "qiconset.h", "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qt_windows.h" );
-my @ignore_for_qt_begin_namespace_check = ( "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qatomic_arch.h", "qatomic_windowsce.h", "qt_windows.h", "qatomic_macosx.h" );
+my @ignore_for_qt_begin_namespace_check = ( "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qatomic_arch.h", "qatomic_windowsce.h", "qt_windows.h", "qatomic_macosx.h", "qatomic_arm.h" );
 my @ignore_for_qt_module_check = ( "$modules{QtCore}/arch", "$modules{QtCore}/global", "$modules{QtSql}/drivers", "$modules{QtTest}", "$modules{QtDesigner}", "$modules{QtUiTools}", "$modules{QtDBus}", "$modules{phonon}" );
 my %colliding_headers = ();
 my %inject_headers;