Merge branch 'vlm_master' of https://github.com/mouse07410/asn1c into vlm_master

configure.ac

@@ -20,6 +20,13 @@ m4_ifdef([AM_PROG_AR],
 
 AC_PROG_CXX
 CXXFLAGS="-std=c++11"
+dnl - needed for tests, some fail when _FILE_OFFSET_BITS is not 
+dnl   explicitly set
+dnl - for example, the case of crossdev environment
+dnl   when runing 32bit binaries on a 64bit host;
+dnl   readdir() and other related functions used in some 
+dnl   test cases will return a null pointer and fail
+AC_SYS_LARGEFILE
 
 LT_INIT
 

libasn1compiler/asn1c_C.c

@@ -425,7 +425,7 @@ asn1c_lang_C_type_SEQUENCE_def(arg_t *arg, asn1c_ioc_table_and_objset_t *opt_ioc
 	asn1p_expr_t *expr = arg->expr;
 	asn1p_expr_t *v;
 	int elements;	/* Number of elements */
-	int first_extension = -1;
+	int first_extension = compute_extensions_start(expr);
 	tag2el_t *tag2el = NULL;
 	int tag2el_count = 0;
 	int tags_count;

tests/tests-asn1c-compiler/32-sequence-of-OK.asn1.-P

@@ -161,7 +161,7 @@ asn_SEQUENCE_specifics_t asn_SPC_Error_specs_1 = {
 	0,	/* No top level tags */
 	0,	/* No tags in the map */
 	0, 0, 0,	/* Optional elements (not needed) */
-	-1,	/* First extension addition */
+	0,	/* First extension addition */
 };
 asn_TYPE_descriptor_t asn_DEF_Error = {
 	"Error",

tests/tests-c-compiler/Makefile.am

@@ -11,8 +11,8 @@ CFLAGS = $(filter-out $(CODE_COVERAGE_CFLAGS), @CFLAGS@)
 TESTS_ENVIRONMENT= \
 				   CC="${CC}" \
 				   CXX="${CXX}" \
-				   CFLAGS="${TESTSUITE_CFLAGS} ${CFLAGS}" \
-				   CXXFLAGS="${CXXFLAGS}" \
+				   CFLAGS="${TESTSUITE_CFLAGS} ${CFLAGS} ${DEFS}" \
+				   CXXFLAGS="${CXXFLAGS} ${DEFS}" \
 				   LDFLAGS="${LDFLAGS}" \
 				   LIBFUZZER_CFLAGS="${LIBFUZZER_CFLAGS}" \
 				   ASAN_ENV_FLAGS="@ASAN_ENV_FLAGS@"       \

tests/tests-c-compiler/check-assembly.sh

@@ -70,8 +70,8 @@ AUTOGENERATED="# This file is autogenerated by $0 ${source_full} ${AFLAGS}"
 # Create a common Makefile for the project
 cat <<END_MAKEFILE > "${testdir}/Makefile"
 ${AUTOGENERATED}
-COMMON_FLAGS= -I.
-CFLAGS = \${COMMON_FLAGS} ${CFLAGS:-} -g -O1
+COMMON_FLAGS= -I. -I${abs_top_builddir}
+CFLAGS = \${COMMON_FLAGS} ${CFLAGS:-} ${DEFS} -g -O1
 CFLAGS += -DSRCDIR=../${srcdir}
 CXXFLAGS = \${CFLAGS} ${CXXFLAGS}
 LIBFUZZER_CFLAGS = ${LIBFUZZER_CFLAGS}

tests/tests-c-compiler/check-src/check-119.-fwide-types.-gen-PER.c

@@ -5,6 +5,7 @@
  * and finally compared to the original encoding.
  */
 #undef	NDEBUG
+#include <PDU.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
@@ -15,8 +16,6 @@
 #include <ctype.h>
 #include <errno.h>
 
-#include <PDU.h>
-
 #ifndef SRCDIR
 #define SRCDIR_S ".."
 #else

tests/tests-c-compiler/check-src/check-119.-gen-PER.c

@@ -5,6 +5,7 @@
  * and finally compared to the original encoding.
  */
 #undef	NDEBUG
+#include <PDU.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
@@ -15,8 +16,6 @@
 #include <ctype.h>
 #include <errno.h>
 
-#include <PDU.h>
-
 #ifndef SRCDIR
 #define SRCDIR_S ".."
 #else

tests/tests-c-compiler/check-src/check-126.-gen-PER.c

@@ -4,6 +4,7 @@
  * compared with *.out file, then decoded and compared with the original.
  */
 #undef	NDEBUG
+#include <PDU.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
@@ -14,8 +15,6 @@
 #include <ctype.h>
 #include <errno.h>
 
-#include <PDU.h>
-
 #ifndef SRCDIR
 #define SRCDIR_S ".."
 #else

tests/tests-c-compiler/check-src/check-62.c

 #undef	NDEBUG
+#include <T.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
@@ -8,8 +9,6 @@
 #include <assert.h>
 #include <errno.h>
 
-#include <T.h>
-
 #ifndef SRCDIR
 #define SRCDIR_S ".."
 #else

tests/tests-c-compiler/check-src/check-70.-fwide-types.c

@@ -5,6 +5,7 @@
  * stream is checked against rules specified in ../data-70/README file.
  */
 #undef	NDEBUG
+#include <PDU.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
@@ -15,8 +16,6 @@
 #include <assert.h>
 #include <errno.h>
 
-#include <PDU.h>
-
 #ifndef SRCDIR
 #define SRCDIR_S ".."
 #else

tests/tests-c-compiler/check-src/check-70.c

@@ -5,6 +5,7 @@
  * stream is compared with the corresponding .out file.
  */
 #undef	NDEBUG
+#include <PDU.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
@@ -15,8 +16,6 @@
 #include <assert.h>
 #include <errno.h>
 
-#include <PDU.h>
-
 #ifndef SRCDIR
 #define SRCDIR_S ".."
 #else