[ISSUE-14]: make distcheck runs on pure gcc (on i386 arch)

SzigetiJ · SzigetiJ · commit 8d2f55eac69a · 2025-01-08T14:41:35.000+01:00
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
@@ -14,10 +14,10 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: configure
-      run: aclocal && autoconf && automake --add-missing && ./configure
+      run: aclocal && autoconf && automake --add-missing && ./configure --host='' 'CFLAGS=-Wall' 'LDFLAGS=' --without-binaries
     - name: make
       run: make
     - name: make check
       run: make check
     - name: make distcheck
-      run: make distcheck
+      run: DISTCHECK_CONFIGURE_FLAGS="--host= CFLAGS='' LDFLAGS='' --without-binaries" make distcheck
diff --git a/aclocal.m4 b/aclocal.m4
@@ -108,6 +108,43 @@ AC_DEFUN([AM_AUX_DIR_EXPAND],
 am_aux_dir=`cd "$ac_aux_dir" && pwd`
 ])
 
+# AM_COND_IF                                            -*- Autoconf -*-
+
+# Copyright (C) 2008-2018 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_COND_IF
+# _AM_COND_ELSE
+# _AM_COND_ENDIF
+# --------------
+# These macros are only used for tracing.
+m4_define([_AM_COND_IF])
+m4_define([_AM_COND_ELSE])
+m4_define([_AM_COND_ENDIF])
+
+# AM_COND_IF(COND, [IF-TRUE], [IF-FALSE])
+# ---------------------------------------
+# If the shell condition COND is true, execute IF-TRUE, otherwise execute
+# IF-FALSE.  Allow automake to learn about conditional instantiating macros
+# (the AC_CONFIG_FOOS).
+AC_DEFUN([AM_COND_IF],
+[m4_ifndef([_AM_COND_VALUE_$1],
+	   [m4_fatal([$0: no such condition "$1"])])dnl
+_AM_COND_IF([$1])dnl
+if test -z "$$1_TRUE"; then :
+  m4_n([$2])[]dnl
+m4_ifval([$3],
+[_AM_COND_ELSE([$1])dnl
+else
+  $3
+])dnl
+_AM_COND_ENDIF([$1])dnl
+fi[]dnl
+])
+
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
 # Copyright (C) 1997-2018 Free Software Foundation, Inc.
diff --git a/configure.ac b/configure.ac
@@ -1,13 +1,17 @@
 AC_PREREQ([2.69])
 AC_INIT([esp32basic],[1.0.0])
 AM_INIT_AUTOMAKE
-: ${CFLAGS="-g -Os -Wall"}
+: ${CFLAGS="-g -Os -Wall -nostdlib -mlongcalls" LDFLAGS="-specs=nano.specs"}
 AC_PROG_CC
 AC_PROG_CC_STDC
 AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])
 AC_PROG_AR
 AC_PROG_RANLIB
 
+AC_ARG_WITH([binaries], AS_HELP_STRING([--without-binaries], [Do not generate .bin images (esptool.py required).]))
+AM_CONDITIONAL([WITH_BINARIES], [test x$with_binaries != xno])
+AM_COND_IF([WITH_BINARIES],[ AC_MSG_NOTICE([generate .bin images]) ])
+
 AC_CONFIG_SUBDIRS([src])
 AC_CONFIG_SUBDIRS([modules])
 AC_CONFIG_SUBDIRS([examples])
diff --git a/examples/0blink/Makefile.am b/examples/0blink/Makefile.am
@@ -3,14 +3,16 @@ include $(top_srcdir)/ld/flags.mk
 
 noinst_HEADERS = defines.h
 
-AM_CFLAGS  = -nostdlib -mlongcalls -std=c11 -flto
+AM_CFLAGS  = -std=c11 -flto
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(srcdir)
 LDADD = $(top_builddir)/src/libesp32basic.a
 
 bin_PROGRAMS = \
  ledblink.elf
 
+if WITH_BINARIES
 CLEANFILES = \
  ledblink.bin
+endif
 
 BUILT_SOURCES = $(CLEANFILES)
diff --git a/examples/0hello/Makefile.am b/examples/0hello/Makefile.am
@@ -3,14 +3,16 @@ include $(top_srcdir)/ld/flags.mk
 
 noinst_HEADERS = defines.h
 
-AM_CFLAGS  = -nostdlib -mlongcalls -std=c11 -flto
+AM_CFLAGS  = -std=c11 -flto
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(srcdir)
 LDADD = $(top_builddir)/src/libesp32basic.a
 
 bin_PROGRAMS = \
  hello.elf
 
+if WITH_BINARIES
 CLEANFILES = \
  hello.bin
+endif
 
 BUILT_SOURCES = $(CLEANFILES)
diff --git a/examples/0ledctrl/Makefile.am b/examples/0ledctrl/Makefile.am
@@ -3,14 +3,16 @@ include $(top_srcdir)/ld/flags.mk
 
 noinst_HEADERS = defines.h
 
