Revert "Prevent load_acquire redefinition in ordered_loads_only.h"

(That change is not needed because the file defines really only
load_acquire, and load_read is the same as in generalize-small.h)

This reverts commit ad464bf64a139cefa8b6f6e77b5f1f5ea1c51519.

diff --git a/src/atomic_ops/sysdeps/loadstore/ordered_loads_only.h b/src/atomic_ops/sysdeps/loadstore/ordered_loads_only.h
index 604738a813a67be6ed8306048a669ac52fd9cf0a..785219499b1b6d6490c7550f86113a40c01a26e2 100644 (file)
--- a/src/atomic_ops/sysdeps/loadstore/ordered_loads_only.h
+++ b/src/atomic_ops/sysdeps/loadstore/ordered_loads_only.h
@@ -31,10 +31,8 @@
   }
 # define AO_HAVE_char_load_read
 
-# ifndef AO_HAVE_char_load_acquire
-#   define AO_char_load_acquire(addr) AO_char_load_read(addr)
-#   define AO_HAVE_char_load_acquire
-# endif
+# define AO_char_load_acquire(addr) AO_char_load_read(addr)
+# define AO_HAVE_char_load_acquire
 #endif /* AO_HAVE_char_load */
 /*
  * Copyright (c) 2003 by Hewlett-Packard Company.  All rights reserved.
@@ -69,10 +67,8 @@
   }
 # define AO_HAVE_short_load_read
 
-# ifndef AO_HAVE_short_load_acquire
-#   define AO_short_load_acquire(addr) AO_short_load_read(addr)
-#   define AO_HAVE_short_load_acquire
-# endif
+# define AO_short_load_acquire(addr) AO_short_load_read(addr)
+# define AO_HAVE_short_load_acquire
 #endif /* AO_HAVE_short_load */
 /*
  * Copyright (c) 2003 by Hewlett-Packard Company.  All rights reserved.
@@ -107,10 +103,8 @@
   }
 # define AO_HAVE_int_load_read
 
-# ifndef AO_HAVE_int_load_acquire
-#   define AO_int_load_acquire(addr) AO_int_load_read(addr)
-#   define AO_HAVE_int_load_acquire
-# endif
+# define AO_int_load_acquire(addr) AO_int_load_read(addr)
+# define AO_HAVE_int_load_acquire
 #endif /* AO_HAVE_int_load */
 /*
  * Copyright (c) 2003 by Hewlett-Packard Company.  All rights reserved.
@@ -145,10 +139,8 @@
   }
 # define AO_HAVE_load_read
 
-# ifndef AO_HAVE_load_acquire
-#   define AO_load_acquire(addr) AO_load_read(addr)
-#   define AO_HAVE_load_acquire
-# endif
+# define AO_load_acquire(addr) AO_load_read(addr)
+# define AO_HAVE_load_acquire
 #endif /* AO_HAVE_load */
 /*
  * Copyright (c) 2003 by Hewlett-Packard Company.  All rights reserved.
@@ -183,8 +175,6 @@
   }
 # define AO_HAVE_double_load_read
 
-# ifndef AO_HAVE_double_load_acquire
-#   define AO_double_load_acquire(addr) AO_double_load_read(addr)
-#   define AO_HAVE_double_load_acquire
-# endif
+# define AO_double_load_acquire(addr) AO_double_load_read(addr)
+# define AO_HAVE_double_load_acquire
 #endif /* AO_HAVE_double_load */

diff --git a/src/atomic_ops/sysdeps/loadstore/ordered_loads_only.template b/src/atomic_ops/sysdeps/loadstore/ordered_loads_only.template
index 476bd8c6cb830f893ddd0ad3cd835dea3b9fcc70..bc828ce452c218f66a44e44d35d4ce6fd21d94f9 100644 (file)
--- a/src/atomic_ops/sysdeps/loadstore/ordered_loads_only.template
+++ b/src/atomic_ops/sysdeps/loadstore/ordered_loads_only.template
@@ -31,8 +31,6 @@
   }
 # define AO_HAVE_XSIZE_load_read
 
-# ifndef AO_HAVE_XSIZE_load_acquire
-#   define AO_XSIZE_load_acquire(addr) AO_XSIZE_load_read(addr)
-#   define AO_HAVE_XSIZE_load_acquire
-# endif
+# define AO_XSIZE_load_acquire(addr) AO_XSIZE_load_read(addr)
+# define AO_HAVE_XSIZE_load_acquire
 #endif /* AO_HAVE_XSIZE_load */