OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

configure.in: Set up PLATFORMOBJS not PLATFORM_SPECIFIC_SOURCES. 

* configure.in: Set up PLATFORMOBJS not PLATFORM_SPECIFIC_SOURCES.
	Symlink PLATFORMH to platform.h.
	* Makefile.am (libgcj_la_DEPENDENCIES, libgcj_la_LIBADD): Add
	PLATFORMOBJS.
	* java/lang/natSystem.cc: #include platform.h not posix.h.
	* Makefile.in: Rebuilt with libgcj automake.
	* configure: Rebuilt.

From-SVN: r49534
This commit is contained in:
Bryce McKinlay 2002-02-06 01:46:46 +00:00 committed by Bryce McKinlay
parent 73c342b9c8
commit 8c78e3a3cd
4 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libjava/ChangeLog
View File

@ -1,3 +1,13 @@
2002-02-05 Bryce McKinlay <bryce@waitaki.otago.ac.nz>
* configure.in: Set up PLATFORMOBJS not PLATFORM_SPECIFIC_SOURCES.
Symlink PLATFORMH to platform.h.
* Makefile.am (libgcj_la_DEPENDENCIES, libgcj_la_LIBADD): Add
PLATFORMOBJS.
* java/lang/natSystem.cc: #include platform.h not posix.h.
* Makefile.in: Rebuilt with libgcj automake.
* configure: Rebuilt.
2002-02-05 Richard Henderson <rth@redhat.com>
* Makefile.in: Undo munging last change.

7
libjava/Makefile.am
View File

@ -123,16 +123,17 @@ javao_files = $(java_source_files:.java=.lo) \
$(built_java_source_files:.java=.lo)
x_javao_files = $(x_java_source_files:.java=.lo)
libgcj_la_SOURCES = prims.cc $(PLATFORM_SPECIFIC_SOURCES) jni.cc exception.cc \
libgcj_la_SOURCES = prims.cc jni.cc exception.cc \
resolve.cc defineclass.cc interpret.cc name-finder.cc verify.cc \
$(nat_source_files)
EXTRA_libgcj_la_SOURCES = boehm.cc nogc.cc posix-threads.cc no-threads.cc \
win32-threads.cc posix.cc win32.cc \
$(c_source_files) $(java_source_files) $(built_java_source_files)
libgcj_la_DEPENDENCIES = libgcj.jar $(javao_files) \
$(c_files) $(GCOBJS) $(THREADOBJS) $(LIBLTDL)
$(c_files) $(GCOBJS) $(THREADOBJS) $(PLATFORMOBJS) $(LIBLTDL)
libgcj_la_LIBADD = $(javao_files) $(c_files) $(GCOBJS) \
$(THREADOBJS)
$(THREADOBJS) $(PLATFORMOBJS)
# Include THREADLIBS here to ensure that the correct version of
# certain linuxthread functions get linked:
libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLIBS) $(LIBLTDL) \

15
libjava/configure.in
View File

@ -193,27 +193,30 @@ AC_ARG_WITH(ecos,
TARGET_ECOS="$with_ecos"
)
PLATFORM_SPECIFIC_SOURCES=
PLATFORMOBJS=
case "$TARGET_ECOS" in
no) case "$host" in
mingw)
PLATFORM=Win32
PLATFORM_SPECIFIC_SOURCES=win32.cc
PLATFORMOBJS=win32.lo
PLATFORMH=win32.h
;;
*)
PLATFORM=Posix
PLATFORM_SPECIFIC_SOURCES=posix.cc
PLATFORMOBJS=posix.lo
PLATFORMH=posix.h
;;
esac
;;
*)
PLATFORM=Ecos
AC_DEFINE(ECOS)
PLATFORM_SPECIFIC_SOURCES=posix.cc
PLATFORMOBJS=posix.lo
PLATFORMH=posix.h
;;
esac
AC_SUBST(PLATFORM_SPECIFIC_SOURCES)
AC_SUBST(PLATFORMOBJS)
AC_LINK_FILES(include/$PLATFORMH, include/platform.h)
AC_EGREP_HEADER(uint32_t, stdint.h, AC_DEFINE(HAVE_INT32_DEFINED))
AC_EGREP_HEADER(uint32_t, inttypes.h, AC_DEFINE(HAVE_INT32_DEFINED))

2
libjava/java/lang/natSystem.cc
View File

@ -14,7 +14,7 @@ details. */
#include <string.h>
#include <stdlib.h>
#include "posix.h"
#include "platform.h"
#ifdef HAVE_PWD_H
#include <pwd.h>