-AM_CFLAGS  = -nostdlib -mlongcalls -std=c11 -flto
+AM_CFLAGS  = -std=c11 -flto
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(srcdir)
 LDADD = $(top_builddir)/src/libesp32basic.a
 
 bin_PROGRAMS = \
  ledctrl.elf
 
+if WITH_BINARIES
 CLEANFILES = \
  ledctrl.bin
+endif
 
 BUILT_SOURCES = $(CLEANFILES)
diff --git a/examples/1rmtblink/Makefile.am b/examples/1rmtblink/Makefile.am
@@ -4,14 +4,16 @@ AM_LDFLAGS += -T $(top_srcdir)/ld/esp32.rom.ld
 
 noinst_HEADERS = defines.h
 
-AM_CFLAGS  = -nostdlib -mlongcalls -std=c11 -flto
+AM_CFLAGS  = -std=c11 -flto
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(srcdir)
 LDADD = $(top_builddir)/src/libesp32basic.a
 
 bin_PROGRAMS = \
  rmtblink.elf
 
+if WITH_BINARIES
 CLEANFILES = \
  rmtblink.bin
+endif
 
 BUILT_SOURCES = $(CLEANFILES)
diff --git a/examples/1rmtmorse/Makefile.am b/examples/1rmtmorse/Makefile.am
@@ -4,7 +4,7 @@ AM_LDFLAGS += -T $(top_srcdir)/ld/esp32.rom.ld
 
 noinst_HEADERS = defines.h mphgen.h
 
-AM_CFLAGS  = -nostdlib -mlongcalls -std=c11 -flto
+AM_CFLAGS  = -std=c11 -flto
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(srcdir)
 LDADD = $(top_builddir)/src/libesp32basic.a
 
@@ -13,7 +13,9 @@ bin_PROGRAMS = \
 
 rmtmorse_elf_SOURCES = mphgen.c rmtmorse.c
 
+if WITH_BINARIES
 CLEANFILES = \
  rmtmorse.bin
+endif
 
 BUILT_SOURCES = $(CLEANFILES)
diff --git a/examples/1rmtmusic/Makefile.am b/examples/1rmtmusic/Makefile.am
@@ -5,7 +5,7 @@ AM_LDFLAGS += -T $(top_srcdir)/ld/esp32.rom.ld \
 
 noinst_HEADERS = defines.h music.h
 
-AM_CFLAGS  = -nostdlib -mlongcalls -std=c11 -flto
+AM_CFLAGS  = -std=c11 -flto
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(srcdir)
 LDADD = $(top_builddir)/src/libesp32basic.a
 
@@ -14,7 +14,9 @@ bin_PROGRAMS = \
 
 rmtmusic_elf_SOURCES = music.c rmtmusic.c
 
+if WITH_BINARIES
 CLEANFILES = \
  rmtmusic.bin
+endif
 
 BUILT_SOURCES = $(CLEANFILES)
diff --git a/examples/1rmtws2812/Makefile.am b/examples/1rmtws2812/Makefile.am
@@ -3,7 +3,8 @@ include $(top_srcdir)/ld/flags.mk
 
 noinst_HEADERS = defines.h
 
-AM_CFLAGS  = -nostdlib -mlongcalls -std=c11 -flto
+AM_CFLAGS  = -std=c11 -flto
+if WITH_BINARIES
 AM_LDFLAGS += \
  -T $(top_srcdir)/ld/esp32.rom.ld \
  -T $(top_srcdir)/ld/esp32.rom.libgcc.ld \
@@ -13,6 +14,13 @@ AM_LDFLAGS += \
  -T $(top_srcdir)/ld/esp32.rom.newlib-time.ld \
  -T $(top_srcdir)/ld/esp32.rom.redefined.ld \
  -T $(top_srcdir)/ld/esp32.rom.syscalls.ld
+else
+AM_LDFLAGS += \
+ -T $(top_srcdir)/ld/esp32.rom.ld \
+ -T $(top_srcdir)/ld/esp32.rom.libgcc.ld \
+ -T $(top_srcdir)/ld/esp32.rom.redefined.ld \
+ -T $(top_srcdir)/ld/esp32.rom.syscalls.ld
+endif
 
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(srcdir)
 LDADD = $(top_builddir)/src/libesp32basic.a
@@ -22,7 +30,9 @@ bin_PROGRAMS = \
 
 rmtws2812_elf_SOURCES = rmtws2812.c
 
+if WITH_BINARIES
 CLEANFILES = \
  rmtws2812.bin
+endif
 
 BUILT_SOURCES = $(CLEANFILES)
diff --git a/examples/3prog1/Makefile.am b/examples/3prog1/Makefile.am
@@ -6,14 +6,16 @@ AM_LDFLAGS += -T $(top_srcdir)/ld/esp32.rom.ld \
 
 noinst_HEADERS = defines.h
 
