aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Jacobowitz <dan@codesourcery.com>2005-10-27 18:50:12 +0000
committerDaniel Jacobowitz <dan@codesourcery.com>2005-10-27 18:50:12 +0000
commite7837483d3d1baaae6ef46f0634e059f1ca15e83 (patch)
treefada1b2f789fc3ad70e0e9948b8a2d89708acf53
parent011363465f62d18b898601d590615a97a203cc61 (diff)
downloadglibc-e7837483d3d1baaae6ef46f0634e059f1ca15e83.tar.xz
glibc-e7837483d3d1baaae6ef46f0634e059f1ca15e83.zip
* sysdeps/unix/sysv/linux/arm/socket.S: Honor NO_WEAK_ALIAS.
-rw-r--r--ChangeLog.arm4
-rw-r--r--sysdeps/unix/sysv/linux/arm/socket.S10
2 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog.arm b/ChangeLog.arm
index f38a92946a..4cf9c1ae34 100644
--- a/ChangeLog.arm
+++ b/ChangeLog.arm
@@ -1,3 +1,7 @@
+2005-10-27 Daniel Jacobowitz <dan@codesourcery.com>
+
+ * sysdeps/unix/sysv/linux/arm/socket.S: Honor NO_WEAK_ALIAS.
+
2005-10-10 Daniel Jacobowitz <dan@codesourcery.com>
Joseph Myers <joseph@codesourcery.com>
Julian Brown <julian@codesourcery.com>
diff --git a/sysdeps/unix/sysv/linux/arm/socket.S b/sysdeps/unix/sysv/linux/arm/socket.S
index 212a489afe..69f88eb3ca 100644
--- a/sysdeps/unix/sysv/linux/arm/socket.S
+++ b/sysdeps/unix/sysv/linux/arm/socket.S
@@ -1,4 +1,6 @@
-/* Copyright (C) 1995, 1996, 1997, 1998, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1997, 1998, 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
@@ -32,7 +34,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 str a1, [sp, $-4]!
@@ -120,4 +126,6 @@ ENTRY (__socket)
PSEUDO_END (__socket)
+#ifndef NO_WEAK_ALIAS
weak_alias (__socket, socket)
+#endif