refresh

diff --git a/meta b/meta
index 94563fb7beedc40c7557336bd4459d3b998ce82c..f17953c3de091de5a069b0816e2320512ab2abbc 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: 55277fc96c6b2a811ba923cabfe958d62cac3a61
-Head: c9442acd57fb2203fa03b26034f6a4ec56de9ef3
+Previous: 3a3be96fa9a2e702589ffed53773aa3d286ba830
+Head: 5e532c37dd8c6b45cf168c670c7d4e9eebc83239
 Applied:
-  atomic: 8174a137121d14c0c6f9359e40b098990b357151
-  refresh-temp: c9442acd57fb2203fa03b26034f6a4ec56de9ef3
+  atomic: 5e532c37dd8c6b45cf168c670c7d4e9eebc83239
 Unapplied:
 Hidden:

diff --git a/patches/atomic b/patches/atomic
index 875bc355963b3a268dc8a6d1cd45efe0ceb0bf1a..e5032e9d36d9397cee34fc23cc1f930d3c4a8e12 100644 (file)
--- a/patches/atomic
+++ b/patches/atomic
@@ -1,5 +1,5 @@
 Bottom: 44cd90e52fd7bd946e34e9acdfcf1cef88293c9a
-Top:    375f712a43d5dd3d438e86606157d335ae7e8590
+Top:    82b37f69cd97e9066b5128b783b6674217c7ed45
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-08-25 10:26:22 -0700
 
@@ -18,18 +18,27 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/configure.in b/configure.in
-index 997c775..192289a 100644
+old mode 100644
+new mode 100755
+index 997c775..28f98ed
 --- a/configure.in
 +++ b/configure.in
-@@ -39,6 +39,12 @@ AC_CHECK_HEADER(infiniband/umad.h, [],
+@@ -39,6 +39,19 @@ AC_CHECK_HEADER(infiniband/umad.h, [],
      AC_MSG_ERROR([<infiniband/umad.h> not found.  Is libibumad installed?]))\r
  fi\r
  \r
 +dnl Check for gcc atomic intrinsics\r
-+AC_TRY_LINK(\r
-+    [int i = 0;\r
-+     return __sync_add_and_fetch(&i, 1) == __sync_sub_and_fetch(&i, 1) + 1;],\r
-+    [], AC_DEFINE(DEFINE_ATOMICS, 1, [defining atomics]))\r
++AC_MSG_CHECKING(compiler support for atomics)\r
++AC_TRY_LINK([],\r
++    [\r
++        int i = 0;\r
++        return __sync_add_and_fetch(&i, 1) == __sync_sub_and_fetch(&i, 1) + 1;\r
++    ],\r
++    AC_MSG_RESULT(yes),\r
++    [\r
++        AC_MSG_RESULT(no - defining atomics)\r
++        AC_DEFINE(DEFINE_ATOMICS, [], [defining atomics])\r
++    ])\r
 +\r
  AC_CACHE_CHECK(whether ld accepts --version-script, ac_cv_version_script,\r
      if test -n "`$LD --help < /dev/null 2>/dev/null | grep version-script`"; then\r

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 2b38922..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,37 +0,0 @@
-Bottom: 375f712a43d5dd3d438e86606157d335ae7e8590
-Top:    82b37f69cd97e9066b5128b783b6674217c7ed45
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-08-25 12:04:45 -0700
-
-Refresh of atomic
-
----
-
-diff --git a/configure.in b/configure.in
-old mode 100644
-new mode 100755
-index 192289a..28f98ed
---- a/configure.in
-+++ b/configure.in
-@@ -40,10 +40,17 @@ AC_CHECK_HEADER(infiniband/umad.h, [],
- fi\r
- \r
- dnl Check for gcc atomic intrinsics\r
--AC_TRY_LINK(\r
--    [int i = 0;\r
--     return __sync_add_and_fetch(&i, 1) == __sync_sub_and_fetch(&i, 1) + 1;],\r
--    [], AC_DEFINE(DEFINE_ATOMICS, 1, [defining atomics]))\r
-+AC_MSG_CHECKING(compiler support for atomics)\r
-+AC_TRY_LINK([],\r
-+    [\r
-+        int i = 0;\r
-+        return __sync_add_and_fetch(&i, 1) == __sync_sub_and_fetch(&i, 1) + 1;\r
-+    ],\r
-+    AC_MSG_RESULT(yes),\r
-+    [\r
-+        AC_MSG_RESULT(no - defining atomics)\r
-+        AC_DEFINE(DEFINE_ATOMICS, [], [defining atomics])\r
-+    ])\r
- \r
- AC_CACHE_CHECK(whether ld accepts --version-script, ac_cv_version_script,\r
-     if test -n "`$LD --help < /dev/null 2>/dev/null | grep version-script`"; then