mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-09 04:21:49 +08:00
sim: common: delete configure & Makefile
This was mostly orphaned a while back, but left behind so people could still run `make headers`. Merge that one target to the top sim dir and delete all the build logic. This should avoid confusing people further.
This commit is contained in:
Mike Frysinger
parent
4cfcd3b333
commit
5e25901fcc
@ -1,3 +1,11 @@
|
||||
2021-01-18 Mike Frysinger <vapier@gentoo.org>
|
||||
|
||||
* configure.ac: Call AC_PROG_CPP.
|
||||
* configure: Regenerate.
|
||||
* Makefile.in (abs_srcdir, srcroot, CPP): Define.
|
||||
(nltvals): New target.
|
||||
* README-HACKING: Change headers to nltvals.
|
||||
|
||||
2021-01-18 Mike Frysinger <vapier@gentoo.org>
|
||||
|
||||
* Makefile.in (headers): Change args to gennltvals.sh.
|
||||
|
||||
@ -19,6 +19,8 @@
|
||||
|
||||
VPATH = @srcdir@
|
||||
srcdir = @srcdir@
|
||||
abs_srcdir = @abs_srcdir@
|
||||
srcroot = $(abs_srcdir)/..
|
||||
|
||||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
@ -54,6 +56,7 @@ INSTALL_DATA = @INSTALL_DATA@
|
||||
AR = @AR@
|
||||
AR_FLAGS = rc
|
||||
CC = @CC@
|
||||
CPP = @CPP@
|
||||
CFLAGS = @CFLAGS@
|
||||
CC_FOR_BUILD = @CC_FOR_BUILD@
|
||||
CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
|
||||
@ -221,6 +224,17 @@ Makefile: Makefile.in config.status
|
||||
config.status: configure
|
||||
$(SHELL) ./config.status --recheck
|
||||
|
||||
# Generate nltvals.def for newlib/libgloss using devo and build tree.
|
||||
# This file is shipped with distributions so we build in the source dir.
|
||||
# Use `make nltvals' to rebuild.
|
||||
# Note: If gdb releases begin to contain target header files (not a good idea,
|
||||
# but if they did ...), nltvals.def coud be generated at build time.
|
||||
# An alternative is to slurp in the tables at runtime.
|
||||
.PHONY: nltvals
|
||||
nltvals:
|
||||
$(SHELL) $(abs_srcdir)/common/gennltvals.sh --cpp "$(CPP)" --output nltvals.def --srcroot $(srcroot) && \
|
||||
$(SHELL) $(srcroot)/move-if-change nltvals.def $(abs_srcdir)/common/nltvals.def
|
||||
|
||||
# Utility to run autoconf in each directory that uses the common framework.
|
||||
# This is intended to be invoked in $srcdir as
|
||||
# "make -f Makefile.in autoconf-common SHELL=/bin/sh".
|
||||
|
||||
@ -191,10 +191,10 @@ convenience):
|
||||
$ cd /tmp/$$/build
|
||||
$ /tmp/$$/devo/configure --target=d10v-elf
|
||||
|
||||
In the sim/common directory rebuild the headers:
|
||||
In the sim/ directory rebuild the headers:
|
||||
|
||||
$ cd sim/common
|
||||
$ make headers
|
||||
$ cd sim/
|
||||
$ make nltvals
|
||||
|
||||
To add a new target:
|
||||
|
||||
|
||||
@ -1,3 +1,7 @@
|
||||
2021-01-18 Mike Frysinger <vapier@gentoo.org>
|
||||
|
||||
* configure, configure.ac, Makefile.in: Delete.
|
||||
|
||||
2021-01-13 Mike Frysinger <vapier@gentoo.org>
|
||||
|
||||
* sim-watch.c (default_interrupt_handler): Define.
|
||||
|
||||
@ -1,135 +0,0 @@
|
||||
# Makefile template for Configure for simulator common directory
|
||||
# Copyright (C) 1996-2021 Free Software Foundation, Inc.
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
default: all
|
||||
|
||||
VPATH = @srcdir@
|
||||
srcdir = @srcdir@
|
||||
abs_srcdir = @abs_srcdir@
|
||||
srcroot = $(abs_srcdir)/../..
|
||||
|
||||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
|
||||
host_alias = @host_alias@
|
||||
target_alias = @target_alias@
|
||||
program_transform_name = @program_transform_name@
|
||||
bindir = @bindir@
|
||||
|
||||
libdir = @libdir@
|
||||
tooldir = $(libdir)/$(target_alias)
|
||||
|
||||
datarootdir = @datarootdir@
|
||||
datadir = @datadir@
|
||||
mandir = @mandir@
|
||||
man1dir = $(mandir)/man1
|
||||
infodir = @infodir@
|
||||
includedir = @includedir@
|
||||
|
||||
SHELL = /bin/sh
|
||||
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
|
||||
CC = @CC@
|
||||
CC_FOR_BUILD = @CC_FOR_BUILD@
|
||||
CFLAGS = @CFLAGS@
|
||||
|
||||
# These are used to rebuild nltvals.def.
|
||||
CPP_FOR_TARGET = @CPP_FOR_TARGET@
|
||||
TARGET_SUBDIR = @TARGET_SUBDIR@
|
||||
|
||||
HDEFINES = @HDEFINES@
|
||||
TDEFINES =
|
||||
|
||||
CONFIG_CFLAGS = @DEFS@ $(HDEFINES) $(TDEFINES)
|
||||
CSEARCH = -I. -I$(srcdir) -I$(srcroot)/include
|
||||
ALL_CFLAGS = $(CFLAGS) $(CONFIG_CFLAGS) $(CSEARCH)
|
||||
BUILD_CFLAGS = -g -O $(CSEARCH)
|
||||
|
||||
AR = @AR@
|
||||
AR_FLAGS = rc
|
||||
RANLIB = @RANLIB@
|
||||
MAKEINFO = makeinfo
|
||||
|
||||
.NOEXPORT:
|
||||
MAKEOVERRIDES=
|
||||
|
||||
all:
|
||||
|
||||
# Generate nltvals.def for newlib/libgloss using devo and build tree.
|
||||
# This file is shipped with distributions so we build in the source dir.
|
||||
# Use `make headers' to rebuild.
|
||||
# Note: If gdb releases begin to contain target header files (not a good idea,
|
||||
# but if they did ...), nltvals.def coud be generated at build time.
|
||||
# An alternative is to slurp in the tables at runtime.
|
||||
.PHONY: headers
|
||||
headers:
|
||||
rootme=`pwd` ; \
|
||||
cd $(srcdir) ; \
|
||||
rm -f nltvals.new ; \
|
||||
$(SHELL) $(abs_srcdir)/gennltvals.sh --cpp "$(CPP_FOR_TARGET)" --srcroot $(srcroot) --output nltvals.new ; \
|
||||
$(SHELL) $(srcroot)/move-if-change nltvals.new nltvals.def
|
||||
|
||||
.c.o:
|
||||
$(CC) -c $< $(ALL_CFLAGS)
|
||||
|
||||
check:
|
||||
|
||||
info:
|
||||
clean-info:
|
||||
install-info:
|
||||
|
||||
tags etags: TAGS
|
||||
|
||||
# Macros like EXTERN_SIM_CORE confuse tags.
|
||||
# And the sim-n-foo.h files create functions that can't be found either.
|
||||
TAGS: force
|
||||
cd $(srcdir) && \
|
||||
etags --regex '/^\([a-z_]+\) (/\1/' --regex '/^.*\/[*] TAGS: .*/' \
|
||||
*.c *.h
|
||||
|
||||
clean:
|
||||
rm -f *.[oa] *~ core
|
||||
|
||||
distclean mostlyclean maintainer-clean realclean: clean
|
||||
rm -f TAGS
|
||||
rm -f Makefile config.cache config.log config.status
|
||||
|
||||
# Dummy target to force execution of dependent targets.
|
||||
force:
|
||||
|
||||
# Copy the files into directories where they will be run.
|
||||
install: install-man
|
||||
install-strip: install-man
|
||||
|
||||
install-man: installdirs
|
||||
n=`echo run | sed '$(program_transform_name)'`; \
|
||||
$(INSTALL_DATA) $(srcdir)/run.1 $(DESTDIR)$(man1dir)/$$n.1
|
||||
|
||||
installdirs:
|
||||
$(SHELL) $(srcdir)/../../mkinstalldirs $(DESTDIR)$(man1dir)
|
||||
|
||||
Makefile: Makefile.in config.status
|
||||
$(SHELL) ./config.status
|
||||
|
||||
config.status: configure
|
||||
$(SHELL) ./config.status --recheck
|
||||
|
||||
config.h: stamp-h ; @true
|
||||
stamp-h: config.in config.status
|
||||
CONFIG_FILES= CONFIG_HEADERS=config.h:config.in $(SHELL) ./config.status
|
||||
3718
sim/common/configure
vendored
3718
sim/common/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -1,34 +0,0 @@
|
||||
dnl Process this file with autoconf to produce a configure script.
|
||||
AC_INIT(Makefile.in)
|
||||
|
||||
AC_PROG_CC
|
||||
|
||||
# Put a useful copy of CPP_FOR_TARGET in Makefile.
|
||||
# This is only used to build the target values header files. These files are
|
||||
# shipped with distributions so CPP_FOR_TARGET only needs to work in
|
||||
# developer's trees. This value is borrowed from ../../Makefile.in.
|
||||
CPP_FOR_TARGET="\` \
|
||||
if test -f \$\${rootme}/../../gcc/Makefile ; then \
|
||||
if test -f \$\${rootme}/../../\$(TARGET_SUBDIR)/newlib/Makefile ; then \
|
||||
echo \$\${rootme}/../../gcc/xgcc -B\$\${rootme}/../../gcc/ -idirafter \$\${rootme}/../../\$(TARGET_SUBDIR)/newlib/targ-include -idirafter \$(srcroot)/newlib/libc/include -nostdinc; \
|
||||
else \
|
||||
echo \$\${rootme}/../../gcc/xgcc -B\$\${rootme}/../../gcc/; \
|
||||
fi; \
|
||||
else \
|
||||
if test '\$(host_canonical)' = '\$(target_canonical)' ; then \
|
||||
echo \$(CC); \
|
||||
else \
|
||||
t='\$(program_transform_name)'; echo gcc | sed -e 's/x/x/' \$\$t; \
|
||||
fi; \
|
||||
fi\` -E"
|
||||
AC_SUBST(CPP_FOR_TARGET)
|
||||
|
||||
# Set TARGET_SUBDIR, needed by CPP_FOR_TARGET.
|
||||
if test x"${host}" = x"${target}" ; then
|
||||
TARGET_SUBDIR="."
|
||||
else
|
||||
TARGET_SUBDIR=${target_alias}
|
||||
fi
|
||||
AC_SUBST(TARGET_SUBDIR)
|
||||
|
||||
AC_OUTPUT(Makefile)
|
||||
179
sim/configure
vendored
179
sim/configure
vendored
@ -590,6 +590,7 @@ subdirs
|
||||
CFLAGS_FOR_BUILD
|
||||
CC_FOR_BUILD
|
||||
HDEFINES
|
||||
CPP
|
||||
target_os
|
||||
target_vendor
|
||||
target_cpu
|
||||
@ -664,7 +665,8 @@ CC
|
||||
CFLAGS
|
||||
LDFLAGS
|
||||
LIBS
|
||||
CPPFLAGS'
|
||||
CPPFLAGS
|
||||
CPP'
|
||||
ac_subdirs_all='aarch64
|
||||
arm
|
||||
avr
|
||||
@ -1322,6 +1324,7 @@ Some influential environment variables:
|
||||
LIBS libraries to pass to the linker, e.g. -l<library>
|
||||
CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
|
||||
you have headers in a nonstandard directory <include dir>
|
||||
CPP C preprocessor
|
||||
|
||||
Use these variables to override the choices made by `configure' or to help
|
||||
it to find libraries and programs with nonstandard names/locations.
|
||||
@ -1440,6 +1443,43 @@ fi
|
||||
as_fn_set_status $ac_retval
|
||||
|
||||
} # ac_fn_c_try_compile
|
||||
|
||||
# ac_fn_c_try_cpp LINENO
|
||||
# ----------------------
|
||||
# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
|
||||
ac_fn_c_try_cpp ()
|
||||
{
|
||||
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
||||
if { { ac_try="$ac_cpp conftest.$ac_ext"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
||||
$as_echo "$ac_try_echo"; } >&5
|
||||
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
|
||||
ac_status=$?
|
||||
if test -s conftest.err; then
|
||||
grep -v '^ *+' conftest.err >conftest.er1
|
||||
cat conftest.er1 >&5
|
||||
mv -f conftest.er1 conftest.err
|
||||
fi
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
test $ac_status = 0; } > conftest.i && {
|
||||
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
}; then :
|
||||
ac_retval=0
|
||||
else
|
||||
$as_echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_retval=1
|
||||
fi
|
||||
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
||||
as_fn_set_status $ac_retval
|
||||
|
||||
} # ac_fn_c_try_cpp
|
||||
cat >config.log <<_ACEOF
|
||||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
@ -3552,6 +3592,143 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
|
||||
ac_ext=c
|
||||
ac_cpp='$CPP $CPPFLAGS'
|
||||
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
|
||||
$as_echo_n "checking how to run the C preprocessor... " >&6; }
|
||||
# On Suns, sometimes $CPP names a directory.
|
||||
if test -n "$CPP" && test -d "$CPP"; then
|
||||
CPP=
|
||||
fi
|
||||
if test -z "$CPP"; then
|
||||
if ${ac_cv_prog_CPP+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
# Double quotes because CPP needs to be expanded
|
||||
for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
|
||||
do
|
||||
ac_preproc_ok=false
|
||||
for ac_c_preproc_warn_flag in '' yes
|
||||
do
|
||||
# Use a header file that comes with gcc, so configuring glibc
|
||||
# with a fresh cross-compiler works.
|
||||
# Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
||||
# <limits.h> exists even on freestanding compilers.
|
||||
# On the NeXT, cc -E runs the code through the compiler's parser,
|
||||
# not just through cpp. "Syntax error" is here to catch this case.
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
#ifdef __STDC__
|
||||
# include <limits.h>
|
||||
#else
|
||||
# include <assert.h>
|
||||
#endif
|
||||
Syntax error
|
||||
_ACEOF
|
||||
if ac_fn_c_try_cpp "$LINENO"; then :
|
||||
|
||||
else
|
||||
# Broken: fails on valid input.
|
||||
continue
|
||||
fi
|
||||
rm -f conftest.err conftest.i conftest.$ac_ext
|
||||
|
||||
# OK, works on sane cases. Now check whether nonexistent headers
|
||||
# can be detected and how.
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
#include <ac_nonexistent.h>
|
||||
_ACEOF
|
||||
if ac_fn_c_try_cpp "$LINENO"; then :
|
||||
# Broken: success on invalid input.
|
||||
continue
|
||||
else
|
||||
# Passes both tests.
|
||||
ac_preproc_ok=:
|
||||
break
|
||||
fi
|
||||
rm -f conftest.err conftest.i conftest.$ac_ext
|
||||
|
||||
done
|
||||
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
|
||||
rm -f conftest.i conftest.err conftest.$ac_ext
|
||||
if $ac_preproc_ok; then :
|
||||
break
|
||||
fi
|
||||
|
||||
done
|
||||
ac_cv_prog_CPP=$CPP
|
||||
|
||||
fi
|
||||
CPP=$ac_cv_prog_CPP
|
||||
else
|
||||
ac_cv_prog_CPP=$CPP
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
|
||||
$as_echo "$CPP" >&6; }
|
||||
ac_preproc_ok=false
|
||||
for ac_c_preproc_warn_flag in '' yes
|
||||
do
|
||||
# Use a header file that comes with gcc, so configuring glibc
|
||||
# with a fresh cross-compiler works.
|
||||
# Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
||||
# <limits.h> exists even on freestanding compilers.
|
||||
# On the NeXT, cc -E runs the code through the compiler's parser,
|
||||
# not just through cpp. "Syntax error" is here to catch this case.
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
#ifdef __STDC__
|
||||
# include <limits.h>
|
||||
#else
|
||||
# include <assert.h>
|
||||
#endif
|
||||
Syntax error
|
||||
_ACEOF
|
||||
if ac_fn_c_try_cpp "$LINENO"; then :
|
||||
|
||||
else
|
||||
# Broken: fails on valid input.
|
||||
continue
|
||||
fi
|
||||
rm -f conftest.err conftest.i conftest.$ac_ext
|
||||
|
||||
# OK, works on sane cases. Now check whether nonexistent headers
|
||||
# can be detected and how.
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
#include <ac_nonexistent.h>
|
||||
_ACEOF
|
||||
if ac_fn_c_try_cpp "$LINENO"; then :
|
||||
# Broken: success on invalid input.
|
||||
continue
|
||||
else
|
||||
# Passes both tests.
|
||||
ac_preproc_ok=:
|
||||
break
|
||||
fi
|
||||
rm -f conftest.err conftest.i conftest.$ac_ext
|
||||
|
||||
done
|
||||
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
|
||||
rm -f conftest.i conftest.err conftest.$ac_ext
|
||||
if $ac_preproc_ok; then :
|
||||
|
||||
else
|
||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||||
as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
|
||||
See \`config.log' for more details" "$LINENO" 5; }
|
||||
fi
|
||||
|
||||
ac_ext=c
|
||||
ac_cpp='$CPP $CPPFLAGS'
|
||||
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
|
||||
|
||||
|
||||
AR=${AR-ar}
|
||||
|
||||
@ -10,6 +10,7 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
|
||||
AC_CANONICAL_SYSTEM
|
||||
AC_ARG_PROGRAM
|
||||
AC_PROG_CC
|
||||
AC_PROG_CPP
|
||||
AC_SUBST(CFLAGS)
|
||||
AC_SUBST(HDEFINES)
|
||||
AR=${AR-ar}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user