Mercurial > hg > release > icedtea7-2.0
changeset 2196:d9f8a98810eb
Generalise ZERO_ARCHFLAG to ARCHFLAG and use in PulseAudio native build.
2010-03-08 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
(IT_CFLAGS): General CFLAGS for all IcedTea
C builds, which includes ARCHFLAG.
(ICEDTEA_ENV): Set ZERO_ARCHFLAG from ARCHFLAG.
(stamps/native-ecj.stamp): Use IT_CFLAGS.
($(PULSE_JAVA_NATIVE_BUILDDIR)/%.o): Use IT_CFLAGS.
* acinclude.m4:
(IT_SET_ARCH_SETTINGS): Renamed from SET_ARCH_DIRS.
Use host_cpu rather than host. Add sections for
sparc and s390x. Set ARCHFLAG to m64 for x86_64,
sparc64, powerpc64 and s390x, m31 for s390 and m32
for i?86, powerpc and sparc.
(ENABLE_ZERO_BUILD): Remove setting of ZERO_ARCHFLAG,
generalised to ARCHFLAG.
* configure.ac: Call renamed IT_SET_ARCH_SETTINGS.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Tue, 01 Jun 2010 16:12:06 +0100 |
| parents | ee7e745aa094 |
| children | eb4fd48b97cf |
| files | ChangeLog Makefile.am acinclude.m4 configure.ac |
| diffstat | 4 files changed, 59 insertions(+), 30 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Jun 01 16:04:53 2010 +0100 +++ b/ChangeLog Tue Jun 01 16:12:06 2010 +0100 @@ -1,3 +1,21 @@ +2010-03-08 Andrew John Hughes <ahughes@redhat.com> + + * Makefile.am: + (IT_CFLAGS): General CFLAGS for all IcedTea + C builds, which includes ARCHFLAG. + (ICEDTEA_ENV): Set ZERO_ARCHFLAG from ARCHFLAG. + (stamps/native-ecj.stamp): Use IT_CFLAGS. + ($(PULSE_JAVA_NATIVE_BUILDDIR)/%.o): Use IT_CFLAGS. + * acinclude.m4: + (IT_SET_ARCH_SETTINGS): Renamed from SET_ARCH_DIRS. + Use host_cpu rather than host. Add sections for + sparc and s390x. Set ARCHFLAG to m64 for x86_64, + sparc64, powerpc64 and s390x, m31 for s390 and m32 + for i?86, powerpc and sparc. + (ENABLE_ZERO_BUILD): Remove setting of ZERO_ARCHFLAG, + generalised to ARCHFLAG. + * configure.ac: Call renamed IT_SET_ARCH_SETTINGS. + 2010-03-08 Matthias Klose <doko@ubuntu.com> * Makefile.am:
--- a/Makefile.am Tue Jun 01 16:04:53 2010 +0100 +++ b/Makefile.am Tue Jun 01 16:12:06 2010 +0100 @@ -145,6 +145,9 @@ IT_JAVAC_SETTINGS=-g -encoding utf-8 $(JAVACFLAGS) $(MEMORY_LIMIT) $(PREFER_SOURCE) IT_JAVACFLAGS=$(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) -target $(IT_CLASS_TARGET_VERSION) +# Flags +IT_CFLAGS=$(CFLAGS) $(ARCHFLAG) + # Conditional defintions if USE_HG @@ -494,7 +497,7 @@ ARCH_DATA_MODEL="$(ZERO_BITSPERWORD)" \ ZERO_ENDIANNESS="$(ZERO_ENDIANNESS)" \ ZERO_ARCHDEF="$(ZERO_ARCHDEF)" \ - ZERO_ARCHFLAG="$(ZERO_ARCHFLAG)" \ + ZERO_ARCHFLAG="$(ARCHFLAG)" \ LIBFFI_CFLAGS="$(LIBFFI_CFLAGS)" \ LIBFFI_LIBS="$(LIBFFI_LIBS)" \ LLVM_CFLAGS="$(LLVM_CFLAGS)" \ @@ -1689,7 +1692,7 @@ stamps/native-ecj.stamp: mkdir -p stamps if BUILD_NATIVE_ECJ - ${GCJ} ${CFLAGS} -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \ + ${GCJ} $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \ --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} endif touch $@ @@ -2252,7 +2255,7 @@ touch $@ $(PULSE_JAVA_NATIVE_BUILDDIR)/%.o: $(PULSE_JAVA_NATIVE_SRCDIR)/%.c stamps/pulse-java-headers.stamp - $(CC) $(CFLAGS) -fPIC -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include \ + $(CC) $(IT_CFLAGS) -fPIC -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include \ -I$(PULSE_JAVA_NATIVE_BUILDDIR) -o $@ -c $< $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so: $(PULSE_JAVA_NATIVE_OBJECTS)
--- a/acinclude.m4 Tue Jun 01 16:04:53 2010 +0100 +++ b/acinclude.m4 Tue Jun 01 16:12:06 2010 +0100 @@ -1,59 +1,79 @@ - AC_DEFUN([SET_ARCH_DIRS], + AC_DEFUN([IT_SET_ARCH_SETTINGS], [ - case "${host}" in - x86_64-*-*) + case "${host_cpu}" in + x86_64) BUILD_ARCH_DIR=amd64 INSTALL_ARCH_DIR=amd64 JRE_ARCH_DIR=amd64 + ARCHFLAG="-m64" ;; - i?86-*-*) + i?86) BUILD_ARCH_DIR=i586 INSTALL_ARCH_DIR=i386 JRE_ARCH_DIR=i386 ARCH_PREFIX=${LINUX32} + ARCHFLAG="-m32" ;; - alpha*-*-*) + alpha*) BUILD_ARCH_DIR=alpha INSTALL_ARCH_DIR=alpha JRE_ARCH_DIR=alpha ;; - arm*-*-*) + arm*) BUILD_ARCH_DIR=arm INSTALL_ARCH_DIR=arm JRE_ARCH_DIR=arm ;; - mips-*-*) + mips) BUILD_ARCH_DIR=mips INSTALL_ARCH_DIR=mips JRE_ARCH_DIR=mips ;; - mipsel-*-*) + mipsel) BUILD_ARCH_DIR=mipsel INSTALL_ARCH_DIR=mipsel JRE_ARCH_DIR=mipsel ;; - powerpc-*-*) + powerpc) BUILD_ARCH_DIR=ppc INSTALL_ARCH_DIR=ppc JRE_ARCH_DIR=ppc ARCH_PREFIX=${LINUX32} - ;; - powerpc64-*-*) + ARCHFLAG="-m32" + ;; + powerpc64) BUILD_ARCH_DIR=ppc64 INSTALL_ARCH_DIR=ppc64 JRE_ARCH_DIR=ppc64 + ARCHFLAG="-m64" ;; - sparc64-*-*) + sparc) + BUILD_ARCH_DIR=sparc + INSTALL_ARCH_DIR=sparc + JRE_ARCH_DIR=sparc + CROSS_TARGET_ARCH=sparc + ARCH_PREFIX=${LINUX32} + ARCHFLAG="-m32" + ;; + sparc64) BUILD_ARCH_DIR=sparcv9 INSTALL_ARCH_DIR=sparcv9 JRE_ARCH_DIR=sparc64 + ARCHFLAG="-m64" ;; - s390-*-*) + s390) BUILD_ARCH_DIR=s390 INSTALL_ARCH_DIR=s390 JRE_ARCH_DIR=s390 ARCH_PREFIX=${LINUX32} + ARCHFLAG="-m31" ;; + s390x) + BUILD_ARCH_DIR=s390x + INSTALL_ARCH_DIR=s390x + JRE_ARCH_DIR=s390x + CROSS_TARGET_ARCH=s390x + ARCHFLAG="-m64" *) BUILD_ARCH_DIR=`uname -m` INSTALL_ARCH_DIR=$BUILD_ARCH_DIR @@ -64,6 +84,7 @@ AC_SUBST(INSTALL_ARCH_DIR) AC_SUBST(JRE_ARCH_DIR) AC_SUBST(ARCH_PREFIX) + AC_SUBST(ARCHFLAG) ]) AC_DEFUN([SET_OS_DIRS], @@ -750,23 +771,10 @@ *) ZERO_ARCHDEF=`echo ${ZERO_LIBARCH} | tr a-z A-Z` esac - dnl multilib machines need telling which mode to build for - case "${ZERO_LIBARCH}" in - i386|ppc|sparc) - ZERO_ARCHFLAG="-m32" - ;; - s390) - ZERO_ARCHFLAG="-m31" - ;; - amd64|ppc64|s390x|sparc64) - ZERO_ARCHFLAG="-m64" - ;; - esac AC_SUBST(ZERO_LIBARCH) AC_SUBST(ZERO_BITSPERWORD) AC_SUBST(ZERO_ENDIANNESS) AC_SUBST(ZERO_ARCHDEF) - AC_SUBST(ZERO_ARCHFLAG) AC_CONFIG_FILES([jvm.cfg]) AC_CONFIG_FILES([ergo.c]) ])