Changeset 561 for trunk/src/corelib/arch/macosx

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/corelib/arch/macosx/arch.pri (modified) (1 diff)
• src/corelib/arch/macosx/qatomic32_ppc.s (modified) (1 diff)

trunk/src/corelib/arch/macosx/arch.pri

@@ -2 +2 @@
 # Mac OS X architecture
 #
-!*-icc*:!*-g++* {
-   contains($$list($$system(uname -m)), .*86):SOURCES += $$QT_ARCH_CPP/../i386/qatomic.s
-   else:SOURCES += $$QT_ARCH_CPP/../powerpc/qatomic32.s
-}
+
+# Left blank intentionally since all the current compilers that we support can
+# handle in-line assembly.

trunk/src/corelib/arch/macosx/qatomic32_ppc.s

@@ +1 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         .section __TEXT,__text,regular,pure_instructions
         .section __TEXT,__picsymbolstub1,symbol_stubs,pure_instructions,32