-AM_CFLAGS  = -nostdlib -mlongcalls -std=c11 -flto
+AM_CFLAGS  = -std=c11 -flto
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/modules
 LDADD = $(top_builddir)/src/libesp32basic.a $(top_builddir)/modules/libesp32modules.a
 
 bin_PROGRAMS = \
  prog.elf
 
+if WITH_BINARIES
 CLEANFILES = \
  prog.bin
+endif
 
 BUILT_SOURCES = $(CLEANFILES)
diff --git a/ld/esp32peripheral.ld b/ld/esp32peripheral.ld
@@ -15,3 +15,5 @@ PROVIDE ( gsUART2 = 0x602E0000);
 PROVIDE ( gsUART0Mapped = 0x3ff40000);
 PROVIDE ( gsUART1Mapped = 0x3ff50000);
 PROVIDE ( gsUART2Mapped = 0x3ff6e000);
+
+PROVIDE ( _impure_ptr = 0x3ffae0b0);
diff --git a/ld/flags.mk b/ld/flags.mk
@@ -1,4 +1,4 @@
-AM_LDFLAGS = -Wl,--gc-sections -specs=nano.specs \
+AM_LDFLAGS = -Wl,--gc-sections \
  -T $(top_srcdir)/ld/esp32.ld \
  -T $(top_srcdir)/ld/esp32peripheral.ld \
  -T $(top_srcdir)/ld/esp32.rom.newlib-funcs.ld 
diff --git a/modules/Makefile.am b/modules/Makefile.am
@@ -1,5 +1,5 @@
 AM_CPPFLAGS = -I$(top_srcdir)/src
-AM_CFLAGS  = -nostdlib -mlongcalls -std=c11 -flto
+AM_CFLAGS  = -nostdlib -std=c11 -flto
 
 libesp32modules_a_AR=$(AR) rcs
 
diff --git a/scripts/elf2bin.mk b/scripts/elf2bin.mk
@@ -1,3 +1,6 @@
+if WITH_BINARIES
 
 .elf.bin:
 	esptool.py --chip=esp32 elf2image --flash_mode dio --flash_freq 40m --flash_size 4MB $<
+
+endif
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS  = -nostdlib -mlongcalls -std=c11 -flto
+AM_CFLAGS  = -nostdlib -std=c11 -flto
 
 libesp32basic_a_AR=$(AR) rcs
 
diff --git a/src/utils/uartutils.c b/src/utils/uartutils.c
@@ -7,16 +7,21 @@
 
 #include <stdarg.h>
 #include <stdio.h>
+#ifdef __XTENSA__
+#include <sys/reent.h>
+#else
+#define _impure_ptr NULL
+#define _vsnprintf_r(X,Y1,Y2,Y3,Y4) vsnprintf(Y1,Y2,Y3,Y4)
+#endif
+#include <stdlib.h>
 #include "uartutils.h"
 #include "typeaux.h"
 
-extern struct _reent *_global_impure_ptr __ATTRIBUTE_IMPURE_PTR__;
-
 int uart_printf(UART_Type *psUART, const char *pcFormat, ...) {
   char acBuf[100];
   va_list va;
   va_start(va, pcFormat);
-  int iLen = _vsnprintf_r(_global_impure_ptr, acBuf, ARRAY_SIZE(acBuf), pcFormat, va);
+  int iLen = _vsnprintf_r(_impure_ptr, acBuf, ARRAY_SIZE(acBuf), pcFormat, va);
   va_end(va);
   for (int i = 0; i < iLen; ++i) {
     psUART->FIFO = acBuf[i];
diff --git a/src/xtutils.h b/src/xtutils.h
@@ -16,7 +16,9 @@ extern "C" {
 #define XCHAL_HAVE_S32C1I 1
 #define SOC_CPU_CORES_NUM 2
 
-    /* Taken from https://github.com/espressif/esp-idf/blob/master/components/xtensa/include/xt_utils.h
+#ifdef __XTENSA__
+
+  /* Taken from https://github.com/espressif/esp-idf/blob/master/components/xtensa/include/xt_utils.h
    * which is released under SPDX-License-Identifier: Apache-2.0 */
   FORCE_INLINE_ATTR bool xt_utils_compare_and_set(volatile uint32_t *addr, uint32_t compare_value, uint32_t new_value) {
 #if XCHAL_HAVE_S32C1I
@@ -76,7 +78,15 @@ extern "C" {
 #endif // SOC_CPU_CORES_NUM > 1
   }
 
-
+#else
+  FORCE_INLINE_ATTR bool xt_utils_compare_and_set(volatile uint32_t *addr, uint32_t compare_value, uint32_t new_value) {
+    return true;
+  }
+  FORCE_INLINE_ATTR __attribute__ ((pure)) uint32_t xt_utils_get_core_id(void) {
+    return 0U;
+  }
+#endif // __XTENSA__
+  
 #ifdef __cplusplus
 }
 #endif
