summaryrefslogtreecommitdiff
path: root/gnattools
diff options
context:
space:
mode:
authorbonzini <bonzini@138bc75d-0d04-0410-961f-82ee72b054a4>2008-07-30 12:17:17 +0000
committerbonzini <bonzini@138bc75d-0d04-0410-961f-82ee72b054a4>2008-07-30 12:17:17 +0000
commit3bed0958a0f66633cb85949de0a4d6d275b57643 (patch)
treed34a32f40438fc8ddcd9451e3bd7aab5b01049ed /gnattools
parentce4aa30e6b1efa4d44674a9e225e7f0b57c40d07 (diff)
downloadgcc-3bed0958a0f66633cb85949de0a4d6d275b57643.tar.gz
2008-07-30 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Add makefile fragments for hpux. * Makefile.def (flags_to_pass): Add ADA_CFLAGS. * Makefile.tpl (HOST_EXPORTS): Pass ADA_CFLAGS. * configure: Regenerate. * Makefile.in: Regenerate. config: 2008-07-30 Paolo Bonzini <bonzini@gnu.org> * mh-pa: New, from gcc/config/pa/x-ada. * mh-pa-hpux10: New, from gcc/config/pa/x-ada-hpux10. gcc: 2008-07-30 Paolo Bonzini <bonzini@gnu.org> * configure.ac: Substitute ADA_CFLAGS. * configure: Regenerate. * config.host: Remove mention of pa/x-ada and pa/x-ada-hpux10 files. * Makefile.in: Remove mention of X_* variables. * config/pa/x-ada-hpux10: Remove. * config/pa/x-ada: Remove. * doc/fragments.texi: Update. gcc/ada: 2008-07-30 Paolo Bonzini <bonzini@gnu.org> * gcc-interface/Make-lang.in (ALL_ADAFLAGS): Remove X_ADAFLAGS and T_ADAFLAGS, replace ALL_ADA_CFLAGS with ADA_CFLAGS. (ALL_ADA_CFLAGS): Remove, replace throughout with ADA_CFLAGS. * gcc-interface/Makefile.in (XCFLAGS, X_CFLAGS, X_CPPFLAGS, T_CPPFLAGS, X_ADA_CFLAGS, T_ADA_CFLAGS, X_ADAFLAGS, T_ADAFLAGS, ADA_CFLAGS, ALL_ADA_CFLAGS): Remove. (ALL_ADAFLAGS, MOST_ADAFLAGS): Remove X_ADAFLAGS and T_ADAFLAGS, replace ALL_ADA_CFLAGS with ADA_CFLAGS. (GCC_CFLAGS): Remove X_CFLAGS. (LOOSE_CFLAGS): Remove X_CFLAGS and XCFLAGS. (ALL_CPPFLAGS): Remove X_CPPFLAGS and T_CPPFLAGS. (ADA_CFLAGS): Substitute. gnattools: 2008-07-30 Paolo Bonzini <bonzini@gnu.org> * configure.ac (x_ada_cflags): Remove. (ADA_CFLAGS): Substitute. * configure: Regenerate. * Makefile.in (ADA_CFLAGS): Substitute. (T_ADA_CFLAGS, X_ADA_CFLAGS, ALL_ADA_CFLAGS): Remove. (TOOLS_FLAGS_TO_PASS_1, TOOLS_FLAGS_TO_PASS_1re, TOOLS_FLAGS_TO_PASS_NATIVE, TOOLS_FLAGS_TO_PASS_CROSS): Pass ADA_CFLAGS. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@138301 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gnattools')
-rw-r--r--gnattools/ChangeLog11
-rw-r--r--gnattools/Makefile.in10
-rwxr-xr-xgnattools/configure14
-rw-r--r--gnattools/configure.ac10
4 files changed, 24 insertions, 21 deletions
diff --git a/gnattools/ChangeLog b/gnattools/ChangeLog
index cbdb44f2412..81f32c10965 100644
--- a/gnattools/ChangeLog
+++ b/gnattools/ChangeLog
@@ -1,3 +1,14 @@
+2008-07-30 Paolo Bonzini <bonzini@gnu.org>
+
+ * configure.ac (x_ada_cflags): Remove.
+ (ADA_CFLAGS): Substitute.
+ * configure: Regenerate.
+ * Makefile.in (ADA_CFLAGS): Substitute.
+ (T_ADA_CFLAGS, X_ADA_CFLAGS, ALL_ADA_CFLAGS): Remove.
+ (TOOLS_FLAGS_TO_PASS_1, TOOLS_FLAGS_TO_PASS_1re,
+ TOOLS_FLAGS_TO_PASS_NATIVE, TOOLS_FLAGS_TO_PASS_CROSS):
+ Pass ADA_CFLAGS.
+
2008-07-30 Laurent Guerby <laurent@guerby.net>
PR ada/5911
diff --git a/gnattools/Makefile.in b/gnattools/Makefile.in
index de0f6e35feb..f28bc685a49 100644
--- a/gnattools/Makefile.in
+++ b/gnattools/Makefile.in
@@ -45,11 +45,7 @@ CFLAGS=-g
LOOSE_WARN = -W -Wall -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes
GCC_WARN_CFLAGS = $(LOOSE_WARN) $(NOCOMMON_FLAG)
-ADA_CFLAGS=
-T_ADA_CFLAGS=
-# HPPA is literally the only target which sets X_ADA_CFLAGS
-X_ADA_CFLAGS=@x_ada_cflags@
-ALL_ADA_CFLAGS=$(X_ADA_CFLAGS) $(T_ADA_CFLAGS) $(ADA_CFLAGS)
+ADA_CFLAGS=@ADA_CFLAGS@
# Variables for gnattools.
ADAFLAGS= -gnatpg -gnata
@@ -83,6 +79,7 @@ TOOLS_FLAGS_TO_PASS_1= \
"CFLAGS=$(CFLAGS) $(WARN_CFLAGS)" \
"LDFLAGS=$(LDFLAGS)" \
"ADAFLAGS=$(ADAFLAGS)" \
+ "ADA_CFLAGS=$(ADA_CFLAGS)" \
"INCLUDES=$(INCLUDES_FOR_SUBDIR)" \
"ADA_INCLUDES=-I- -I../rts $(ADA_INCLUDES_FOR_SUBDIR)"\
"exeext=$(exeext)" \
@@ -96,6 +93,7 @@ TOOLS_FLAGS_TO_PASS_1re= \
"CC=../../xgcc -B../../" \
"CFLAGS=$(CFLAGS)" \
"ADAFLAGS=$(ADAFLAGS)" \
+ "ADA_CFLAGS=$(ADA_CFLAGS)" \
"INCLUDES=$(INCLUDES_FOR_SUBDIR)" \
"ADA_INCLUDES=-I../rts $(ADA_INCLUDES_FOR_SUBDIR)"\
"exeext=$(exeext)" \
@@ -112,6 +110,7 @@ TOOLS_FLAGS_TO_PASS_NATIVE= \
"CC=../../xgcc -B../../" \
"CFLAGS=$(CFLAGS)" \
"ADAFLAGS=$(ADAFLAGS)" \
+ "ADA_CFLAGS=$(ADA_CFLAGS)" \
"INCLUDES=$(INCLUDES_FOR_SUBDIR)" \
"ADA_INCLUDES=-I../rts $(ADA_INCLUDES_FOR_SUBDIR)" \
"exeext=$(exeext)" \
@@ -128,6 +127,7 @@ TOOLS_FLAGS_TO_PASS_CROSS= \
"CFLAGS=$(CFLAGS) $(WARN_CFLAGS)" \
"LDFLAGS=$(LDFLAGS)" \
"ADAFLAGS=$(ADAFLAGS)" \
+ "ADA_CFLAGS=$(ADA_CFLAGS)" \
"INCLUDES=$(INCLUDES_FOR_SUBDIR)" \
"ADA_INCLUDES=-I$(RTS_DIR)../adainclude -I$(RTS_DIR) $(ADA_INCLUDES_FOR_SUBDIR)" \
"exeext=$(exeext)" \
diff --git a/gnattools/configure b/gnattools/configure
index de26ec95b2e..3cd9eef4c5c 100755
--- a/gnattools/configure
+++ b/gnattools/configure
@@ -272,7 +272,7 @@ PACKAGE_STRING=
PACKAGE_BUGREPORT=
ac_unique_file="Makefile.in"
-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 MAINT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S x_ada_cflags default_gnattools_target TOOLS_TARGET_PAIRS EXTRA_GNATTOOLS 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 MAINT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S default_gnattools_target TOOLS_TARGET_PAIRS EXTRA_GNATTOOLS ADA_CFLAGS LIBOBJS LTLIBOBJS'
ac_subst_files=''
ac_pwd=`pwd`
@@ -1484,13 +1484,6 @@ echo "${ECHO_T}no, using $LN_S" >&6
fi
-# Determine x_ada_cflags
-case $host in
- hppa*) x_ada_cflags=-mdisable-indexing ;;
- *) x_ada_cflags= ;;
-esac
-
-
# Determine what to build for 'gnattools'
if test $build = $target ; then
# Note that build=target is almost certainly the wrong test; FIXME
@@ -1593,6 +1586,9 @@ case "${target}" in
;;
esac
+# From user or toplevel makefile.
+
+
# Output: create a Makefile.
ac_config_files="$ac_config_files Makefile"
@@ -2250,10 +2246,10 @@ s,@target_vendor@,$target_vendor,;t t
s,@target_os@,$target_os,;t t
s,@target_noncanonical@,$target_noncanonical,;t t
s,@LN_S@,$LN_S,;t t
-s,@x_ada_cflags@,$x_ada_cflags,;t t
s,@default_gnattools_target@,$default_gnattools_target,;t t
s,@TOOLS_TARGET_PAIRS@,$TOOLS_TARGET_PAIRS,;t t
s,@EXTRA_GNATTOOLS@,$EXTRA_GNATTOOLS,;t t
+s,@ADA_CFLAGS@,$ADA_CFLAGS,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
CEOF
diff --git a/gnattools/configure.ac b/gnattools/configure.ac
index cd5e8402bd9..965dc8e18e5 100644
--- a/gnattools/configure.ac
+++ b/gnattools/configure.ac
@@ -51,13 +51,6 @@ ACX_NONCANONICAL_TARGET
# Need to pass this down for now :-P
AC_PROG_LN_S
-# Determine x_ada_cflags
-case $host in
- hppa*) x_ada_cflags=-mdisable-indexing ;;
- *) x_ada_cflags= ;;
-esac
-AC_SUBST([x_ada_cflags])
-
# Determine what to build for 'gnattools'
if test $build = $target ; then
# Note that build=target is almost certainly the wrong test; FIXME
@@ -160,6 +153,9 @@ case "${target}" in
;;
esac
+# From user or toplevel makefile.
+AC_SUBST(ADA_CFLAGS)
+
# Output: create a Makefile.
AC_CONFIG_FILES([Makefile])