diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 12b802b02..1c7363ec4 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,10 @@
+2004-03-25  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* libc/sys/linux/sys/lock.h: Turn on __USE_GNU flag if not already
+	defined.  Change __LOCK_RECURSIVE_INIT to be __LOCK_INIT_RECURSIVE.
+	* libc/sys/linux/dl/dl-support.c: Change __LOCK_RECURSIVE_INIT
+	to be __LOCK_INIT_RECURSIVE.
+
 2004-03-11  Kazu Hirata  <kazu@cs.umass.edu>
 
 	* libc/sys/h8300hms/Makefile.am (lib_a_SOURCES): Replace
diff --git a/newlib/libc/sys/linux/dl/dl-support.c b/newlib/libc/sys/linux/dl/dl-support.c
index b7cb560a6..ce5349153 100644
--- a/newlib/libc/sys/linux/dl/dl-support.c
+++ b/newlib/libc/sys/linux/dl/dl-support.c
@@ -112,7 +112,7 @@ hp_timing_t _dl_cpuclock_offset;
    This must be a recursive lock since the initializer function of
    the loaded object might as well require a call to this function.
    At this time it is not anymore a problem to modify the tables.  */
-__LOCK_RECURSIVE_INIT (, _dl_load_lock)
+__LOCK_INIT_RECURSIVE(, _dl_load_lock)
 
 
 #ifdef HAVE_AUX_VECTOR
diff --git a/newlib/libc/sys/linux/sys/lock.h b/newlib/libc/sys/linux/sys/lock.h
index c70c56cb1..167392e10 100644
--- a/newlib/libc/sys/linux/sys/lock.h
+++ b/newlib/libc/sys/linux/sys/lock.h
@@ -7,6 +7,10 @@
 #define  _LIBC  1
 #define  NOT_IN_libc 1
 
+#ifndef __USE_GNU
+#define __USE_GNU 1
+#endif
+
 #include <bits/libc-lock.h>
 
 typedef __libc_lock_t _LOCK_T;
@@ -14,7 +18,7 @@ typedef __libc_lock_recursive_t _LOCK_RECURSIVE_T;
 
 #define __LOCK_INIT(class,lock) \
   __libc_lock_define_initialized(class, lock)
-#define __LOCK_RECURSIVE_INIT(class, lock) \
+#define __LOCK_INIT_RECURSIVE(class, lock) \
   __libc_lock_define_initialized_recursive(class, lock)
 
 #define __lock_init(__lock) __libc_lock_init(__lock)