diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rwxr-xr-x | configure | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/Makefile b/Makefile index 00aa7069..7250e1e6 100644 --- a/Makefile +++ b/Makefile @@ -90,6 +90,9 @@ $(OPTIMIZE_SRCS:%.c=%.o) $(OPTIMIZE_SRCS:%.c=%.lo): CFLAGS += -O3 MEMOPS_SRCS = src/string/memcpy.c src/string/memmove.c src/string/memcmp.c src/string/memset.c $(MEMOPS_SRCS:%.c=%.o) $(MEMOPS_SRCS:%.c=%.lo): CFLAGS += $(CFLAGS_MEMOPS) +%.o: $(ARCH)$(ASMSUBARCH)/%.s + $(CC) $(CFLAGS_ALL_STATIC) -c -o $@ $< + %.o: $(ARCH)/%.s $(CC) $(CFLAGS_ALL_STATIC) -c -o $@ $< diff --git a/configure b/configure index 48465f7c..7aae7d4d 100755 --- a/configure +++ b/configure @@ -393,6 +393,11 @@ test "$ARCH" = "microblaze" && trycppif __MICROBLAZEEL__ "$t" \ test "$SUBARCH" \ && printf "configured for %s variant: %s\n" "$ARCH" "$ARCH$SUBARCH" +case "$ARCH$SUBARCH" in +arm) ASMSUBARCH=el ;; +*) ASMSUBARCH=$SUBARCH ;; +esac + # # Some archs (powerpc) have different possible long double formats # that the compiler can be configured for. The logic for whether this @@ -424,6 +429,7 @@ cat << EOF # Any changes made here will be lost if configure is re-run ARCH = $ARCH SUBARCH = $SUBARCH +ASMSUBARCH = $ASMSUBARCH prefix = $prefix exec_prefix = $exec_prefix bindir = $bindir |