This is the mail archive of the java-patches@gcc.gnu.org mailing list for the Java project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[patch] Use target_noncanonical in boehm-gc, for forward-compatibilty


This is for forward-compatibility with autoconf 2.5x.

Tested on i686-pc-linux-gnu.  I wanted to test a cross, but I couldn't
find one which actually supported libjava, so it didn't seem very worthwhile.
However, it does appear to behave correctly in simple tests of 'configure'
for crosses.

Any objections?  If not, I'd like to commit this as part of the progression towards
autoconf 2.5x use.  (Although we aren't there yet.)

* configure.in: Use NCN_TARGET_NONCANONICAL and friends.
* configure: Regenerate.
* Makefile.am: Use target_noncanonical variable from configure.
* Makefile.in: Regenerate.
* include/Makefile.in: Regenerate.

Automake introduced some spurious differences in the Makefile.in files.  :-P
They weren't harmful, though.

Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/boehm-gc/Makefile.am,v
retrieving revision 1.38
diff -u -r1.38 Makefile.am
--- Makefile.am	28 Jul 2003 04:18:19 -0000	1.38
+++ Makefile.am	20 Feb 2004 04:08:19 -0000
@@ -4,6 +4,8 @@
 ## files that should be in the distribution are not mentioned in this
 ## Makefile.am.

+target_noncanonical=@target_noncanonical@
+
 AUTOMAKE_OPTIONS = cygnus

 SUBDIRS = include
Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/boehm-gc/Makefile.in,v
retrieving revision 1.43
diff -u -r1.43 Makefile.in
--- Makefile.in	28 Jul 2003 04:18:20 -0000	1.43
+++ Makefile.in	20 Feb 2004 04:08:20 -0000
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am

-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -95,12 +95,18 @@
 addlibs = @addlibs@
 addobjs = @addobjs@
 addtests = @addtests@
+build_subdir = @build_subdir@
 gc_basedir = @gc_basedir@
+host_subdir = @host_subdir@
 mkinstalldirs = @mkinstalldirs@
+ncn_cv_ = @ncn_cv_@
 target_all = @target_all@
+target_subdir = @target_subdir@
 toolexecdir = @toolexecdir@
 toolexeclibdir = @toolexeclibdir@

+target_noncanonical = @target_noncanonical@
+
 AUTOMAKE_OPTIONS = cygnus

 SUBDIRS = include
@@ -278,7 +284,7 @@

 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)

-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
 SOURCES = $(libgcjgc_la_SOURCES) $(EXTRA_libgcjgc_la_SOURCES) $(libgcjgc_convenience_la_SOURCES) $(EXTRA_libgcjgc_convenience_la_SOURCES)
 OBJECTS = $(libgcjgc_la_OBJECTS) $(libgcjgc_convenience_la_OBJECTS)
@@ -406,7 +412,7 @@
 	dot_seen=no; \
 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
 	  rev="$$subdir $$rev"; \
-	  test "$$subdir" != "." || dot_seen=yes; \
+	  test "$$subdir" = "." && dot_seen=yes; \
 	done; \
 	test "$$dot_seen" = "no" && rev=". $$rev"; \
 	target=`echo $@ | sed s/-recursive//`; \
Index: configure.in
===================================================================
RCS file: /cvs/gcc/gcc/boehm-gc/configure.in,v
retrieving revision 1.55
diff -u -r1.55 configure.in
--- configure.in	20 Feb 2004 03:11:01 -0000	1.55
+++ configure.in	20 Feb 2004 04:08:23 -0000
@@ -57,6 +57,12 @@

 AC_CANONICAL_SYSTEM

+# Get the 'noncanonical' system names.
+sinclude(../config/acx.m4)
+_GCC_TOPLEV_NONCANONICAL_BUILD
+_GCC_TOPLEV_NONCANONICAL_HOST
+_GCC_TOPLEV_NONCANONICAL_TARGET
+
 # This works around an automake problem.
 mkinstalldirs="`cd $ac_aux_dir && ${PWDCMD-pwd}`/mkinstalldirs"
 AC_SUBST(mkinstalldirs)
@@ -226,7 +232,7 @@

 target_all=libgcjgc.la
 AC_SUBST(target_all)
-AC_SUBST(target_alias)
+AC_SUBST(target_noncanonical)

 dnl If the target is an eCos system, use the appropriate eCos
 dnl I/O routines.
@@ -457,10 +463,10 @@

 if test -n "$with_cross_host" &&
    test x"$with_cross_host" != x"no"; then
-  toolexecdir='$(exec_prefix)/$(target_alias)'
+  toolexecdir='$(exec_prefix)/$(target_noncanonical)'
   toolexeclibdir='$(toolexecdir)/lib'
 else
-  toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
+  toolexecdir='$(libdir)/gcc-lib/$(target_noncanonical)'
   toolexeclibdir='$(libdir)'
 fi
 multi_os_directory=`$CC -print-multi-os-directory`

-- 
Nathanael Nerode  <neroden at gcc.gnu.org>
US citizens: if you're considering voting for Bush, look at these first:
http://www.misleader.org/  http://www.cbc.ca/news/background/arar/
http://www.house.gov/reform/min/politicsandscience/


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