diff --git a/ChangeLog b/ChangeLog index 63170e89c17..c4400d65acb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-07-30 Paolo Bonzini + + * 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. + 2008-07-28 Aldy Hernandez * MAINTAINERS: Add Jakub and myself as gimple maintainers. diff --git a/Makefile.def b/Makefile.def index 3924617ebd3..832fc4236e9 100644 --- a/Makefile.def +++ b/Makefile.def @@ -226,6 +226,7 @@ flags_to_pass = { flag= YACC ; }; // Host tools flags_to_pass = { flag= ADAFLAGS ; optional=true ; }; +flags_to_pass = { flag= ADA_CFLAGS ; }; flags_to_pass = { flag= AR_FLAGS ; }; flags_to_pass = { flag= BOOT_ADAFLAGS ; optional=true ; }; flags_to_pass = { flag= BOOT_CFLAGS ; }; diff --git a/Makefile.in b/Makefile.in index 81bf0e9011c..d9ef0681497 100644 --- a/Makefile.in +++ b/Makefile.in @@ -164,6 +164,7 @@ HOST_SUBDIR = @host_subdir@ HOST_EXPORTS = \ $(BASE_EXPORTS) \ CC="$(CC)"; export CC; \ + ADA_CFLAGS="$(ADA_CFLAGS)"; export ADA_CFLAGS; \ CFLAGS="$(CFLAGS)"; export CFLAGS; \ CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ CXX="$(CXX)"; export CXX; \ @@ -514,6 +515,7 @@ BASE_FLAGS_TO_PASS = \ "SHELL=$(SHELL)" \ "YACC=$(YACC)" \ "`echo 'ADAFLAGS=$(ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ + "ADA_CFLAGS=$(ADA_CFLAGS)" \ "AR_FLAGS=$(AR_FLAGS)" \ "`echo 'BOOT_ADAFLAGS=$(BOOT_ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ "BOOT_CFLAGS=$(BOOT_CFLAGS)" \ diff --git a/Makefile.tpl b/Makefile.tpl index 4c744eba394..1f0c318012f 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -167,6 +167,7 @@ HOST_SUBDIR = @host_subdir@ HOST_EXPORTS = \ $(BASE_EXPORTS) \ CC="$(CC)"; export CC; \ + ADA_CFLAGS="$(ADA_CFLAGS)"; export ADA_CFLAGS; \ CFLAGS="$(CFLAGS)"; export CFLAGS; \ CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ CXX="$(CXX)"; export CXX; \ diff --git a/config/ChangeLog b/config/ChangeLog index e64c1cab72e..6178044155f 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,8 @@ +2008-07-30 Paolo Bonzini + + * mh-pa: New, from gcc/config/pa/x-ada. + * mh-pa-hpux10: New, from gcc/config/pa/x-ada-hpux10. + 2008-07-11 Joseph Myers * mh-mingw (LDFLAGS): Append to rather than replacing previous diff --git a/gcc/config/pa/x-ada b/config/mh-pa similarity index 87% rename from gcc/config/pa/x-ada rename to config/mh-pa index b60b3d7925b..b0005a25d4d 100644 --- a/gcc/config/pa/x-ada +++ b/config/mh-pa @@ -1,4 +1,4 @@ # The ada virtual array implementation requires that indexing be disabled on # hosts such as hpux that use a segmented memory architecture. Both the c # and ada files need to be compiled with this option for correct operation. -X_ADA_CFLAGS=-mdisable-indexing +ADA_CFLAGS = -mdisable-indexing diff --git a/gcc/config/pa/x-ada-hpux10 b/config/mh-pa-hpux10 similarity index 83% rename from gcc/config/pa/x-ada-hpux10 rename to config/mh-pa-hpux10 index d2b70753088..99a2278f281 100644 --- a/gcc/config/pa/x-ada-hpux10 +++ b/config/mh-pa-hpux10 @@ -1,4 +1,4 @@ # The ada virtual array implementation requires that indexing be disabled on # hosts such as hpux that use a segmented memory architecture. Both the c # and ada files need to be compiled with this option for correct operation. -X_ADA_CFLAGS = -mdisable-indexing -D_X_HPUX10 +ADA_CFLAGS = -mdisable-indexing -D_X_HPUX10 diff --git a/configure.ac b/configure.ac index b7fb222298d..dc9ffacf7c7 100644 --- a/configure.ac +++ b/configure.ac @@ -1067,10 +1067,18 @@ case "${host}" in # without overflowing the jump tables (-J says to use a 32 bit table) tentative_cc="cc -J" ;; - *-hp-hpux*) + hppa*-hp-hpux10*) tentative_cc="cc -Wp,-H256000" + host_makefile_frag="config/mh-pa-hpux10" ;; - *-*-hiux*) + hppa*-hp-hpux* | hppa*-*-hiux*) + tentative_cc="cc -Wp,-H256000" + host_makefile_frag="config/mh-pa" + ;; + hppa*-*) + host_makefile_frag="config/mh-pa" + ;; + *-hp-hpux* | *-*-hiux*) tentative_cc="cc -Wp,-H256000" ;; rs6000-*-lynxos*) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6899d2d07e4..ef8fdb0e6c2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,14 @@ +2008-07-30 Paolo Bonzini + + * 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. + 2008-07-30 Olivier Hainque * config/mips/irix-crti.asm: .hide __gcc_init and __gcc_fini. diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 3dbaa733fe4..10193a150c9 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -113,15 +113,6 @@ VPATH = @srcdir@ vpath %.texi $(gcc_docdir) vpath %.texi $(gcc_docdir)/include -# ---- -# Default values for variables overridden in Makefile fragments. -# These need to be quite early in the Makefile so as to avoid -# trouble induced by changes in fragment ordering. -# ---- - -# For ada/Make-lang.in; overridden in, for example, config/pa/x-ada. -X_ADA_CFLAGS = - # -------- # UNSORTED # -------- @@ -136,9 +127,11 @@ SUBDIRS =@subdirs@ build CONFIG_LANGUAGES = @all_selected_languages@ LANGUAGES = c gcov$(exeext) gcov-dump$(exeext) $(CONFIG_LANGUAGES) -# Various ways of specifying flags for compilations: +# Default values for variables overridden in Makefile fragments. # CFLAGS is for the user to override to, e.g., do a cross build with -O2. # TCFLAGS is used for compilations with the GCC just built. +# T_CFLAGS is used for all compilations and is overridden by t-* files. +T_CFLAGS = TCFLAGS = CFLAGS = @CFLAGS@ LDFLAGS = @LDFLAGS@ @@ -198,9 +191,6 @@ WARN_CFLAGS = @warn_cflags@ CPPFLAGS = @CPPFLAGS@ -# These exists to be overridden by the x-* and t-* files, respectively. -T_CFLAGS = - AWK = @AWK@ CC = @CC@ BISON = @BISON@ diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index ec532ca66c0..3837ba0b492 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,18 @@ +2008-07-30 Paolo Bonzini + + * 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. + 2008-07-30 Laurent Guerby PR ada/5911 diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in index a0dadffc90f..1254793dc2d 100644 --- a/gcc/ada/gcc-interface/Make-lang.in +++ b/gcc/ada/gcc-interface/Make-lang.in @@ -55,11 +55,9 @@ else ADAFLAGS= $(COMMON_ADAFLAGS) endif -ALL_ADAFLAGS = $(CFLAGS) $(ALL_ADA_CFLAGS) $(X_ADAFLAGS) $(T_ADAFLAGS) \ - $(ADAFLAGS) +ALL_ADAFLAGS = $(CFLAGS) $(ADA_CFLAGS) $(ADAFLAGS) FORCE_DEBUG_ADAFLAGS = -g ADA_CFLAGS = -ALL_ADA_CFLAGS = $(X_ADA_CFLAGS) $(T_ADA_CFLAGS) $(ADA_CFLAGS) ADA_INCLUDES = -nostdinc -I- -I. -Iada -I$(srcdir)/ada -I$(srcdir)/ada/gcc-interface ADA_INCLUDE_DIR = $(libsubdir)/adainclude ADA_RTL_OBJ_DIR = $(libsubdir)/adalib @@ -76,9 +74,9 @@ ADA_FLAGS_TO_PASS = \ # Say how to compile Ada programs. .SUFFIXES: .ada .adb .ads -# FIXME: need to add $(ALL_ADA_CFLAGS) to .c.o suffix rule +# FIXME: need to add $(ADA_CFLAGS) to .c.o suffix rule # Use loose warnings for this front end, but add some special flags -ada-warn = $(ALL_ADA_CFLAGS) $(WERROR) +ada-warn = $(ADA_CFLAGS) $(WERROR) # unresolved warnings in a couple of files ada/tracebak.o-warn = -Wno-error ada/b_gnat1.o-warn = -Wno-error @@ -1058,25 +1056,25 @@ ada/targext.o : ada/targext.c $(SYSTEM_H) coretypes.h $(TM_H) $< $(OUTPUT_OPTION) ada/cio.o : ada/cio.c $(CONFIG_H) $(SYSTEM_H) ada/adaint.h - $(CC) -c $(ALL_CFLAGS) $(ALL_ADA_CFLAGS) \ + $(CC) -c $(ALL_CFLAGS) $(ADA_CFLAGS) \ $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION) ada/init.o : ada/init.c $(CONFIG_H) $(SYSTEM_H) ada/adaint.h ada/raise.h - $(CC) -c $(ALL_CFLAGS) $(ALL_ADA_CFLAGS) \ + $(CC) -c $(ALL_CFLAGS) $(ADA_CFLAGS) \ $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION) ada/initialize.o : ada/initialize.c - $(CC) -c $(ALL_CFLAGS) $(ALL_ADA_CFLAGS) \ + $(CC) -c $(ALL_CFLAGS) $(ADA_CFLAGS) \ $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION) ada/raise.o : ada/raise.c $(CONFIG_H) $(SYSTEM_H) ada/adaint.h ada/raise.h - $(CC) -c $(ALL_CFLAGS) $(ALL_ADA_CFLAGS) \ + $(CC) -c $(ALL_CFLAGS) $(ADA_CFLAGS) \ $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION) # Need to keep the frame pointer in this file to pop the stack properly on # some targets. ada/tracebak.o : ada/tracebak.c $(CONFIG_H) $(SYSTEM_H) - $(CC) -c $(ALL_CFLAGS) $(ALL_ADA_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ + $(CC) -c $(ALL_CFLAGS) $(ADA_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ -fno-omit-frame-pointer $< $(OUTPUT_OPTION) ada/cuintp.o : ada/gcc-interface/cuintp.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in index 1fbfeb51ccb..020ee2080be 100644 --- a/gcc/ada/gcc-interface/Makefile.in +++ b/gcc/ada/gcc-interface/Makefile.in @@ -66,23 +66,11 @@ # CFLAGS is for the user to override to, e.g., do a bootstrap with -O2. # BOOT_CFLAGS is the value of CFLAGS to pass # to the stage2 and stage3 compilations -# XCFLAGS is used for most compilations but not when using the GCC just built. -XCFLAGS = CFLAGS = -g BOOT_CFLAGS = -O $(CFLAGS) -# These exists to be overridden by the x-* and t-* files, respectively. -X_CFLAGS = +# These exists to be overridden by the t-* files, respectively. T_CFLAGS = -X_CPPFLAGS = -T_CPPFLAGS = - -X_ADA_CFLAGS = -T_ADA_CFLAGS = - -X_ADAFLAGS = -T_ADAFLAGS = - CC = cc BISON = bison BISONFLAGS = @@ -119,11 +107,8 @@ GNATLIBFLAGS = -gnatpg -nostdinc GNATLIBCFLAGS = -g -O2 GNATLIBCFLAGS_FOR_C = $(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS) -fexceptions \ -DIN_RTS -ALL_ADA_CFLAGS = $(X_ADA_CFLAGS) $(T_ADA_CFLAGS) $(ADA_CFLAGS) -ALL_ADAFLAGS = $(CFLAGS) $(ALL_ADA_CFLAGS) $(X_ADAFLAGS) $(T_ADAFLAGS) \ - $(ADAFLAGS) -MOST_ADAFLAGS = $(CFLAGS) $(ALL_ADA_CFLAGS) $(X_ADAFLAGS) $(T_ADAFLAGS) \ - $(SOME_ADAFLAGS) +ALL_ADAFLAGS = $(CFLAGS) $(ADA_CFLAGS) $(ADAFLAGS) +MOST_ADAFLAGS = $(CFLAGS) $(ADA_CFLAGS) $(SOME_ADAFLAGS) THREAD_KIND = native THREADSLIB = GMEM_LIB = @@ -144,9 +129,9 @@ hyphen = - P = # This is used instead of ALL_CFLAGS when compiling with GCC_FOR_TARGET. -# It omits XCFLAGS, and specifies -B./. +# It specifies -B./. # It also specifies -B$(tooldir)/ to find as and ld for a cross compiler. -GCC_CFLAGS = $(INTERNAL_CFLAGS) $(X_CFLAGS) $(T_CFLAGS) $(CFLAGS) +GCC_CFLAGS = $(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS) # Tools to use when building a cross-compiler. # These are used because `configure' appends `cross-make' @@ -231,11 +216,10 @@ INTERNAL_CFLAGS = @CROSS@ -DIN_GCC # This is the variable actually used when we compile. LOOSE_CFLAGS = `echo $(CFLAGS) $(WARN2_CFLAGS)|sed -e 's/-pedantic//g' -e 's/-Wtraditional//g'` -ALL_CFLAGS = $(INTERNAL_CFLAGS) $(X_CFLAGS) $(T_CFLAGS) $(LOOSE_CFLAGS) \ - $(XCFLAGS) +ALL_CFLAGS = $(INTERNAL_CFLAGS) $(T_CFLAGS) $(LOOSE_CFLAGS) # Likewise. -ALL_CPPFLAGS = $(CPPFLAGS) $(X_CPPFLAGS) $(T_CPPFLAGS) +ALL_CPPFLAGS = $(CPPFLAGS) # This is where we get libiberty.a from. LIBIBERTY = ../../libiberty/libiberty.a @@ -2260,15 +2244,15 @@ gen-soccon: gen-soccon.c gsocket.h cio.o : cio.c $(CC) -c $(ALL_CFLAGS) $(ADA_CFLAGS) \ - $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION) + $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION) init.o : init.c adaint.h raise.h $(CC) -c $(ALL_CFLAGS) $(ADA_CFLAGS) \ - $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION) + $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION) initialize.o : initialize.c raise.h $(CC) -c $(ALL_CFLAGS) $(ADA_CFLAGS) \ - $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION) + $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION) targext.o : targext.c $(CC) -c $(ALL_CFLAGS) $(ADA_CFLAGS) \ @@ -2279,7 +2263,7 @@ targext.o : targext.c # the SEH handling on Windows. The reasons are not clear. seh_init.o : seh_init.c raise.h $(CC) -c $(ALL_CFLAGS) $(ADA_CFLAGS) -O0 \ - $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION) + $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION) # Need to keep the frame pointer in this file to pop the stack properly on # some targets. diff --git a/gcc/config.host b/gcc/config.host index d6efc6d730b..1d2462911df 100644 --- a/gcc/config.host +++ b/gcc/config.host @@ -141,26 +141,14 @@ case ${host} in prefix=/gnu local_prefix=/gnu ;; - hppa1.1-*-pro*) - host_xmake_file="${host_xmake_file} pa/x-ada" - ;; - hppa1.1-*-osf*) - host_xmake_file="${host_xmake_file} pa/x-ada" - ;; - hppa1.1-*-rtems*) - host_xmake_file="${host_xmake_file} pa/x-ada" - ;; - hppa1.1-*-bsd*) - host_xmake_file="${host_xmake_file} pa/x-ada" - ;; hppa1.0-*-hpux10* | hppa1.1-*-hpux10* | hppa2*-*-hpux10*) out_host_hook_obj=host-hpux.o - host_xmake_file="${host_xmake_file} pa/x-ada-hpux10 x-hpux" + host_xmake_file="${host_xmake_file} x-hpux" ;; hppa1.0-*-hpux11* | hppa1.1-*-hpux11* | hppa2*-*-hpux11* | \ hppa*64*-*-hpux11*) out_host_hook_obj=host-hpux.o - host_xmake_file="${host_xmake_file} pa/x-ada x-hpux" + host_xmake_file="${host_xmake_file} x-hpux" ;; hppa*-*-linux*) out_host_hook_obj=host-hpux.o diff --git a/gcc/doc/fragments.texi b/gcc/doc/fragments.texi index 450fd50f469..dcb64f441a8 100644 --- a/gcc/doc/fragments.texi +++ b/gcc/doc/fragments.texi @@ -172,6 +172,11 @@ some other filename (say @file{specs.install}), that will then be created out of the built-in specs, and introduce a @file{Makefile} rule to generate the @file{specs} file that's going to be used at build time out of your @file{specs.install}. + +@item T_CFLAGS +These are extra flags to pass to the C compiler. They are used both +when building GCC, and when compiling things with the just-built GCC@. +This variable is deprecated and should not be used. @end table @node Host Fragment @@ -179,36 +184,5 @@ build time out of your @file{specs.install}. @cindex host makefile fragment @cindex @file{x-@var{host}} -The use of @file{x-@var{host}} fragments is discouraged. You should do -so only if there is no other mechanism to get the behavior desired. -Host fragments should never forcibly override variables set by the -configure script, as they may have been adjusted by the user. - -Variables provided for host fragments to set include: - -@table @code - -@item X_CFLAGS -@itemx X_CPPFLAGS -These are extra flags to pass to the C compiler and preprocessor, -respectively. They are used both when building GCC, and when compiling -things with the just-built GCC@. - -@item XCFLAGS -These are extra flags to use when building the compiler. They are not -used when compiling @file{libgcc.a}. However, they @emph{are} used when -recompiling the compiler with itself in later stages of a bootstrap. - -@item BOOT_LDFLAGS -Flags to be passed to the linker when recompiling the compiler with -itself in later stages of a bootstrap. You might need to use this if, -for instance, one of the front ends needs more text space than the -linker provides by default. - -@item EXTRA_PROGRAMS -A list of additional programs required to use the compiler on this host, -which should be compiled with GCC and installed alongside the front -ends. If you set this variable, you must also provide rules to build -the extra programs. - -@end table +The use of @file{x-@var{host}} fragments is discouraged. You should only +use it for makefile dependencies. 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 + + * 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 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])