aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-03-20 14:50:57 +0000
committerRoland McGrath <roland@gnu.org>1996-03-20 14:50:57 +0000
commit948c3e72ecaa4e8dfce47dcbc62b9723c9946155 (patch)
treefc42e920de8cebf0f84485b2f060730b790fa901
parent213afb94b631fef0e6f24a2c61f5e31de77b62f5 (diff)
downloadglibc-948c3e72ecaa4e8dfce47dcbc62b9723c9946155.tar
glibc-948c3e72ecaa4e8dfce47dcbc62b9723c9946155.tar.gz
glibc-948c3e72ecaa4e8dfce47dcbc62b9723c9946155.tar.bz2
glibc-948c3e72ecaa4e8dfce47dcbc62b9723c9946155.zip
Wed Mar 20 09:42:11 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu>
* elf/dl-load.c (_dl_map_object_from_fd): Always set L->l_type; if not lt_executable, then lt_library. * elf/rtld.c (dl_main): Don't set NEW->l_type after _dl_map_object. Wed Mar 20 00:08:23 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/syscalls.list: Remove gtty and stty. Tue Mar 19 16:31:06 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/termbits.h (CRTSCTS, CBAUDEX, VEOL, VEOL2, VMIN, VTIME): Corrected. (PAGEOUT, WRAP, VDSUSP): Deleted. * sysdeps/unix/readdir.c: Test [! _DIRENT_HAVE_D_RECLEN] instead of (sizeof (DP->d_name) > 1) to detect fixed-size dir entries.
-rw-r--r--ChangeLog19
-rw-r--r--elf/dl-load.c3
-rw-r--r--elf/rtld.c3
-rw-r--r--sysdeps/unix/sysv/linux/syscalls.list2
-rw-r--r--sysdeps/unix/sysv/linux/termbits.h17
5 files changed, 27 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog
index 7e8e4a82ba..c059c09fe3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,24 @@
+Wed Mar 20 09:42:11 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu>
+
+ * elf/dl-load.c (_dl_map_object_from_fd): Always set L->l_type; if not
+ lt_executable, then lt_library.
+ * elf/rtld.c (dl_main): Don't set NEW->l_type after _dl_map_object.
+
+Wed Mar 20 00:08:23 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
+
+ * sysdeps/unix/sysv/linux/syscalls.list: Remove gtty and stty.
+
+Tue Mar 19 16:31:06 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
+
+ * sysdeps/unix/sysv/linux/termbits.h (CRTSCTS, CBAUDEX, VEOL,
+ VEOL2, VMIN, VTIME): Corrected.
+ (PAGEOUT, WRAP, VDSUSP): Deleted.
+
Tue Mar 19 14:18:42 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu>
+ * sysdeps/unix/readdir.c: Test [! _DIRENT_HAVE_D_RECLEN] instead of
+ (sizeof (DP->d_name) > 1) to detect fixed-size dir entries.
+
* sysdeps/i386/fpu/__math.h (asinh): Call log1p instead of __log1p.
* math/math.h: Move M_* constants before __math.h include.
diff --git a/elf/dl-load.c b/elf/dl-load.c
index 527901cd6d..1625d3cf5b 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -430,8 +430,7 @@ _dl_map_object_from_fd (const char *name, int fd, char *realname)
}
}
- if (type == ET_EXEC)
- l->l_type = lt_executable;
+ l->l_type = type == ET_EXEC ? lt_executable : lt_library;
if (l->l_ld == 0)
{
diff --git a/elf/rtld.c b/elf/rtld.c
index aa004f325e..23e0d35d78 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -1,5 +1,5 @@
/* Run time dynamic linker.
-Copyright (C) 1995 Free Software Foundation, Inc.
+Copyright (C) 1995, 1996 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
@@ -269,7 +269,6 @@ of this helper program; chances are you did not intend to run this program.\n",
{
struct link_map *new;
new = _dl_map_object (l, strtab + d->d_un.d_val);
- new->l_type = lt_library;
if (!before_rtld && new == &rtld_map)
before_rtld = last;
last = new;
diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list
index 2da874eaed..8bec38d204 100644
--- a/sysdeps/unix/sysv/linux/syscalls.list
+++ b/sysdeps/unix/sysv/linux/syscalls.list
@@ -8,7 +8,6 @@ getpgid - getpgid 1 getpgid
getpgrp - getpgrp 0 getpgrp
getppid - getppid 0 __getppid getppid
getsid - getsid 1 getsid
-gtty - gtty 2 gtty
ipc msgget ipc 5 __ipc
mlock - mlock 2 __mlock mlock
mlockall - mlockall 1 __mlockall mlockall
@@ -23,6 +22,5 @@ s_sigsuspend sigsuspend sigsuspend 3 __syscall_sigsuspend
setpgid - setpgid 2 setpgid
sigpending - sigpending 1 sigpending
sigprocmask - sigprocmask 3 __sigprocmask sigprocmask
-stty - stty 2 stty
umount - umount 1 __umount umount
wait4 - wait4 4 __wait4 wait4
diff --git a/sysdeps/unix/sysv/linux/termbits.h b/sysdeps/unix/sysv/linux/termbits.h
index 5af4c4aae8..fa537ab7ac 100644
--- a/sysdeps/unix/sysv/linux/termbits.h
+++ b/sysdeps/unix/sysv/linux/termbits.h
@@ -84,8 +84,6 @@ struct termios
#define FFDLY 0x00008000
#define FF0 0
#define FF1 0x00008000
-#define PAGEOUT 0x00010000
-#define WRAP 0x00020000
#endif
/* Control modes. */
@@ -102,9 +100,9 @@ struct termios
#define HUPCL 0x00000400 /* Hang up on last close. */
#define CLOCAL 0x00000800 /* Ignore modem status lines. */
#ifdef __USE_BSD
-#define CRTSCTS 0x08000000
+#define CRTSCTS 0x80000000
#define CBAUD 0x0000000f /* Mask for speed from c_cflag. */
-#define CBAUDEX 0x00010000 /* Mask for extended speed from c_cflag. */
+#define CBAUDEX 0x00001000 /* Mask for extended speed from c_cflag. */
#endif
/* Local modes. */
@@ -133,9 +131,9 @@ struct termios
/* Control characters. */
#define VEOF 4 /* End-of-file character [ICANON]. */
-#define VEOL 5 /* End-of-line character [ICANON]. */
+#define VEOL 11 /* End-of-line character [ICANON]. */
#ifdef __USE_BSD
-#define VEOL2 6 /* Second EOL character [ICANON]. */
+#define VEOL2 16 /* Second EOL character [ICANON]. */
#define VSWTCH 7 /* ??? */
#endif
#define VERASE 2 /* Erase character [ICANON]. */
@@ -149,17 +147,14 @@ struct termios
#define VINTR 0 /* Interrupt character [ISIG]. */
#define VQUIT 1 /* Quit character [ISIG]. */
#define VSUSP 10 /* Suspend character [ISIG]. */
-#ifdef __USE_BSD
-#define VDSUSP 11 /* Delayed suspend character [ISIG]. */
-#endif
#define VSTART 8 /* Start (X-ON) character [IXON, IXOFF]. */
#define VSTOP 9 /* Stop (X-OFF) character [IXON, IXOFF]. */
#ifdef __USE_BSD
#define VLNEXT 15 /* Literal-next character [IEXTEN]. */
#define VDISCARD 13 /* Discard character [IEXTEN]. */
#endif
-#define VMIN VEOF /* Minimum number of bytes read at once [!ICANON]. */
-#define VTIME VEOL /* Time-out value (tenths of a second) [!ICANON]. */
+#define VMIN 6 /* Minimum number of bytes read at once [!ICANON]. */
+#define VTIME 5 /* Time-out value (tenths of a second) [!ICANON]. */
#define NCCS 19
cc_t c_cc[NCCS];
};