This is the mail archive of the libc-hacker@sourceware.cygnus.com mailing list for the glibc project.

Note that libc-hacker is a closed list. You may look at the archives of this list, but subscription and posting are not open.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Further cleanup <sys/io.h> for glibc 2.2



I'm not really happy with this patch - the changes in glibc 2.1.3 to
<sys/io.h> lead to the introduction of new symbols with version 2.1.3.

Do we really want to have these functions with version 2.1.3?

A corresponding patch for 2.1.3 will follow later,
Andreas

2000-01-29  Andreas Jaeger  <aj@suse.de>

	* sysdeps/unix/sysv/linux/i386/Versions: Add functions from
	<sys/io.h> with version 2.1.3.

	* sysdeps/unix/sysv/linux/i386/Makefile (sysdep_routines): Add
	io-inlines.

	* sysdeps/unix/sysv/linux/i386/io-inlines.c: New file, used for
	implementation of extern inline functions.

	* sysdeps/unix/sysv/linux/alpha/sys/io.h: Add missing ints.

============================================================
Index: sysdeps/unix/sysv/linux/i386/Versions
--- sysdeps/unix/sysv/linux/i386/Versions	2000/01/29 12:02:47	1.5
+++ sysdeps/unix/sysv/linux/i386/Versions	2000/01/29 12:20:18
@@ -7,6 +7,10 @@
   GLIBC_2.1 {
     __modify_ldt; modify_ldt;
   }
+  GLIBC_2.1.3 {
+    inb; inb_p; inl; inl_p; insb; insl; insw; inw; inw_p;
+    outb; outb_p; outl; outl_p; outsb; outsl; outsw; outw; outw_p;
+  }
   GLIBC_2.2 {
     # New rlimit interface
     getrlimit; setrlimit; getrlimit64;
============================================================
Index: sysdeps/unix/sysv/linux/i386/Makefile
--- sysdeps/unix/sysv/linux/i386/Makefile	2000/01/24 12:07:00	1.18
+++ sysdeps/unix/sysv/linux/i386/Makefile	2000/01/29 12:20:18
@@ -1,5 +1,6 @@
 ifeq ($(subdir),misc)
-sysdep_routines += ioperm iopl vm86 setfsgid setfsuid setresgid setresuid
+sysdep_routines += ioperm iopl vm86 setfsgid setfsuid setresgid setresuid \
+		   io-inlines
 sysdep_headers += sys/elf.h sys/perm.h sys/reg.h sys/vm86.h sys/debugreg.h sys/io.h
 endif
 
============================================================
Index: sysdeps/unix/sysv/linux/alpha/sys/io.h
--- sysdeps/unix/sysv/linux/alpha/sys/io.h	2000/01/23 08:53:21	1.5
+++ sysdeps/unix/sysv/linux/alpha/sys/io.h	2000/01/29 12:20:18
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1999, 2000 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
@@ -65,12 +65,12 @@
 			    unsigned char *__buf) __THROW;
 
 /* Userspace declarations.  */
-extern unsigned int inb (unsigned long __port) __THROW;
-extern unsigned int inw (unsigned long __port) __THROW;
-extern unsigned int inl (unsigned long __port) __THROW;
-extern void outb (unsigned char __b, unsigned long __port) __THROW;
-extern void outw (unsigned short __w, unsigned long __port) __THROW;
-extern void outl (unsigned int __l, unsigned long __port) __THROW;
+extern unsigned int inb (unsigned long int __port) __THROW;
+extern unsigned int inw (unsigned long int __port) __THROW;
+extern unsigned int inl (unsigned long int __port) __THROW;
+extern void outb (unsigned char __b, unsigned long int __port) __THROW;
+extern void outw (unsigned short int __w, unsigned long int __port) __THROW;
+extern void outl (unsigned int __l, unsigned long int __port) __THROW;
 
 __END_DECLS
 
============================================================
Index: sysdeps/unix/sysv/linux/i386/io-inlines.c
--- sysdeps/unix/sysv/linux/i386/io-inlines.c	created
+++ sysdeps/unix/sysv/linux/i386/io-inlines.c	Sat Jan 29 13:14:40 2000	1.1
@@ -0,0 +1,24 @@
+/* Copyright (C) 2000 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
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+/*  <sys/io.h> declares some extern inline functions.  These functions
+    are declared additionally here if inlining is not possible.  */
+
+#define _EXTERN_INLINE /* empty */
+
+#include <sys/io.h>

-- 
 Andreas Jaeger
  SuSE Labs aj@suse.de
   private aj@arthur.rhein-neckar.de

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]