diff --git a/ChangeLog b/ChangeLog
index eb668b28ae..99e7e8b20b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-14 Andi Kleen  <ak@linux.intel.com>
+
+	* sysdeps/generic/elide.h: New file.
+
 2014-06-13  Stefan Liebler  <stli@linux.vnet.ibm.com>
 
 	* Makefile (installed-headers): Adjust path of pthread.h header.
diff --git a/sysdeps/generic/elide.h b/sysdeps/generic/elide.h
new file mode 100644
index 0000000000..180e632426
--- /dev/null
+++ b/sysdeps/generic/elide.h
@@ -0,0 +1,25 @@
+/* elide.h: Fallback noop lock elision support.
+   Copyright (C) 2014 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+#ifndef ELIDE_H
+#define ELIDE_H 1
+
+#define ELIDE_LOCK(adapt_count, is_lock_free) 0
+#define ELIDE_TRYLOCK(adapt_count, is_lock_free, write) 0
+#define ELIDE_UNLOCK(is_lock_free) 0
+
+#endif