From 71b8b018ddb05c9f4a31d728c75019772bf79344 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 30 Oct 2005 19:06:52 +0000 Subject: * misc/hsearch_r.c (hsearch_r): Remove duplicate test. Patch by Chris Caputo . 2005-10-28 Kaz Kojima * sysdeps/unix/sh/sysdep.S: Remove unnecessary weak_alias. * sysdeps/unix/sysv/linux/sh/socket.S: Honor NO_WEAK_ALIAS. --- sysdeps/unix/sh/sysdep.S | 4 +--- sysdeps/unix/sysv/linux/sh/socket.S | 8 +++++++- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'sysdeps') diff --git a/sysdeps/unix/sh/sysdep.S b/sysdeps/unix/sh/sysdep.S index 074b74333c..6e4798e45a 100644 --- a/sysdeps/unix/sh/sysdep.S +++ b/sysdeps/unix/sh/sysdep.S @@ -1,4 +1,4 @@ -/* Copyright (C) 1999, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1999, 2000, 2005 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 @@ -98,5 +98,3 @@ skip: #endif #endif END(__syscall_error) - -weak_alias (__syscall_error, syscall_error) diff --git a/sysdeps/unix/sysv/linux/sh/socket.S b/sysdeps/unix/sysv/linux/sh/socket.S index f1369eb49b..eb1761b94b 100644 --- a/sysdeps/unix/sysv/linux/sh/socket.S +++ b/sysdeps/unix/sysv/linux/sh/socket.S @@ -1,4 +1,4 @@ -/* Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. +/* Copyright (C) 1999, 2000, 2003, 2004, 2005 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 @@ -33,7 +33,11 @@ The .S files for the other calls just #define socket and #include this. */ #ifndef __socket +#ifndef NO_WEAK_ALIAS #define __socket P(__,socket) +#else +#define __socket socket +#endif #endif #define PUSHARGS_1 mov.l r4,@-r15; \ @@ -173,4 +177,6 @@ ENTRY (__socket) PSEUDO_END (__socket) +#ifndef NO_WEAK_ALIAS weak_alias (__socket, socket) +#endif -- cgit 1.4.1