Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 476-489)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 153-160)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-127

1 files changed, 8 insertions, 1 deletions

diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h
index 3a1ace91b41..419fa131692 100644
--- a/src/m/amdx86-64.h
+++ b/src/m/amdx86-64.h
@@ -118,7 +118,14 @@ Boston, MA 02110-1301, USA.  */
 #undef LIB_STANDARD
 #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o
 
-#else /* !__FreeBSD__ */
+#elif defined(__OpenBSD__)
+
+#undef START_FILES
+#define START_FILES pre-crt0.o /usr/lib/crt0.o /usr/lib/crtbegin.o
+#undef LIB_STANDARD
+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o
+
+#else /* !__OpenBSD__ && !__FreeBSD__ */
 
 #undef START_FILES
 #define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o