Commit 04bf62d4 authored by Axel Simon's avatar Axel Simon

merge

parents e46b90d2 0359a527
......@@ -364,14 +364,21 @@ endif
if X86_RREIL
if INSTALL_AUXLIBS
lib_LTLIBRARIES += libx86-tester.la libgdwrap.la
if HAVE_POSIX200809_C11
lib_LTLIBRARIES += libx86-tester.la
endif
lib_LTLIBRARIES += libgdwrap.la
else
if BUILD_AUXLIBS
noinst_LTLIBRARIES += libx86-tester.la libgdwrap.la
if HAVE_POSIX200809_C11
noinst_LTLIBRARIES += libx86-tester.la
endif
noinst_LTLIBRARIES += libgdwrap.la
endif
endif
endif
if HAVE_POSIX200809_C11
if HAVE_RREIL
if INSTALL_AUXLIBS
lib_LTLIBRARIES += librreil.la
......@@ -387,6 +394,7 @@ noinst_LTLIBRARIES += libgdsl-multiplex.la
endif
endif
endif
endif
libreadhex_la_SOURCES = libs/readhex/src/readhex.c
libreadhex_la_CFLAGS = -I./libs/readhex/include
......@@ -493,16 +501,20 @@ endif
if HAVE_RREIL
if INSTALL_AUXBINS
if HAVE_POSIX200809_C11
bin_PROGRAMS += semantics-cli-dynamic
endif
bin_PROGRAMS += decoder-cli
bin_PROGRAMS += semantics-cli
bin_PROGRAMS += semantics-cli-dynamic
bin_PROGRAMS += semantics-cif-cli
bin_PROGRAMS += sweep
else
if BUILD_AUXBINS
if HAVE_POSIX200809_C11
noinst_PROGRAMS += semantics-cli-dynamic
endif
noinst_PROGRAMS += decoder-cli
noinst_PROGRAMS += semantics-cli
noinst_PROGRAMS += semantics-cli-dynamic
noinst_PROGRAMS += semantics-cif-cli
noinst_PROGRAMS += sweep
endif
......@@ -511,15 +523,19 @@ endif
if X86_RREIL
if INSTALL_AUXBINS
bin_PROGRAMS += liveness_sweep
if HAVE_POSIX200809_C11
bin_PROGRAMS += x86_test_runner
bin_PROGRAMS += x86_test_stats_runner
endif
bin_PROGRAMS += liveness_sweep
else
if BUILD_AUXBINS
noinst_PROGRAMS += liveness_sweep
if HAVE_POSIX200809_C11
noinst_PROGRAMS += x86_test_runner
noinst_PROGRAMS += x86_test_stats_runner
endif
noinst_PROGRAMS += liveness_sweep
endif
endif
endif
......
......@@ -22,7 +22,7 @@ GDSL_RREIL_HL=specifications/rreil/rreil.ml specifications/rreil/rreil-examples.
GDSL_OPT_HL=specifications/rreil/rreil-liveness.ml specifications/rreil/rreil-cleanup.ml
GDSL_X86_HL=specifications/x86/x86.ml specifications/x86/x86-pretty.ml specifications/x86/x86-pretty-simple.ml
GDSL_X86_TRANS_HL=specifications/x86/x86-rreil-translator.ml specifications/x86/x86-rreil-translator-a-l.ml specifications/x86/x86-rreil-translator-m-z.ml specifications/x86/x86-rreil-registermapping.ml
GDSL_X86_TRANS_HL=specifications/x86/x86-rreil-translator.ml specifications/x86/x86-rreil-translator-a-l.ml specifications/x86/x86-rreil-translator-m-z.ml specifications/x86/x86-rreil-registermapping.ml specifications/x86/x86-rreil-pretty.ml
GDSL_X86_OPT_HL=specifications/x86/x86-liveness.ml
GDSL_SOURCES=$(GDSL_BASIS_HL) $(GDSL_RREIL_HL) $(GDSL_X86_HL) $(GDSL_X86_TRANS_HL) $(GDSL_OPT_HL) $(GDSL_X86_OPT_HL)
......
......@@ -72,17 +72,34 @@ case $with_frontend in
*-rreil) has_rreil=yes;;
*) has_rreil=no;;
esac
case $with-frontend in
case $with_frontend in
x86*) has_x86=yes;;
*) has_x86=no;;
esac
has_anon_members=yes
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[[;]],
[[struct inge { union { int a; int b }; }; struct inge i; i.a = 42;]])],
has_anon_members=no)
has_open_memstream=yes
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[[#include <stdio.h>]],
[[char *c, size_t s, FILE *f = open_memstream(&c, &s);]])],
has_open_memstream=no)
AM_CONDITIONAL([X86_RREIL],[test x$with_frontend = xx86-rreil])
AM_CONDITIONAL([X86],[test x$with_frontend = xx86])
AM_CONDITIONAL([AVR_RREIL],[test x$with_frontend = xavr-rreil])
AM_CONDITIONAL([AVR],[test x$with_frontend = xavr])
AM_CONDITIONAL([HAVE_RREIL],[test x$has_rreil = xyes])
AM_CONDITIONAL([HAVE_X86], [test x$has_x86 = xyes])
#AM_CONDITIONAL([HAVE_GNU_C11], [echo "int main(void) { return 0; }" | gcc -std=gnu11 -xc - -o /dev/null])
#AM_CONDITIONAL([HAVE_POSIX200809], [test `getconf _POSIX_VERSION` -ge 200809 >/dev/null 2>&1])
AM_CONDITIONAL([HAVE_ANON_MEMBERS], [test x$has_anon_members = xyes])
AM_CONDITIONAL([HAVE_OPEN_MEMSTREAM], [test x$has_open_memstream = xyes])
AM_CONDITIONAL([HAVE_POSIX200809_C11], [test x$has_anon_members = xyes && test x$has_open_memstream = xyes])
dnl check if the helper executables should be build and/or installed
AC_ARG_ENABLE([install-auxbins],
......
......@@ -243,9 +243,9 @@ void print_results(struct context *context) {
static char *symbol_sz(size_t value) {
if(value < 10 * 1000)
return "k";
return "";
if(value < 10 * 1000 * 1000)
return "k";
return "";
return "M";
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment