1 diff -ur gcc-2.95.2/libio/libio.h gcc-2.95.2.new/libio/libio.h
2 --- gcc-2.95.2/libio/libio.h Mon Jun 29 20:06:26 1998
3 +++ gcc-2.95.2.new/libio/libio.h Mon Jul 17 20:59:17 2000
5 extern _IO_size_t _IO_sgetn __P ((_IO_FILE *, void *, _IO_size_t));
7 #if defined(_G_IO_IO_FILE_VERSION) && _G_IO_IO_FILE_VERSION == 0x20001
8 -extern _IO_fpos64_t _IO_seekoff __P ((_IO_FILE *, _IO_off64_t, int, int));
9 -extern _IO_fpos64_t _IO_seekpos __P ((_IO_FILE *, _IO_fpos64_t, int));
10 +extern _IO_off64_t _IO_seekoff __P ((_IO_FILE *, _IO_off64_t, int, int));
11 +extern _IO_off64_t _IO_seekpos __P ((_IO_FILE *, _IO_off64_t, int));
13 -extern _IO_fpos_t _IO_seekoff __P ((_IO_FILE *, _IO_off_t, int, int));
14 -extern _IO_fpos_t _IO_seekpos __P ((_IO_FILE *, _IO_fpos_t, int));
15 +extern _IO_off_t _IO_seekoff __P ((_IO_FILE *, _IO_off_t, int, int));
16 +extern _IO_off_t _IO_seekpos __P ((_IO_FILE *, _IO_off_t, int));
19 extern void _IO_free_backup_area __P ((_IO_FILE *));
20 diff -ur gcc-2.95.2/libio/libioP.h gcc-2.95.2.new/libio/libioP.h
21 --- gcc-2.95.2/libio/libioP.h Tue May 18 00:58:56 1999
22 +++ gcc-2.95.2.new/libio/libioP.h Mon Jul 17 21:02:46 2000
25 # if defined __GLIBC__ && __GLIBC__ >= 2
26 # if __GLIBC_MINOR__ > 0
27 +# define __NO_WEAK_PTHREAD_ALIASES
28 # include <bits/libc-lock.h>
30 # include <libc-lock.h>
32 It matches the streambuf::seekoff virtual function.
33 It is also used for the ANSI fseek function. */
34 #if defined(_G_IO_IO_FILE_VERSION) && _G_IO_IO_FILE_VERSION == 0x20001
35 -typedef _IO_fpos64_t (*_IO_seekoff_t) __PMT ((_IO_FILE *FP, _IO_off64_t OFF,
36 +typedef _IO_off64_t (*_IO_seekoff_t) __PMT ((_IO_FILE *FP, _IO_off64_t OFF,
39 -typedef _IO_fpos_t (*_IO_seekoff_t) __PMT ((_IO_FILE *FP, _IO_off_t OFF,
40 +typedef _IO_off_t (*_IO_seekoff_t) __PMT ((_IO_FILE *FP, _IO_off_t OFF,
43 #define _IO_SEEKOFF(FP, OFF, DIR, MODE) JUMP3 (__seekoff, FP, OFF, DIR, MODE)
45 It is also used for the ANSI fgetpos and fsetpos functions. */
46 /* The _IO_seek_cur and _IO_seek_end options are not allowed. */
47 #if defined(_G_IO_IO_FILE_VERSION) && _G_IO_IO_FILE_VERSION == 0x20001
48 -typedef _IO_fpos64_t (*_IO_seekpos_t) __PMT ((_IO_FILE *, _IO_fpos64_t, int));
49 +typedef _IO_off64_t (*_IO_seekpos_t) __PMT ((_IO_FILE *, _IO_fpos64_t, int));
51 -typedef _IO_fpos_t (*_IO_seekpos_t) __PMT ((_IO_FILE *, _IO_fpos_t, int));
52 +typedef _IO_off_t (*_IO_seekpos_t) __PMT ((_IO_FILE *, _IO_fpos_t, int));
54 #define _IO_SEEKPOS(FP, POS, FLAGS) JUMP2 (__seekpos, FP, POS, FLAGS)
57 /* Generic functions */
59 #if defined(_G_IO_IO_FILE_VERSION) && _G_IO_IO_FILE_VERSION == 0x20001
60 -extern _IO_fpos64_t _IO_seekoff __P ((_IO_FILE *, _IO_off64_t, int, int));
61 -extern _IO_fpos64_t _IO_seekpos __P ((_IO_FILE *, _IO_fpos64_t, int));
62 +extern _IO_off64_t _IO_seekoff __P ((_IO_FILE *, _IO_off64_t, int, int));
63 +extern _IO_off64_t _IO_seekpos __P ((_IO_FILE *, _IO_off64_t, int));
65 -extern _IO_fpos_t _IO_seekoff __P ((_IO_FILE *, _IO_off_t, int, int));
66 -extern _IO_fpos_t _IO_seekpos __P ((_IO_FILE *, _IO_fpos_t, int));
67 +extern _IO_off_t _IO_seekoff __P ((_IO_FILE *, _IO_off_t, int, int));
68 +extern _IO_off_t _IO_seekpos __P ((_IO_FILE *, _IO_off_t, int));
71 extern void _IO_switch_to_main_get_area __P ((_IO_FILE *));
73 extern int _IO_file_doallocate __P ((_IO_FILE *));
74 extern _IO_FILE* _IO_file_setbuf __P ((_IO_FILE *, char *, _IO_ssize_t));
75 #if defined(_G_IO_IO_FILE_VERSION) && _G_IO_IO_FILE_VERSION == 0x20001
76 -extern _IO_fpos64_t _IO_file_seekoff __P ((_IO_FILE *, _IO_off64_t, int, int));
77 -extern _IO_fpos64_t _IO_file_seek __P ((_IO_FILE *, _IO_off64_t, int));
78 +extern _IO_off64_t _IO_file_seekoff __P ((_IO_FILE *, _IO_off64_t, int, int));
79 +extern _IO_off64_t _IO_file_seek __P ((_IO_FILE *, _IO_off64_t, int));
81 -extern _IO_fpos_t _IO_file_seekoff __P ((_IO_FILE *, _IO_off_t, int, int));
82 -extern _IO_fpos_t _IO_file_seek __P ((_IO_FILE *, _IO_off_t, int));
83 +extern _IO_off_t _IO_file_seekoff __P ((_IO_FILE *, _IO_off_t, int, int));
84 +extern _IO_off_t _IO_file_seek __P ((_IO_FILE *, _IO_off_t, int));
86 extern _IO_size_t _IO_file_xsputn __P ((_IO_FILE *, const void *, _IO_size_t));
87 extern int _IO_file_stat __P ((_IO_FILE *, void *));
89 extern int _IO_str_overflow __P ((_IO_FILE *, int));
90 extern int _IO_str_pbackfail __P ((_IO_FILE *, int));
91 #if defined(_G_IO_IO_FILE_VERSION) && _G_IO_IO_FILE_VERSION == 0x20001
92 -extern _IO_fpos64_t _IO_str_seekoff __P ((_IO_FILE *, _IO_off64_t, int, int));
93 +extern _IO_off64_t _IO_str_seekoff __P ((_IO_FILE *, _IO_off64_t, int, int));
95 -extern _IO_fpos_t _IO_str_seekoff __P ((_IO_FILE *, _IO_off_t, int, int));
96 +extern _IO_off_t _IO_str_seekoff __P ((_IO_FILE *, _IO_off_t, int, int));
98 extern void _IO_str_finish __P ((_IO_FILE *, int));
100 diff -ur gcc-2.95.2/libio/parsestream.h gcc-2.95.2.new/libio/parsestream.h
101 --- gcc-2.95.2/libio/parsestream.h Fri Aug 22 00:58:20 1997
102 +++ gcc-2.95.2.new/libio/parsestream.h Mon Jul 17 21:04:48 2000
105 class parsebuf : public streambuf {
107 - _IO_fpos_t pos_at_line_start;
108 + _IO_off_t pos_at_line_start;
110 unsigned long __line_number;
112 diff -ur gcc-2.95.2/libio/streambuf.h gcc-2.95.2.new/libio/streambuf.h
113 --- gcc-2.95.2/libio/streambuf.h Mon Aug 9 02:07:01 1999
114 +++ gcc-2.95.2.new/libio/streambuf.h Mon Jul 17 20:51:49 2000
117 #if defined(_G_IO_IO_FILE_VERSION) && _G_IO_IO_FILE_VERSION == 0x20001
118 typedef _IO_off64_t streamoff;
119 -typedef _IO_fpos64_t streampos;
120 +typedef _IO_off64_t streampos;
121 +/*typedef _IO_fpos64_t streampos;*/
123 typedef _IO_off_t streamoff;
124 -typedef _IO_fpos_t streampos;
125 +typedef _IO_off_t streampos;
126 +/*typedef _IO_fpos_t streampos;*/
128 typedef _IO_ssize_t streamsize;
131 const void *&_vtable() { return *(const void**)((_IO_FILE*)this + 1); }
133 static streambuf* _list_all; /* List of open streambufs. */
134 - _IO_FILE*& xchain() { return _chain; }
135 + _IO_FILE*& xchain() { return (_IO_FILE*&)_chain; }
139 --- gcc-2.95.2/libstdc++/config/linux.ml~ Tue Jul 18 00:32:47 2000
140 +++ gcc-2.95.2/libstdc++/config/linux.ml Tue Jul 18 00:59:50 2000
143 LIBS = $(ARLIB) marlink $(ARLINK) $(SHLIB) mshlink $(SHLINK)
144 SHFLAGS = -Wl,-soname,$(MSHLINK)
146 +SHDEPS = -lm -lpthread
147 DEPLIBS = ../$(SHLIB)