From 4218a6dc8b71192ab23dfebb334a9f123375cf3b Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 9 Jun 2021 18:04:57 -0400 Subject: [PATCH] sim: erc32/ppc: fix handling of $EXEEXT --- sim/erc32/ChangeLog | 4 ++++ sim/erc32/Makefile.in | 6 +++--- sim/ppc/ChangeLog | 4 ++++ sim/ppc/Makefile.in | 6 +++--- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/sim/erc32/ChangeLog b/sim/erc32/ChangeLog index a6cff9f1b59..db089091d0f 100644 --- a/sim/erc32/ChangeLog +++ b/sim/erc32/ChangeLog @@ -1,3 +1,7 @@ +2021-06-12 Mike Frysinger + + * Makefile.in: Add $(EXEEXT) to sis. + 2021-06-12 Mike Frysinger * aclocal.m4, config.in, configure: Regenerate. diff --git a/sim/erc32/Makefile.in b/sim/erc32/Makefile.in index f52daf740dd..5c29b0abfb7 100644 --- a/sim/erc32/Makefile.in +++ b/sim/erc32/Makefile.in @@ -41,9 +41,9 @@ SIM_EXTRA_CFLAGS += -DFAST_UART -I$(srcroot) # `sis' doesn't need interf.o. SIS_OFILES = exec.o erc32.o func.o help.o float.o -all: sis -sis: sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS) - $(CC) $(ALL_CFLAGS) -o sis \ +all: sis$(EXEEXT) +sis$(EXEEXT): sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS) + $(CC) $(ALL_CFLAGS) -o sis$(EXEEXT) \ sis.o $(SIS_OFILES) $(COMMON_OBJS) $(EXTRA_LIBS) # Copy the files into directories where they will be run. diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog index 49b3e66f09a..2b1b2e8a31b 100644 --- a/sim/ppc/ChangeLog +++ b/sim/ppc/ChangeLog @@ -1,3 +1,7 @@ +2021-06-12 Mike Frysinger + + * Makefile.in: Add $(EXEEXT) to run and psim. + 2021-06-12 Mike Frysinger * Makefile.in: Delete ALIGNMENT_CFLAGS. diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in index 5d0dd745a30..af9695d23f0 100644 --- a/sim/ppc/Makefile.in +++ b/sim/ppc/Makefile.in @@ -158,7 +158,7 @@ INTL_CFLAGS = @INCINTL@ TARGETLIB = libsim.a -all: run $(TARGETLIB) $(GDB_OBJ) +all: run$(EXEEXT) $(TARGETLIB) $(GDB_OBJ) .c.o: $(CC) -c $(STD_CFLAGS) $< @@ -542,10 +542,10 @@ PACKAGE_SRC = @sim_pk_src@ PACKAGE_OBJ = @sim_pk_obj@ -psim: $(TARGETLIB) main.o $(LIBIBERTY_LIB) $(BFD_LIB) $(LIBINTL_DEP) +psim$(EXEEXT): $(TARGETLIB) main.o $(LIBIBERTY_LIB) $(BFD_LIB) $(LIBINTL_DEP) $(CC) $(CFLAGS) $(LDFLAGS) -o psim$(EXEEXT) main.o $(TARGETLIB) $(BFD_LIB) $(ZLIB) $(LIBINTL) $(LIBIBERTY_LIB) $(LIBS) -run: psim +run$(EXEEXT): psim$(EXEEXT) rm -f run$(EXEEXT) ln psim$(EXEEXT) run$(EXEEXT) -- 2.30.2