[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r11212 - in /libdfp/trunk: ChangeLog Makefile.in configure configure.ac
- To: commits@xxxxxxxxxx
- Subject: [commits] r11212 - in /libdfp/trunk: ChangeLog Makefile.in configure configure.ac
- From: ryanarn@xxxxxxxxxx
- Date: Wed, 11 Aug 2010 21:24:07 -0000
Author: ryanarn
Date: Wed Aug 11 14:24:06 2010
New Revision: 11212
Log:
Apparently a configure script shouldn't modify CFLAGS, so we have to pass
mzarch to Makefile and have it pass that whenever necessary.
2010-08-11 Ryan S. Arnold <rsa@xxxxxxxxxx>
configure: Regenerated.
configure.ac: Added AC_SUBST(mzarch) back. We shouldn't be editing
CFLAGS.
Makefile.in: Pass $(mzarch) along with CFLAGS if it is defined.
Modified:
libdfp/trunk/ChangeLog
libdfp/trunk/Makefile.in
libdfp/trunk/configure
libdfp/trunk/configure.ac
Modified: libdfp/trunk/ChangeLog
==============================================================================
--- libdfp/trunk/ChangeLog (original)
+++ libdfp/trunk/ChangeLog Wed Aug 11 14:24:06 2010
@@ -1,3 +1,10 @@
+2010-08-11 Ryan S. Arnold <rsa@xxxxxxxxxx>
+
+ configure: Regenerated.
+ configure.ac: Added AC_SUBST(mzarch) back. We shouldn't be editing
+ CFLAGS.
+ Makefile.in: Pass $(mzarch) along with CFLAGS if it is defined.
+
2010-08-06 Ryan S. Arnold <rsa@xxxxxxxxxx>
* configure: Regenerated.
Modified: libdfp/trunk/Makefile.in
==============================================================================
--- libdfp/trunk/Makefile.in (original)
+++ libdfp/trunk/Makefile.in Wed Aug 11 14:24:06 2010
@@ -63,6 +63,9 @@
# e.g. -mcpu=power6
submachine_opt = @submachine_opt@
+# Necessary for z9-ec and z10 s390 platforms.
+mzarch = @mzarch@
+
ifdef submachine_opt
cflags-cpu = $(submachine_opt)
asflags-cpu = $(submachine_opt)
@@ -174,14 +177,7 @@
# variables from the environment.
$(dfp_backend)/$(dfp_backend_lib):
@echo "+Building DFP backend $@"
- # This is done so that if/when gcc changes libdecnumber/Makefile.in:
- # CFLAGS = @CFLAGS@ to CFLAGS ?= @CFLAGS@ we don't need to do anything
- # other than remove this line. This is better than changing
- # libdecnumber/Makefile.in and having to redo the Makefile in the
- # future.
- sed '/CFLAGS =/s/^CFLAGS \?\= \(.*\)$$/CFLAGS ?= \1/' $(dfp_backend)/Makefile > $(dfp_backend)/Makefile.temp
- mv $(dfp_backend)/Makefile.temp $(dfp_backend)/Makefile
- DEFS="-D__STDC_DEC_FP__=200704L" CFLAGS="$(CFLAGS)" $(MAKE) -C $(dfp_backend)
+ DEFS="-D__STDC_DEC_FP__=200704L $(mzarch)" CFLAGS="$(CFLAGS)" $(MAKE) -C $(dfp_backend)
@echo
libdfp: @enable_static@ @enable_shared@
@@ -200,18 +196,18 @@
# Build the static object files.
.c.o:
- $(CC) $(CFLAGS) -c $< $(C_DEFINES) $(WARNS) -include $(top_srcdir)/include/libdfp-symbols.h -include $(top_builddir)/config.h $(foreach dir, $(header_search_dirs), -I$(dir)) $(glibc_headers_dir) -o $@
+ $(CC) $(CFLAGS) $(mzarch) -c $< $(C_DEFINES) $(WARNS) -include $(top_srcdir)/include/libdfp-symbols.h -include $(top_builddir)/config.h $(foreach dir, $(header_search_dirs), -I$(dir)) $(glibc_headers_dir) -o $@
@echo
.S.o:
- $(CC) $(ASFLAGS) -c $< $(ASM_DEFINES) $(WARNS) -include $(top_srcdir)/include/libdfp-symbols.h -include $(top_builddir)/config.h $(foreach dir, $(header_search_dirs), -I$(dir)) $(glibc_headers_dir) -o $@
+ $(CC) $(ASFLAGS) $(mzarch) -c $< $(ASM_DEFINES) $(WARNS) -include $(top_srcdir)/include/libdfp-symbols.h -include $(top_builddir)/config.h $(foreach dir, $(header_search_dirs), -I$(dir)) $(glibc_headers_dir) -o $@
@echo
# Build the shared object files.
.c.os:
- $(CC) $(CFLAGS) -c $< $(C_DEFINES) $(WARNS) -include $(top_srcdir)/include/libdfp-symbols.h -include $(top_builddir)/config.h $(foreach dir, $(header_search_dirs), -I$(dir)) $(glibc_headers_dir) -o $@
+ $(CC) $(CFLAGS) $(mzarch) -c $< $(C_DEFINES) $(WARNS) -include $(top_srcdir)/include/libdfp-symbols.h -include $(top_builddir)/config.h $(foreach dir, $(header_search_dirs), -I$(dir)) $(glibc_headers_dir) -o $@
@echo
.S.os:
- $(CC) $(ASFLAGS) -c $< $(ASM_DEFINES) $(WARNS) -include $(top_srcdir)/include/libdfp-symbols.h -include $(top_builddir)/config.h $(foreach dir, $(header_search_dirs), -I$(dir)) $(glibc_headers_dir) -o $@
+ $(CC) $(ASFLAGS) $(mzarch) -c $< $(ASM_DEFINES) $(WARNS) -include $(top_srcdir)/include/libdfp-symbols.h -include $(top_builddir)/config.h $(foreach dir, $(header_search_dirs), -I$(dir)) $(glibc_headers_dir) -o $@
@echo
# Archive the static library and include all of the .o files from the backend
@@ -245,7 +241,7 @@
# calls.
$(top_builddir)/$(SHARED_REALNAME_LIB): $(top_builddir)/$(dfp_name).map $(dfp_backend)/$(dfp_backend_lib) $(addsuffix .os,$(libdfp_files))
@echo +Linking shared object files into $@.
- $(CC) $(CFLAGS) -shared -Wl,-soname,$(SHARED_SONAME_LIB) -Bsymbolic -Wl,--whole-archive $(dfp_backend)/$(dfp_backend_lib) -Wl,--no-whole-archive -Wl,--version-script,$(dfp_name).map $(addsuffix .os,$(libdfp_files)) -o $@ -lm
+ $(CC) $(CFLAGS) $(mzarch) -shared -Wl,-soname,$(SHARED_SONAME_LIB) -Bsymbolic -Wl,--whole-archive $(dfp_backend)/$(dfp_backend_lib) -Wl,--no-whole-archive -Wl,--version-script,$(dfp_name).map $(addsuffix .os,$(libdfp_files)) -o $@ -lm
@echo
# The LIBDFP version script support is strongly based upon the GLIBC version
@@ -302,7 +298,7 @@
# Explicitly link against the uninstalled GLIBC and the Libdfp.so.1 we just
# built.
$(libdfp_tests): %:%.o $(top_builddir)/$(SHARED_SONAME_LIB)
- $(CC) $(CFLAGS) $(GLIBC_LIBS) -L$(top_builddir)/ -ldfp $(top_builddir)/$(addsuffix .o,$@) -o $@
+ $(CC) $(CFLAGS) $(mzarch) $(GLIBC_LIBS) -L$(top_builddir)/ -ldfp $(top_builddir)/$(addsuffix .o,$@) -o $@
@echo
LIBRARY_PATH = $(glibc_builddir)/:$(glibc_builddir)/math:$(glibc_builddir)/elf:$(glibc_builddir)/nptl
Modified: libdfp/trunk/configure
==============================================================================
--- libdfp/trunk/configure (original)
+++ libdfp/trunk/configure Wed Aug 11 14:24:06 2010
@@ -276,7 +276,7 @@
ac_unique_file="printf_dfp.c"
ac_subdirs_all="$ac_subdirs_all libdecnumber"
ac_subdirs_all="$ac_subdirs_all libbid"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os enable_decimal_float dfp_backend with_dfp with_fp base_machine machine CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT OBJDUMP AS ASFLAGS libdfp_cv_cc_with_decimal_float glibc_headers glibc_build enable_static enable_shared submachine submachine_opt sysdep_dirs RANLIB ac_ct_RANLIB AWK subdirs LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os enable_decimal_float dfp_backend mzarch with_dfp with_fp base_machine machine CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT OBJDUMP AS ASFLAGS libdfp_cv_cc_with_decimal_float glibc_headers glibc_build enable_static enable_shared submachine submachine_opt sysdep_dirs RANLIB ac_ct_RANLIB AWK subdirs LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1526,6 +1526,7 @@
# This will invoke the sysdeps/$machine/<processor>/ machinery.
+mzarch=
submachine=
with_dfp=
@@ -1557,14 +1558,14 @@
z9-ec)
submachine="$withval"
# Warning, -mzarch won't get passed to libecnumber/configure
- CFLAGS="$CFLAGS -mzarch"
+ mzarch="-mzarch"
{ echo "$as_me:$LINENO: configuring for the $submachine processor" >&5
echo "$as_me: configuring for the $submachine processor" >&6;}
with_dfp=yes ;;
z10)
submachine="$withval"
# Warning, -mzarch won't get passed to libecnumber/configure
- CFLAGS="$CFLAGS -mzarch"
+ mzarch="-mzarch"
{ echo "$as_me:$LINENO: configuring for the $submachine processor" >&5
echo "$as_me: configuring for the $submachine processor" >&6;}
with_dfp=yes ;;
@@ -1606,6 +1607,9 @@
{ (exit 1); exit 1; }; }
fi
fi
+
+# Unless the system is a s390 variant this is most likely empty.
+
# This tells us whether we know we have a hardware decimal floating point
# unit. We know this based upon the submachine.
@@ -3685,6 +3689,7 @@
s,@host_os@,$host_os,;t t
s,@enable_decimal_float@,$enable_decimal_float,;t t
s,@dfp_backend@,$dfp_backend,;t t
+s,@mzarch@,$mzarch,;t t
s,@with_dfp@,$with_dfp,;t t
s,@with_fp@,$with_fp,;t t
s,@base_machine@,$base_machine,;t t
Modified: libdfp/trunk/configure.ac
==============================================================================
--- libdfp/trunk/configure.ac (original)
+++ libdfp/trunk/configure.ac Wed Aug 11 14:24:06 2010
@@ -150,6 +150,7 @@
AC_SUBST(dfp_backend)
# This will invoke the sysdeps/$machine/<processor>/ machinery.
+mzarch=
submachine=
with_dfp=
AC_ARG_WITH([cpu],
@@ -175,13 +176,13 @@
z9-ec)
submachine="$withval"
# Warning, -mzarch won't get passed to libecnumber/configure
- CFLAGS="$CFLAGS -mzarch"
+ mzarch="-mzarch"
AC_MSG_NOTICE(configuring for the $submachine processor)
with_dfp=yes ;;
z10)
submachine="$withval"
# Warning, -mzarch won't get passed to libecnumber/configure
- CFLAGS="$CFLAGS -mzarch"
+ mzarch="-mzarch"
AC_MSG_NOTICE(configuring for the $submachine processor)
with_dfp=yes ;;
*)
@@ -205,6 +206,9 @@
AC_MSG_ERROR([${CC-cc} does not support $submachine])
fi
fi
+
+# Unless the system is a s390 variant this is most likely empty.
+AC_SUBST(mzarch)
# This tells us whether we know we have a hardware decimal floating point
# unit. We know this based upon the submachine.