Changeset c680a4b


Ignore:
Timestamp:
Apr 27, 2020, 4:35:58 PM (19 months ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, jacob/cs343-translation, master, new-ast, new-ast-unique-expr
Children:
44aad8f, fd4d301
Parents:
851fd92
Message:

Added defines.hfa to the prelude

Files:
1 added
8 edited

Legend:

Unmodified
Added
Removed
  • driver/cfa.cc

    r851fd92 rc680a4b  
    385385        } // if
    386386
     387        string preludedir;
    387388        switch(path) {
    388         case Installed   : Putenv( argv, "--prelude-dir=" + libdir ); break;
    389         case BuildTree   : Putenv( argv, "--prelude-dir=" + libdir + "/prelude" ); break;
    390         case Distributed : Putenv( argv, "--prelude-dir=" + dir(argv[0]) ); break;
     389        case Installed   : preludedir = libdir; break;
     390        case BuildTree   : preludedir = libdir + "/prelude"; break;
     391        case Distributed : preludedir = dir(argv[0]); break;
    391392        }
     393
     394        Putenv( argv, "--prelude-dir=" + preludedir );
     395        args[nargs++] = "-include";
     396        args[nargs++] = (*new string(preludedir + "/defines.hfa")).c_str();
    392397
    393398        for ( int i = 0; i < nlibs; i += 1 ) {                          // copy non-user libraries after all user libraries
  • libcfa/Makefile.in

    r851fd92 rc680a4b  
    106106 configure.lineno config.status.lineno
    107107mkinstalldirs = $(install_sh) -d
     108CONFIG_HEADER = $(top_builddir)/prelude/defines.hfa
    108109CONFIG_CLEAN_FILES =
    109110CONFIG_CLEAN_VPATH_FILES =
  • libcfa/configure

    r851fd92 rc680a4b  
    1696616966
    1696716967
     16968ac_config_headers="$ac_config_headers prelude/defines.hfa"
     16969
     16970
    1696816971cat >confcache <<\_ACEOF
    1696916972# This file is a shell script that caches the results of configure
     
    1705617059test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
    1705717060
    17058 # Transform confdefs.h into DEFS.
    17059 # Protect against shell expansion while executing Makefile rules.
    17060 # Protect against Makefile macro expansion.
    17061 #
    17062 # If the first sed substitution is executed (which looks for macros that
    17063 # take arguments), then branch to the quote section.  Otherwise,
    17064 # look for a macro that doesn't take arguments.
    17065 ac_script='
    17066 :mline
    17067 /\\$/{
    17068  N
    17069  s,\\\n,,
    17070  b mline
    17071 }
    17072 t clear
    17073 :clear
    17074 s/^[     ]*#[    ]*define[       ][      ]*\([^  (][^    (]*([^)]*)\)[   ]*\(.*\)/-D\1=\2/g
    17075 t quote
    17076 s/^[     ]*#[    ]*define[       ][      ]*\([^  ][^     ]*\)[   ]*\(.*\)/-D\1=\2/g
    17077 t quote
    17078 b any
    17079 :quote
    17080 s/[      `~#$^&*(){}\\|;'\''"<>?]/\\&/g
    17081 s/\[/\\&/g
    17082 s/\]/\\&/g
    17083 s/\$/$$/g
    17084 H
    17085 :any
    17086 ${
    17087         g
    17088         s/^\n//
    17089         s/\n/ /g
    17090         p
    17091 }
    17092 '
    17093 DEFS=`sed -n "$ac_script" confdefs.h`
    17094 
     17061DEFS=-DHAVE_CONFIG_H
    1709517062
    1709617063ac_libobjs=
     
    1757017537esac
    1757117538
     17539case $ac_config_headers in *"
     17540"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
     17541esac
    1757217542
    1757317543
     
    1757517545# Files that config.status was made for.
    1757617546config_files="$ac_config_files"
     17547config_headers="$ac_config_headers"
    1757717548config_commands="$ac_config_commands"
    1757817549
     
    1759617567      --file=FILE[:TEMPLATE]
    1759717568                   instantiate the configuration file FILE
     17569      --header=FILE[:TEMPLATE]
     17570                   instantiate the configuration header FILE
    1759817571
    1759917572Configuration files:
    1760017573$config_files
     17574
     17575Configuration headers:
     17576$config_headers
    1760117577
    1760217578Configuration commands:
     
    1766617642    as_fn_append CONFIG_FILES " '$ac_optarg'"
    1766717643    ac_need_defaults=false;;
    17668   --he | --h |  --help | --hel | -h )
     17644  --header | --heade | --head | --hea )
     17645    $ac_shift
     17646    case $ac_optarg in
     17647    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     17648    esac
     17649    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     17650    ac_need_defaults=false;;
     17651  --he | --h)
     17652    # Conflict between --help and --header
     17653    as_fn_error $? "ambiguous option: \`$1'
     17654Try \`$0 --help' for more information.";;
     17655  --help | --hel | -h )
    1766917656    $as_echo "$ac_cs_usage"; exit ;;
    1767017657  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
     
    1811318100    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
    1811418101    "prelude/Makefile") CONFIG_FILES="$CONFIG_FILES prelude/Makefile" ;;
     18102    "prelude/defines.hfa") CONFIG_HEADERS="$CONFIG_HEADERS prelude/defines.hfa" ;;
    1811518103
    1811618104  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
     
    1812518113if $ac_need_defaults; then
    1812618114  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
     18115  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
    1812718116  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
    1812818117fi
     
    1831318302fi # test -n "$CONFIG_FILES"
    1831418303
    18315 
    18316 eval set X "  :F $CONFIG_FILES      :C $CONFIG_COMMANDS"
     18304# Set up the scripts for CONFIG_HEADERS section.
     18305# No need to generate them if there are no CONFIG_HEADERS.
     18306# This happens for instance with `./config.status Makefile'.
     18307if test -n "$CONFIG_HEADERS"; then
     18308cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
     18309BEGIN {
     18310_ACEOF
     18311
     18312# Transform confdefs.h into an awk script `defines.awk', embedded as
     18313# here-document in config.status, that substitutes the proper values into
     18314# config.h.in to produce config.h.
     18315
     18316# Create a delimiter string that does not exist in confdefs.h, to ease
     18317# handling of long lines.
     18318ac_delim='%!_!# '
     18319for ac_last_try in false false :; do
     18320  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
     18321  if test -z "$ac_tt"; then
     18322    break
     18323  elif $ac_last_try; then
     18324    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
     18325  else
     18326    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
     18327  fi
     18328done
     18329
     18330# For the awk script, D is an array of macro values keyed by name,
     18331# likewise P contains macro parameters if any.  Preserve backslash
     18332# newline sequences.
     18333
     18334ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
     18335sed -n '
     18336s/.\{148\}/&'"$ac_delim"'/g
     18337t rset
     18338:rset
     18339s/^[     ]*#[    ]*define[       ][      ]*/ /
     18340t def
     18341d
     18342:def
     18343s/\\$//
     18344t bsnl
     18345s/["\\]/\\&/g
     18346s/^ \('"$ac_word_re"'\)\(([^()]*)\)[     ]*\(.*\)/P["\1"]="\2"\
     18347D["\1"]=" \3"/p
     18348s/^ \('"$ac_word_re"'\)[         ]*\(.*\)/D["\1"]=" \2"/p
     18349d
     18350:bsnl
     18351s/["\\]/\\&/g
     18352s/^ \('"$ac_word_re"'\)\(([^()]*)\)[     ]*\(.*\)/P["\1"]="\2"\
     18353D["\1"]=" \3\\\\\\n"\\/p
     18354t cont
     18355s/^ \('"$ac_word_re"'\)[         ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
     18356t cont
     18357d
     18358:cont
     18359n
     18360s/.\{148\}/&'"$ac_delim"'/g
     18361t clear
     18362:clear
     18363s/\\$//
     18364t bsnlc
     18365s/["\\]/\\&/g; s/^/"/; s/$/"/p
     18366d
     18367:bsnlc
     18368s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
     18369b cont
     18370' <confdefs.h | sed '
     18371s/'"$ac_delim"'/"\\\
     18372"/g' >>$CONFIG_STATUS || ac_write_fail=1
     18373
     18374cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
     18375  for (key in D) D_is_set[key] = 1
     18376  FS = ""
     18377}
     18378/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
     18379  line = \$ 0
     18380  split(line, arg, " ")
     18381  if (arg[1] == "#") {
     18382    defundef = arg[2]
     18383    mac1 = arg[3]
     18384  } else {
     18385    defundef = substr(arg[1], 2)
     18386    mac1 = arg[2]
     18387  }
     18388  split(mac1, mac2, "(") #)
     18389  macro = mac2[1]
     18390  prefix = substr(line, 1, index(line, defundef) - 1)
     18391  if (D_is_set[macro]) {
     18392    # Preserve the white space surrounding the "#".
     18393    print prefix "define", macro P[macro] D[macro]
     18394    next
     18395  } else {
     18396    # Replace #undef with comments.  This is necessary, for example,
     18397    # in the case of _POSIX_SOURCE, which is predefined and required
     18398    # on some systems where configure will not decide to define it.
     18399    if (defundef == "undef") {
     18400      print "/*", prefix defundef, macro, "*/"
     18401      next
     18402    }
     18403  }
     18404}
     18405{ print }
     18406_ACAWK
     18407_ACEOF
     18408cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
     18409  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
     18410fi # test -n "$CONFIG_HEADERS"
     18411
     18412
     18413eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
    1831718414shift
    1831818415for ac_tag
     
    1853318630  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
    1853418631 ;;
    18535 
     18632  :H)
     18633  #
     18634  # CONFIG_HEADER
     18635  #
     18636  if test x"$ac_file" != x-; then
     18637    {
     18638      $as_echo "/* $configure_input  */" \
     18639      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
     18640    } >"$ac_tmp/config.h" \
     18641      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     18642    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
     18643      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
     18644$as_echo "$as_me: $ac_file is unchanged" >&6;}
     18645    else
     18646      rm -f "$ac_file"
     18647      mv "$ac_tmp/config.h" "$ac_file" \
     18648        || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     18649    fi
     18650  else
     18651    $as_echo "/* $configure_input  */" \
     18652      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
     18653      || as_fn_error $? "could not create -" "$LINENO" 5
     18654  fi
     18655# Compute "$ac_file"'s index in $config_headers.
     18656_am_arg="$ac_file"
     18657_am_stamp_count=1
     18658for _am_header in $config_headers :; do
     18659  case $_am_header in
     18660    $_am_arg | $_am_arg:* )
     18661      break ;;
     18662    * )
     18663      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
     18664  esac
     18665done
     18666echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
     18667$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
     18668         X"$_am_arg" : 'X\(//\)[^/]' \| \
     18669         X"$_am_arg" : 'X\(//\)$' \| \
     18670         X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
     18671$as_echo X"$_am_arg" |
     18672    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
     18673            s//\1/
     18674            q
     18675          }
     18676          /^X\(\/\/\)[^/].*/{
     18677            s//\1/
     18678            q
     18679          }
     18680          /^X\(\/\/\)$/{
     18681            s//\1/
     18682            q
     18683          }
     18684          /^X\(\/\).*/{
     18685            s//\1/
     18686            q
     18687          }
     18688          s/.*/./; q'`/stamp-h$_am_stamp_count
     18689 ;;
    1853618690
    1853718691  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
  • libcfa/configure.ac

    r851fd92 rc680a4b  
    126126        ])
    127127
     128AC_CONFIG_HEADERS(prelude/defines.hfa)
     129
    128130AC_OUTPUT()
    129131
  • libcfa/prelude/Makefile.am

    r851fd92 rc680a4b  
    2121# put into lib for now
    2222cfalibdir = ${CFA_LIBDIR}
    23 cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c
     23cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c defines.hfa
    2424
    2525CC = @LOCAL_CFACC@
  • libcfa/prelude/Makefile.in

    r851fd92 rc680a4b  
    104104DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
    105105mkinstalldirs = $(install_sh) -d
     106CONFIG_HEADER = defines.hfa
    106107CONFIG_CLEAN_FILES =
    107108CONFIG_CLEAN_VPATH_FILES =
     
    154155am__installdirs = "$(DESTDIR)$(cfalibdir)"
    155156DATA = $(cfalib_DATA)
    156 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
    157 am__DIST_COMMON = $(srcdir)/Makefile.in
     157am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
     158        $(LISP)defines.hfa.in
     159# Read a list of newline-separated strings from the standard input,
     160# and print each of them once, without duplicates.  Input order is
     161# *not* preserved.
     162am__uniquify_input = $(AWK) '\
     163  BEGIN { nonempty = 0; } \
     164  { items[$$0] = 1; nonempty = 1; } \
     165  END { if (nonempty) { for (i in items) print i; }; } \
     166'
     167# Make sure the list of sources is unique.  This is necessary because,
     168# e.g., the same source file might be shared among _SOURCES variables
     169# for different programs/libraries.
     170am__define_uniq_tagged_files = \
     171  list='$(am__tagged_files)'; \
     172  unique=`for i in $$list; do \
     173    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
     174  done | $(am__uniquify_input)`
     175ETAGS = etags
     176CTAGS = ctags
     177am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/defines.hfa.in
    158178DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    159179ACLOCAL = @ACLOCAL@
     
    306326# put into lib for now
    307327cfalibdir = ${CFA_LIBDIR}
    308 cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c
     328cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c defines.hfa
    309329AM_CFLAGS = -g -Wall -Wno-unused-function -fPIC @ARCH_FLAGS@ @CONFIG_CFLAGS@
    310330AM_CFAFLAGS = @CONFIG_CFAFLAGS@
    311331MOSTLYCLEANFILES = bootloader.c builtins.cf extras.cf gcc-builtins.c gcc-builtins.cf prelude.cfa
    312332MAINTAINERCLEANFILES = ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}
    313 all: all-am
     333all: defines.hfa
     334        $(MAKE) $(AM_MAKEFLAGS) all-am
    314335
    315336.SUFFIXES:
     
    344365$(am__aclocal_m4_deps):
    345366
     367defines.hfa: stamp-h1
     368        @test -f $@ || rm -f stamp-h1
     369        @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
     370
     371stamp-h1: $(srcdir)/defines.hfa.in $(top_builddir)/config.status
     372        @rm -f stamp-h1
     373        cd $(top_builddir) && $(SHELL) ./config.status prelude/defines.hfa
     374$(srcdir)/defines.hfa.in:  $(am__configure_deps)
     375        ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
     376        rm -f stamp-h1
     377        touch $@
     378
     379distclean-hdr:
     380        -rm -f defines.hfa stamp-h1
     381
    346382mostlyclean-libtool:
    347383        -rm -f *.lo
     
    370406        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
    371407        dir='$(DESTDIR)$(cfalibdir)'; $(am__uninstall_files_from_dir)
    372 tags TAGS:
    373 
    374 ctags CTAGS:
    375 
    376 cscope cscopelist:
    377 
     408
     409ID: $(am__tagged_files)
     410        $(am__define_uniq_tagged_files); mkid -fID $$unique
     411tags: tags-am
     412TAGS: tags
     413
     414tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
     415        set x; \
     416        here=`pwd`; \
     417        $(am__define_uniq_tagged_files); \
     418        shift; \
     419        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
     420          test -n "$$unique" || unique=$$empty_fix; \
     421          if test $$# -gt 0; then \
     422            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     423              "$$@" $$unique; \
     424          else \
     425            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     426              $$unique; \
     427          fi; \
     428        fi
     429ctags: ctags-am
     430
     431CTAGS: ctags
     432ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
     433        $(am__define_uniq_tagged_files); \
     434        test -z "$(CTAGS_ARGS)$$unique" \
     435          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
     436             $$unique
     437
     438GTAGS:
     439        here=`$(am__cd) $(top_builddir) && pwd` \
     440          && $(am__cd) $(top_srcdir) \
     441          && gtags -i $(GTAGS_ARGS) "$$here"
     442cscopelist: cscopelist-am
     443
     444cscopelist-am: $(am__tagged_files)
     445        list='$(am__tagged_files)'; \
     446        case "$(srcdir)" in \
     447          [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
     448          *) sdir=$(subdir)/$(srcdir) ;; \
     449        esac; \
     450        for i in $$list; do \
     451          if test -f "$$i"; then \
     452            echo "$(subdir)/$$i"; \
     453          else \
     454            echo "$$sdir/$$i"; \
     455          fi; \
     456        done >> $(top_builddir)/cscope.files
     457
     458distclean-tags:
     459        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
    378460
    379461distdir: $(DISTFILES)
     
    409491check-am: all-am
    410492check: check-am
    411 all-am: Makefile $(DATA)
     493all-am: Makefile $(DATA) defines.hfa
    412494installdirs:
    413495        for dir in "$(DESTDIR)$(cfalibdir)"; do \
     
    452534distclean: distclean-am
    453535        -rm -f Makefile
    454 distclean-am: clean-am distclean-generic
     536distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
    455537
    456538dvi: dvi-am
     
    513595uninstall-am: uninstall-cfalibDATA
    514596
    515 .MAKE: install-am install-strip
    516 
    517 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
    518         cscopelist-am ctags-am distclean distclean-generic \
    519         distclean-libtool distdir dvi dvi-am html html-am info info-am \
     597.MAKE: all install-am install-strip
     598
     599.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
     600        clean-libtool cscopelist-am ctags ctags-am distclean \
     601        distclean-generic distclean-hdr distclean-libtool \
     602        distclean-tags distdir dvi dvi-am html html-am info info-am \
    520603        install install-am install-cfalibDATA install-data \
    521604        install-data-am install-dvi install-dvi-am install-exec \
     
    526609        maintainer-clean-generic maintainer-clean-local mostlyclean \
    527610        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
    528         tags-am uninstall uninstall-am uninstall-cfalibDATA
     611        tags tags-am uninstall uninstall-am uninstall-cfalibDATA
    529612
    530613.PRECIOUS: Makefile
  • libcfa/src/Makefile.in

    r851fd92 rc680a4b  
    105105        $(am__nobase_cfa_include_HEADERS_DIST) $(am__DIST_COMMON)
    106106mkinstalldirs = $(install_sh) -d
     107CONFIG_HEADER = $(top_builddir)/prelude/defines.hfa
    107108CONFIG_CLEAN_FILES =
    108109CONFIG_CLEAN_VPATH_FILES =
     
    194195am__v_at_0 = @
    195196am__v_at_1 =
    196 DEFAULT_INCLUDES = -I.@am__isrc@
     197DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/prelude
    197198depcomp = $(SHELL) $(top_srcdir)/automake/depcomp
    198199am__depfiles_maybe = depfiles
  • tools/build/push2dist.sh

    r851fd92 rc680a4b  
    1919# echo "Copying to machines : ${hosts} (hash=${hash})"
    2020
    21 files="../../../driver/cfa ../../../driver/cfa-cpp ../../../driver/cc1 ../../../driver/as $(find . -name '*.c*' | tr '\n' ' ')"
     21files="../../../driver/cfa ../../../driver/cfa-cpp ../../../driver/cc1 ../../../driver/as defines.hfa $(find . -name '*.c*' | tr '\n' ' ')"
    2222# echo "Files ${files}"
    2323
Note: See TracChangeset for help on using the changeset viewer.