diff options
| author | aph <aph@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-09-04 18:00:31 +0000 |
|---|---|---|
| committer | aph <aph@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-09-04 18:00:31 +0000 |
| commit | fac862750e3dbbba769952a1fdc5c9a524902762 (patch) | |
| tree | 09a5f1f5bb8173c991287a709677d9c9cb1925ab /libjava/Makefile.am | |
| parent | fa6da315b24ca02bc4a398ceeafca6d1f8dbd6b9 (diff) | |
| download | gcc-fac862750e3dbbba769952a1fdc5c9a524902762.tar.gz | |
2007-09-04 Andrew Haley <aph@redhat.com>
PR java/27908
* testsuite/libjava.lang/PR27908.java
({run1,run2,run3}.isRunning): New Method.
(main): Fix race condition.
2007-08-29 Andrew Haley <aph@redhat.com>
* gnu/classpath/natVMStackWalker.cc (VMStackWalker::getCallingClass):
Make sure we're not sibcalled.
(GET_CALLING_CLASS): Define for ARM EABI.
2007-08-22 Andrew Haley <aph@redhat.com>
* configure.host (BACKTRACESPEC): Add arm*-linux*.
2007-08-22 Andrew Haley <aph@redhat.com>
* configure.ac (LIBSTDCXXSPEC): New.
* configure.host: Add arm*-linux* to pthread test.
* configure.ac (LIBGCJTESTSPEC): Add path to libstdc++ for ARM
EABI.
* testsuite/libjava.jni/jni.exp (gcj_jni_compile_c_to_so): Use
-fexceptions for ARM EABI.
* testsuite/lib/libjava.exp (libjava_arguments): Add libgcj-test.spec.
(libjava_invoke): Log the invocation.
2007-08-15 Andrew Haley <aph@redhat.com>
* configure.ac (extra_ldflags): Define.
* Makefile.am: Use extra_ldflags for all executables.
2007-08-14 Andrew Haley <aph@redhat.com>
* sysdep/arm/backtrace.h: Remove stubs for _Unwind_GetIPInfo,
_Unwind_GetRegionStart, and _Unwind_Backtrace.
2007-07-27 Andrew Haley <aph@redhat.com>
* gnu/classpath/natVMStackWalker.cc (GET_CALLING_CLASS): Stub for
ARM EABI.
* exception.cc (get_exception_header_from_ue): New.
(get_ttype_entry): ARM EABI version.
(PERSONALITY_FUNCTION): Add ARM EABI code.
* sysdep/arm/backtrace.h: New file.
* stacktrace.cc (_URC_NORMAL_STOP): New.
* configure.ac (extra_ldflags_libjava): Add libsupc++.la for ARM
EABI.
* configure.host (BACKTRACESPEC): Add arm/backtrace.h.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@128098 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/Makefile.am')
| -rw-r--r-- | libjava/Makefile.am | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 8e89f5a8464..83a20e4897a 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -100,6 +100,7 @@ endif GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated extra_ldflags_libjava = @extra_ldflags_libjava@ +extra_ldflags = @extra_ldflags@ if ANONVERSCRIPT extra_ldflags_libjava += -Wl,--version-script=$(srcdir)/libgcj.ver @@ -110,7 +111,7 @@ GCJLINK = $(LIBTOOL) --tag=GCJ --mode=link $(GCJ) -L$(here) $(JC1FLAGS) \ GCJ_FOR_ECJX = @GCJ_FOR_ECJX@ GCJ_FOR_ECJX_LINK = $(GCJ_FOR_ECJX) -o $@ LIBLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXX) -L$(here) $(JC1FLAGS) \ - $(LDFLAGS) $(extra_ldflags_libjava) -o $@ + $(LDFLAGS) $(extra_ldflags_libjava) $(extra_ldflags) -o $@ GCC_UNWIND_INCLUDE = @GCC_UNWIND_INCLUDE@ @@ -238,7 +239,7 @@ xlib_nat_files = $(xlib_nat_source_files:.cc=.lo) # Include THREADLIBS here to ensure that the correct version of # certain linuxthread functions get linked: ## The mysterious backslash in the grep pattern is consumed by make. -libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLDFLAGS) $(THREADLIBS) \ +libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLDFLAGS) $(extra_ldflags) $(THREADLIBS) \ $(LIBLTDL) $(SYS_ZLIBS) \ -version-info `grep -v '^\#' $(srcdir)/libtool-version` \ $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) @@ -620,7 +621,7 @@ jv_convert_SOURCES = ## need this because we are explicitly using libtool to link using the ## `.la' file. jv_convert_LDFLAGS = --main=gnu.gcj.convert.Convert \ - -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) + -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) jv_convert_LINK = $(GCJLINK) ## We don't explicitly link in the libraries we need; libgcj.la brings ## in all dependencies. We need the -L so that gcj can find libgcj @@ -641,7 +642,7 @@ gnu/gcj/tools/gcj_dbtool/natMain.cc ## need this because we are explicitly using libtool to link using the ## `.la' file. gcj_dbtool_LDFLAGS = --main=gnu.gcj.tools.gcj_dbtool.Main \ - -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) + -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) gcj_dbtool_LINK = $(GCJLINK) ## We don't explicitly link in the libraries we need; libgcj.la brings ## in all dependencies. We need the -L so that gcj can find libgcj @@ -661,7 +662,7 @@ gc_analyze_SOURCES = ## need this because we are explicitly using libtool to link using the ## `.la' file. gc_analyze_LDFLAGS = --main=gnu.gcj.tools.gc_analyze.MemoryAnalyze \ - -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) + -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) gc_analyze_LINK = $(GCJLINK) ## See jv_convert_LDADD. gc_analyze_LDADD = -L$(here)/.libs libgcj-tools.la libgcj.la @@ -674,7 +675,7 @@ gij_SOURCES = ## need this because we are explicitly using libtool to link using the ## `.la' file. gij_LDFLAGS = -rpath $(dbexecdir) -rpath $(toolexeclibdir) \ - -shared-libgcc $(THREADLDFLAGS) + -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) gij_LINK = $(GCJLINK) ## See jv_convert_LDADD. gij_LDADD = -L$(here)/.libs libgij.la @@ -721,7 +722,7 @@ endif !NATIVE ## This is a dummy definition. gappletviewer_SOURCES = gappletviewer_LDFLAGS = --main=gnu.classpath.tools.appletviewer.Main \ - -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) + -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) gappletviewer_LINK = $(GCJLINK) ## See jv_convert_LDADD. gappletviewer_LDADD = -L$(here)/.libs libgcj-tools.la @@ -730,7 +731,7 @@ gappletviewer_DEPENDENCIES = libgcj-tools.la ## This is a dummy definition. gjarsigner_SOURCES = gjarsigner_LDFLAGS = --main=gnu.classpath.tools.jarsigner.Main \ - -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) + -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) gjarsigner_LINK = $(GCJLINK) ## See jv_convert_LDADD. gjarsigner_LDADD = -L$(here)/.libs libgcj-tools.la @@ -739,7 +740,7 @@ gjarsigner_DEPENDENCIES = libgcj-tools.la ## This is a dummy definition. gkeytool_SOURCES = gkeytool_LDFLAGS = --main=gnu.classpath.tools.keytool.Main \ - -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) + -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) gkeytool_LINK = $(GCJLINK) ## See jv_convert_LDADD. gkeytool_LDADD = -L$(here)/.libs libgcj-tools.la @@ -748,7 +749,7 @@ gkeytool_DEPENDENCIES = libgcj-tools.la ## This is a dummy definition. gjar_SOURCES = gjar_LDFLAGS = --main=gnu.classpath.tools.jar.Main \ - -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) + -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) gjar_LINK = $(GCJLINK) ## See jv_convert_LDADD. gjar_LDADD = -L$(here)/.libs libgcj-tools.la @@ -757,7 +758,7 @@ gjar_DEPENDENCIES = libgcj-tools.la ## This is a dummy definition. gjavah_SOURCES = gjavah_LDFLAGS = --main=gnu.classpath.tools.javah.Main \ - -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) + -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) gjavah_LINK = $(GCJLINK) ## See jv_convert_LDADD. gjavah_LDADD = -L$(here)/.libs libgcj-tools.la @@ -766,7 +767,7 @@ gjavah_DEPENDENCIES = libgcj-tools.la ## This is a dummy definition. gcjh_SOURCES = gcjh_LDFLAGS = --main=gnu.classpath.tools.javah.GcjhMain \ - -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) + -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) gcjh_LINK = $(GCJLINK) ## See jv_convert_LDADD. gcjh_LDADD = -L$(here)/.libs libgcj-tools.la @@ -775,7 +776,7 @@ gcjh_DEPENDENCIES = libgcj-tools.la ## This is a dummy definition. gnative2ascii_SOURCES = gnative2ascii_LDFLAGS = --main=gnu.classpath.tools.native2ascii.Native2ASCII \ - -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) + -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) gnative2ascii_LINK = $(GCJLINK) ## See jv_convert_LDADD. gnative2ascii_LDADD = -L$(here)/.libs libgcj-tools.la @@ -784,7 +785,7 @@ gnative2ascii_DEPENDENCIES = libgcj-tools.la ## This is a dummy definition. gorbd_SOURCES = gorbd_LDFLAGS = --main=gnu.classpath.tools.orbd.Main \ - -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) + -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) gorbd_LINK = $(GCJLINK) ## See jv_convert_LDADD. gorbd_LDADD = -L$(here)/.libs libgcj-tools.la @@ -793,7 +794,7 @@ gorbd_DEPENDENCIES = libgcj-tools.la ## This is a dummy definition. grmid_SOURCES = grmid_LDFLAGS = --main=gnu.classpath.tools.rmid.Main \ - -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) + -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) grmid_LINK = $(GCJLINK) ## See jv_convert_LDADD. grmid_LDADD = -L$(here)/.libs libgcj-tools.la @@ -802,7 +803,7 @@ grmid_DEPENDENCIES = libgcj-tools.la ## This is a dummy definition. gserialver_SOURCES = gserialver_LDFLAGS = --main=gnu.classpath.tools.serialver.SerialVer \ - -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) + -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) gserialver_LINK = $(GCJLINK) ## See jv_convert_LDADD. gserialver_LDADD = -L$(here)/.libs libgcj-tools.la @@ -811,7 +812,7 @@ gserialver_DEPENDENCIES = libgcj-tools.la ## This is a dummy definition. gtnameserv_SOURCES = gtnameserv_LDFLAGS = --main=gnu.classpath.tools.tnameserv.Main \ - -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) + -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) gtnameserv_LINK = $(GCJLINK) ## See jv_convert_LDADD. gtnameserv_LDADD = -L$(here)/.libs libgcj-tools.la @@ -820,7 +821,7 @@ gtnameserv_DEPENDENCIES = libgcj-tools.la ## This is a dummy definition. grmic_SOURCES = grmic_LDFLAGS = --main=gnu.classpath.tools.rmic.Main \ - -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) + -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) grmic_LINK = $(GCJLINK) ## See jv_convert_LDADD. grmic_LDADD = -L$(here)/.libs libgcj-tools.la @@ -829,7 +830,7 @@ grmic_DEPENDENCIES = libgcj-tools.la ## This is a dummy definition. grmiregistry_SOURCES = grmiregistry_LDFLAGS = --main=gnu.classpath.tools.rmiregistry.Main \ - -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) + -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) grmiregistry_LINK = $(GCJLINK) ## See jv_convert_LDADD. grmiregistry_LDADD = -L$(here)/.libs libgcj-tools.la |