diff options
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | configure.ac | 21 | ||||
| -rw-r--r-- | fuzzing/Makefile.am | 16 | ||||
| -rw-r--r-- | m4/m4_ax_compiler_vendor.m4 | 87 |
4 files changed, 2 insertions, 127 deletions
diff --git a/Makefile.am b/Makefile.am index 0356c87..c262e41 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,8 +1,5 @@ ACLOCAL_AMFLAGS = -I m4 -if AEC_FUZZING - FUZZDIR = fuzzing -endif -SUBDIRS = src tests $(FUZZDIR) +SUBDIRS = src tests EXTRA_DIST = doc/patent.txt CMakeLists.txt cmake/config.h.in \ cmake/macros.cmake README.md README.SZIP CHANGELOG.md Copyright.txt data diff --git a/configure.ac b/configure.ac index b1b8e08..0226e03 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,6 @@ AM_INIT_AUTOMAKE([foreign]) AM_MAINTAINER_MODE([enable]) AC_PROG_CC_C99 -AC_PROG_CXX AC_HEADER_STDC @@ -31,23 +30,5 @@ AC_CHECK_DECLS(__builtin_clzll) AM_EXTRA_RECURSIVE_TARGETS([bench benc bdec]) -AC_ARG_ENABLE([fuzzing], - AS_HELP_STRING([--enable-fuzzing], [Enable fuzzing of libaec])) - -AS_IF([test "x$enable_fuzzing" = "xyes"], [ - AX_COMPILER_VENDOR - AS_IF([test "x$ax_cv_c_compiler_vendor" = "xclang"], [ - AC_LANG_PUSH([C++]) - AX_COMPILER_VENDOR - AC_LANG_POP([C++]) - AS_IF([test "x$ax_cv_cxx_compiler_vendor" = "xclang"], [], [ - AC_MSG_ERROR([You need to build with Clang as CXX for fuzzing to work]) - ]) - ], [ - AC_MSG_ERROR([You need to build with Clang as CC for fuzzing to work]) - ]) -]) -AM_CONDITIONAL([AEC_FUZZING], [test x$enable_fuzzing = xyes]) - -AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile fuzzing/Makefile]) +AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile]) AC_OUTPUT diff --git a/fuzzing/Makefile.am b/fuzzing/Makefile.am deleted file mode 100644 index 700de3b..0000000 --- a/fuzzing/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -FUZZING_FLAGS = -g -fsanitize=address \ --fsanitize-coverage=trace-pc-guard,indirect-calls,edge -noinst_LIBRARIES = libaec_fuzz.a -libaec_fuzz_a_SOURCES = $(top_srcdir)/src/encode.c \ -$(top_srcdir)/src/encode_accessors.c \ -$(top_srcdir)/src/decode.c \ -$(top_srcdir)/src/encode.h \ -$(top_srcdir)/src/encode_accessors.h \ -$(top_srcdir)/src/decode.h -libaec_fuzz_a_CFLAGS = $(FUZZING_FLAGS) -aec_fuzz_SOURCES = fuzz_target.cc -aec_fuzz_CXXFLAGS = $(FUZZING_FLAGS) -aec_fuzz_LDFLAGS = -fsanitize=address -lFuzzer -aec_fuzz_LDADD = libaec_fuzz.a -noinst_PROGRAMS = aec_fuzz -EXTRA_DIST = CMakeLists.txt diff --git a/m4/m4_ax_compiler_vendor.m4 b/m4/m4_ax_compiler_vendor.m4 deleted file mode 100644 index 4ca8089..0000000 --- a/m4/m4_ax_compiler_vendor.m4 +++ /dev/null @@ -1,87 +0,0 @@ -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_compiler_vendor.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_COMPILER_VENDOR -# -# DESCRIPTION -# -# Determine the vendor of the C/C++ compiler, e.g., gnu, intel, ibm, sun, -# hp, borland, comeau, dec, cray, kai, lcc, metrowerks, sgi, microsoft, -# watcom, etc. The vendor is returned in the cache variable -# $ax_cv_c_compiler_vendor for C and $ax_cv_cxx_compiler_vendor for C++. -# -# LICENSE -# -# Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu> -# Copyright (c) 2008 Matteo Frigo -# -# 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 <https://www.gnu.org/licenses/>. -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -#serial 16 - -AC_DEFUN([AX_COMPILER_VENDOR], -[AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor, - dnl Please add if possible support to ax_compiler_version.m4 - [# note: don't check for gcc first since some other compilers define __GNUC__ - vendors="intel: __ICC,__ECC,__INTEL_COMPILER - ibm: __xlc__,__xlC__,__IBMC__,__IBMCPP__ - pathscale: __PATHCC__,__PATHSCALE__ - clang: __clang__ - cray: _CRAYC - fujitsu: __FUJITSU - gnu: __GNUC__ - sun: __SUNPRO_C,__SUNPRO_CC - hp: __HP_cc,__HP_aCC - dec: __DECC,__DECCXX,__DECC_VER,__DECCXX_VER - borland: __BORLANDC__,__CODEGEARC__,__TURBOC__ - comeau: __COMO__ - kai: __KCC - lcc: __LCC__ - sgi: __sgi,sgi - microsoft: _MSC_VER - metrowerks: __MWERKS__ - watcom: __WATCOMC__ - portland: __PGI - tcc: __TINYC__ - unknown: UNKNOWN" - for ventest in $vendors; do - case $ventest in - *:) vendor=$ventest; continue ;; - *) vencpp="defined("`echo $ventest | sed 's/,/) || defined(/g'`")" ;; - esac - AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[ - #if !($vencpp) - thisisanerror; - #endif - ])], [break]) - done - ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=`echo $vendor | cut -d: -f1` - ]) -]) |