diff options
| author | law <law@138bc75d-0d04-0410-961f-82ee72b054a4> | 1997-09-27 04:07:00 +0000 |
|---|---|---|
| committer | law <law@138bc75d-0d04-0410-961f-82ee72b054a4> | 1997-09-27 04:07:00 +0000 |
| commit | 7256f633fb03e069a90dfac534cd839fa8e3be3a (patch) | |
| tree | c804a39f2f0e78941efa5280aa004f05f08478c1 /libio/config | |
| parent | 2c1331605dc9544cdff0ff57b182e1f69f94994d (diff) | |
| download | gcc-7256f633fb03e069a90dfac534cd839fa8e3be3a.tar.gz | |
libio changes from Ulrich to help "old linux" systems. See ChangeLog
for details.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@15741 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libio/config')
| -rw-r--r-- | libio/config/linux.mt | 4 | ||||
| -rw-r--r-- | libio/config/linuxlibc1.mt | 34 |
2 files changed, 19 insertions, 19 deletions
diff --git a/libio/config/linux.mt b/libio/config/linux.mt index 4bb92b76b2e..ad1dc51f316 100644 --- a/libio/config/linux.mt +++ b/libio/config/linux.mt @@ -19,12 +19,10 @@ LIBIO_INCLUDE= IO_OBJECTS= STDIO_WRAP_OBJECTS= OSPRIM_OBJECTS= +STDIO_OBJECTS= # We have the rest in /usr/include. USER_INCLUDES=PlotFile.h SFile.h builtinbuf.h editbuf.h fstream.h \ indstream.h iomanip.h iostream.h istream.h ostream.h \ parsestream.h pfstream.h procbuf.h stdiostream.h stream.h \ streambuf.h strfile.h strstream.h - -# tell we want the mt-safe version -MT_CFLAGS = -D_IO_MTSAFE_IO diff --git a/libio/config/linuxlibc1.mt b/libio/config/linuxlibc1.mt index ffda1720839..1f22b4a0dc8 100644 --- a/libio/config/linuxlibc1.mt +++ b/libio/config/linuxlibc1.mt @@ -1,26 +1,28 @@ -# Since the Linux C library has libio, we have to be very careful. +# Use the libio which comes with the local libc. -# By default, we build libio and use it. If someone wants to not -# build it, let them go to extra work. The reason is that the user -# may want a newer, bug fixed libio, also on a linux 1.0.8 system -# things just won't build with the bottom section uncommented. +# That is where we keep the g++ header files. +gxx_includedir =$(prefix)/include/g++ # Comment this out to avoid including the stdio functions in libiostream.a: -LIBIOSTREAM_OBJECTS = $(IO_OBJECTS) $(IOSTREAM_OBJECTS) $(STDIO_WRAP_OBJECTS) $(OSPRIM_OBJECTS) -LIBIOSTREAM_DEP = $(LIBIOSTREAM_OBJECTS) stmp-stdio -LIBIOSTREAM_USE = $(LIBIOSTREAM_OBJECTS) `cat stdio.list` +# LIBIOSTREAM_OBJECTS = $(IO_OBJECTS) $(IOSTREAM_OBJECTS) $(STDIO_WRAP_OBJECTS) $(OSPRIM_OBJECTS) +# LIBIOSTREAM_DEP = $(LIBIOSTREAM_OBJECTS) stdio.list +# LIBIOSTREAM_USE = $(LIBIOSTREAM_OBJECTS) `cat stdio.list` # Comment the above and uncomment the below to use the code in the Linux libc: # We have _G_config.h in /usr/include. -# _G_CONFIG_H= +_G_CONFIG_H= + +# We must not see the libio.h file from this library. +LIBIO_INCLUDE= # We have those in libc.a. -# IO_OBJECTS= -# STDIO_WRAP_OBJECTS= -# OSPRIM_OBJECTS= +IO_OBJECTS=iogetc.o ioputc.o iofeof.o ioferror.o +STDIO_WRAP_OBJECTS= +OSPRIM_OBJECTS= +STDIO_OBJECTS= # We have the rest in /usr/include. -# USER_INCLUDES=PlotFile.h SFile.h builtinbuf.h editbuf.h fstream.h \ -# indstream.h iomanip.h iostream.h istream.h ostream.h \ -# parsestream.h pfstream.h procbuf.h stdiostream.h stream.h \ -# streambuf.h strfile.h strstream.h +USER_INCLUDES=PlotFile.h SFile.h builtinbuf.h editbuf.h fstream.h \ + indstream.h iomanip.h iostream.h istream.h ostream.h \ + parsestream.h pfstream.h procbuf.h stdiostream.h stream.h \ + streambuf.h strfile.h strstream.h |