Commit bf81fe3c authored by Jonathan McDowell's avatar Jonathan McDowell

New upstream version 3.7.0+dfsg

parent 7b305292

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -14,6 +14,7 @@ SHELL = /bin/sh
CC = @CCACHE@ @CC@
CPP = @CCACHE@ @CPP@
CXX = @CCACHE@ @CXX@
AR = @AR@
RANLIB = @RANLIB@
INSTALL = @INSTALL@
YACC = @YACC@
......
......@@ -26,12 +26,7 @@ SDCC_SDBINUTILS = support/sdbinutils
TARGETS = sdcc-librarian
ifeq ($(OPT_DISABLE_HC08), 0)
SDCC_AS += sdas/as6808
SDCC_LD += sdcc-ld6808
endif
ifeq ($(OPT_DISABLE_S08), 0)
ifneq ($(OPT_DISABLE_HC08)$(OPT_DISABLE_S08), 11)
SDCC_AS += sdas/as6808
SDCC_LD += sdcc-ld6808
endif
......@@ -41,11 +36,7 @@ SDCC_AS += sdas/asstm8
SDCC_LD += sdcc-ldstm8
endif
ifeq ($(OPT_DISABLE_DS390), 0)
SDCC_AS += sdas/as8xcxxx
endif
ifeq ($(OPT_DISABLE_DS400), 0)
ifneq ($(OPT_DISABLE_DS390)$(OPT_DISABLE_DS400), 11)
SDCC_AS += sdas/as8xcxxx
endif
......@@ -55,22 +46,12 @@ SDCC_LD += sdcc-ld8051
SDCC_MISC += debugger/mcs51
endif
ifeq ($(OPT_DISABLE_Z80), 0)
ifneq ($(OPT_DISABLE_Z80)$(OPT_DISABLE_Z180), 11)
SDCC_AS += sdas/asz80
SDCC_LD += sdcc-ldz80
endif
ifeq ($(OPT_DISABLE_Z180), 0)
SDCC_AS += sdas/asz80
SDCC_LD += sdcc-ldz80
endif
ifeq ($(OPT_DISABLE_R2K), 0)
SDCC_AS += sdas/asrab
SDCC_LD += sdcc-ldz80
endif
ifeq ($(OPT_DISABLE_R3KA), 0)
ifneq ($(OPT_DISABLE_R2K)$(OPT_DISABLE_R3KA), 11)
SDCC_AS += sdas/asrab
SDCC_LD += sdcc-ldz80
endif
......@@ -138,7 +119,7 @@ all: checkconf sdcc
tini: checkconf sdcc-tini
sdcc-libs:
sdcc-libs: sdcc-sdbinutils
for lib in $(SDCC_LIBS); do $(MAKE) -C $$lib; done
sdcc-cc: sdcc-libs
......
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<IncludePath>C:\Local\boost_1_64_0;$(IncludePath)</IncludePath>
<ExecutablePath>C:\Programs\GnuWin32\bin;$(ExecutablePath)</ExecutablePath>
</PropertyGroup>
<ItemDefinitionGroup />
<ItemGroup />
</Project>
\ No newline at end of file
This diff is collapsed.
......@@ -28,11 +28,11 @@
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
<Import Project="SDCC.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
<Import Project="SDCC.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
......
......@@ -28,11 +28,11 @@
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
<Import Project="SDCC.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
<Import Project="SDCC.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
......@@ -87,13 +87,33 @@
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">sdcc_vc.h</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">sdcc_vc.h</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating: %(Outputs)</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating: %Outputs)</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating: %(Outputs)</Message>
</CustomBuild>
</ItemGroup>
<ItemGroup>
<None Include="configure_vc.awk" />
<None Include=".version">
</None>
<CustomBuild Include="src\SDCC.lex">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating Lexer: SDCClex.c</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">src/SDCClex.c</Outputs>
<TreatOutputAsContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</TreatOutputAsContent>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating Lexer: SDCClex.c</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">src/SDCClex.c</Outputs>
<TreatOutputAsContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</TreatOutputAsContent>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">flex -8 -f -osrc/SDCClex.c src/SDCC.lex</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">flex -8 -f -osrc/SDCClex.c src/SDCC.lex</Command>
</CustomBuild>
<CustomBuild Include="src\SDCC.y">
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">bison -d -v -o src/SDCCy.c src/SDCC.y</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating Parser: SDCCy.c</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">src/SDCCy.c;src/SDCCy.h</Outputs>
<TreatOutputAsContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</TreatOutputAsContent>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">bison -d -v -o src/SDCCy.c src/SDCC.y</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating Parser: SDCCy.c</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">src/SDCCy.c;src/SDCCy.h</Outputs>
<TreatOutputAsContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</TreatOutputAsContent>
</CustomBuild>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
......
This diff is collapsed.
......@@ -55,6 +55,7 @@ AC_CHECK_PROG(STRIP, strip, strip, :)
AC_CHECK_PROG(AS, as, as, :)
AC_CHECK_PROG(CP, cp, cp, :)
AC_CHECK_PROG(AR, ar, ar, :)
AC_CHECK_PROG(M4, gm4, gm4, m4)
dnl Don't use AC_PROG_LEX
dnl LEXLIB is not useful in gcc.
......@@ -79,6 +80,8 @@ AC_LANG_C
AC_CHECK_HEADERS(endian.h sys/endian.h machine/endian.h sys/isa_defs.h stdalign.h)
AC_LANG_PUSH([C++])
AC_CHECK_HEADERS(stx/btree_set.h stx/btree_map.h,,AC_MSG_WARN([[STX library missing, using STL instead.]]))
AC_CHECK_HEADERS(treedec/combinations.hpp,,AC_MSG_WARN([[treedec library missing, falling back to Thorup.]]))
AC_CHECK_HEADERS(gala/graph.h)
AC_CHECK_HEADERS(boost/graph/adjacency_list.hpp,,AC_MSG_ERROR([[boost library not found (boost/graph/adjacency_list.hpp).]]))
AC_LANG_POP([C++])
......@@ -94,9 +97,7 @@ esac
# Checking for functions
# ===========================================================================
AC_CHECK_FUNCS(strerror)
AC_CHECK_FUNCS(vsnprintf snprintf vsprintf mkstemp)
AC_CHECK_FUNCS(strndup)
AC_CHECK_FUNCS(strerror mkstemp strndup setrlimit)
# Macro definitions
......@@ -368,6 +369,7 @@ dnl replace \\ by \
$2=`echo "[$]$2" | sed 's,\\\\\\\\,\\\\,g'`
])
AX_CXX_COMPILE_STDCXX_11
# Checking characteristics of compilers and other programs
# ===========================================================================
......@@ -403,7 +405,8 @@ if test "$ac_cv_c_compiler_gnu" = "yes"; then
WALL_FLAG="-Wall -Wno-parentheses"
C99_FLAG="--std=c99"
MAKEDEP="$CC $sdcc_cv_MM"
# We use CXX instead of CC here, since some of the C++ source files require a C++ compiler even during dependency generation.
MAKEDEP="$CXX $sdcc_cv_MM"
else
sdcc_IS_SUNPRO
if test "$sdcc_cv_c_compiler_sunpro" = "yes"; then
......@@ -419,6 +422,13 @@ AC_SUBST(MAKEDEP)
AC_SUBST(WALL_FLAG)
AC_SUBST(C99_FLAG)
# Try to append a c99 flag
# -------------------------------------------------------------------------
AC_PROG_CC_C99
if test "$ac_cv_prog_cc_c99" != "no"; then
CFLAGS="$ac_cv_prog_cc_c99 ${CFLAGS}"
fi
# SDCC_C_UNNAMED_STRUCT_TAG ()
# chech whether C compiler supports tag in unnamed struct
# -------------------------------------------------------------------------
......@@ -527,6 +537,11 @@ AC_DEFINE_UNQUOTED(TYPE_UWORD, unsigned $TYPE_WORD, [XXX])
AC_DEFINE_UNQUOTED(TYPE_UDWORD, unsigned $TYPE_DWORD, [XXX])
AC_DEFINE_UNQUOTED(TYPE_UQWORD, unsigned $TYPE_QWORD, [XXX])
case "${host}" in
*x86_64*cygwin*)
LDFLAGS="$LDFLAGS -Wl,--stack,4194304"
esac
# Checking whether byte ordering is bigendian
# ===========================================================================
AC_C_BIGENDIAN
......@@ -563,9 +578,19 @@ fi
# include_dir_suffix:
# *nix default: "sdcc/include"
AC_ARG_VAR([inclib_dir_suffix], [appended to datadir to define SDCC's include/lib directory])
if test "${inclib_dir_suffix}" = ""; then
inclib_dir_suffix="sdcc"
fi
AC_ARG_VAR([include_dir_suffix], [appended to datadir to define SDCC's include directory])
if test "${include_dir_suffix}" = ""; then
include_dir_suffix="sdcc/include"
include_dir_suffix="${inclib_dir_suffix}/include"
fi
AC_ARG_VAR([non_free_inclib_dir_suffix], [appended to datadir to define SDCC's non-free include/lib directory])
if test "${non_free_inclib_dir_suffix}" = ""; then
non_free_inclib_dir_suffix="sdcc/non-free"
fi
# non_free_include_dir_suffix:
......@@ -573,21 +598,21 @@ fi
AC_ARG_VAR([non_free_include_dir_suffix], [appended to datadir to define SDCC's non-free include directory])
if test "${non_free_include_dir_suffix}" = ""; then
non_free_include_dir_suffix="sdcc/non-free/include"
non_free_include_dir_suffix="${non_free_inclib_dir_suffix}/include"
fi
# lib_dir_suffix:
# *nix default: "sdcc/lib"
AC_ARG_VAR([lib_dir_suffix], [appended to datadir to define SDCC's library root directory])
if test "${lib_dir_suffix}" = ""; then
lib_dir_suffix="sdcc/lib"
lib_dir_suffix="${inclib_dir_suffix}/lib"
fi
# non_free_lib_dir_suffix:
# *nix default: "sdcc/non-free/lib"
AC_ARG_VAR([non_free_lib_dir_suffix], [appended to datadir to define SDCC's non-free library root directory])
if test "${non_free_lib_dir_suffix}" = ""; then
non_free_lib_dir_suffix="sdcc/non-free/lib"
non_free_lib_dir_suffix="${non_free_inclib_dir_suffix}/lib"
fi
# docdir:
......@@ -672,7 +697,6 @@ AC_DEFINE_UNQUOTED(STD_LONG_LIB, "liblong", [XXX])
AC_DEFINE_UNQUOTED(STD_FP_LIB, "libfloat", [XXX])
AC_DEFINE_UNQUOTED(STD_DS390_LIB, "libds390", [XXX])
AC_DEFINE_UNQUOTED(STD_DS400_LIB, "libds400", [XXX])
####AC_DEFINE_UNQUOTED(STD_XA51_LIB, "libxa51", [XXX])
# SDCC runtime environment variables
sdcc_dir_name="SDCC_HOME"
......@@ -806,11 +830,6 @@ OPT_DISABLE_AVR=1
AC_DEFINE_UNQUOTED(OPT_DISABLE_AVR, ${OPT_DISABLE_AVR}, [Define to 1 to disable the AVR port])
AC_SUBST(OPT_DISABLE_AVR)
####AC_DO_PORT_ENABLER(xa51, xa51, XA51, [Includes the XA51 port (disabled by default)])
OPT_DISABLE_XA51=1
AC_DEFINE_UNQUOTED(OPT_DISABLE_XA51, ${OPT_DISABLE_XA51}, [Define to 1 to disable the XA51 port])
AC_SUBST(OPT_DISABLE_XA51)
AC_DO_DISABLER(ucsim, UCSIM, [Disables configuring and building of ucsim])
AC_DO_DISABLER(device-lib, DEVICE_LIB, [Disables building device libraries])
AC_DO_DISABLER(packihx, PACKIHX, [Disables building packihx])
......@@ -899,8 +918,6 @@ if test $OPT_DISABLE_PIC16 = 0 && test $OPT_DISABLE_NON_FREE = 0; then
test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_SUBDIRS(device/non-free/lib/pic16)
fi
####test $OPT_DISABLE_XA51 = 0 && AC_CONFIG_FILES([src/xa51/Makefile])
if test $OPT_DISABLE_Z80 = 0 || test $OPT_DISABLE_Z180 = 0 || test $OPT_DISABLE_R2K = 0 || test $OPT_DISABLE_R3KA = 0 || test $OPT_DISABLE_GBZ80 = 0 || test $OPT_DISABLE_TLCS90 = 0; then
AC_CONFIG_FILES([src/z80/Makefile])
fi
......@@ -992,6 +1009,7 @@ sdcc ${VERSION} is now configured for
CXXFLAGS: ${CXXFLAGS}
CPPFLAGS: ${CPPFLAGS}