[maemo-commits] [maemo-commits] r17960 - projects/haf/trunk/glib

[From: subversion at stage.maemo.org]

Author: timj
Date: 2009-04-01 17:37:48 +0300 (Wed, 01 Apr 2009)
New Revision: 17960

Modified:
   projects/haf/trunk/glib/ChangeLog
   projects/haf/trunk/glib/configure.in
Log:
2009-04-01 16:30:07  Tim Janik  <timj at lanedo.com>

        * configure.in: use generic ARM platform tests to determine
        atomic primitive implementations. Fixed armv6-test.c test to
        actually compile. This enables ARMv6 optimizations on MAEMO
        (for uniprocessor systems, not SMP save).
        Fixes NB#106135 - glib does not use fast ARMv6+ atomic operations.



Modified: projects/haf/trunk/glib/ChangeLog
===================================================================
--- projects/haf/trunk/glib/ChangeLog	2009-04-01 13:12:20 UTC (rev 17959)
+++ projects/haf/trunk/glib/ChangeLog	2009-04-01 14:37:48 UTC (rev 17960)
@@ -1,3 +1,11 @@
+2009-04-01 16:30:07  Tim Janik  <timj at lanedo.com>
+
+	* configure.in: use generic ARM platform tests to determine
+	atomic primitive implementations. Fixed armv6-test.c test to
+	actually compile. This enables ARMv6 optimizations on MAEMO
+	(for uniprocessor systems, not SMP save).
+	Fixes NB#106135 - glib does not use fast ARMv6+ atomic operations.
+
 2009-03-31  Claudio Saavedra  <csaavedra at igalia.com>
 
 	* debian/changelog: Update for 2.18.1-1maemo4

Modified: projects/haf/trunk/glib/configure.in
===================================================================
--- projects/haf/trunk/glib/configure.in	2009-04-01 13:12:20 UTC (rev 17959)
+++ projects/haf/trunk/glib/configure.in	2009-04-01 14:37:48 UTC (rev 17960)
@@ -2400,13 +2400,13 @@
     arm*)
       AC_MSG_RESULT([arm])
       AC_MSG_CHECKING(arm atomic operations type)
-      if test x$glib_os_linux != xyes; then
+      maemo_changes_check=true	# MAEMO_CHANGES: inline ARM assembler
+      if test x$glib_os_linux != xyes || $maemo_changes_check; then
         AC_MSG_RESULT(inline asm)
         glib_save_CFLAGS=$CFLAGS
         AC_MSG_CHECKING(architecture supports ARMv6 instructions)
-          cp $srcdir/armv6-test.c conftest.$ac_ext
           CFLAGS="$CFLAGS -march=armv6"
-          AC_TRY_RUN(ac_compile,
+          AC_TRY_RUN([#include "$srcdir/armv6-test.c"],
             [AC_DEFINE_UNQUOTED(G_ATOMIC_ARM, 6,
                                 [armv6 atomic implementation])
              glib_memory_barrier_needed=yes