From a95e44380d49461be8f7b45905aa1b0be1563499 Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Fri, 27 Feb 2015 21:32:22 +0300 Subject: [PATCH] Revert "Move asm machine-dependent files to 'src' folder" (partly) Asm files moved back to base folder to avoid build issues (reported for NetBSD and Solaris on Sparc). Alternative way is to adjust configure.ac and Makefile.am properly but it requires more efforts (including testing). * .gitignore: Remove "src" from comment. * Makefile.am (EXTRA_libgc_la_SOURCES): Remove "src/" prefix. * Makefile.direct (SRCS, mach_dep.o): Likewise. * src/ia64_save_regs_in_stack.s: Move to base folder. * src/sparc_mach_dep.S: Likewise. * src/sparc_netbsd_mach_dep.s: Likewise. * src/sparc_sunos4_mach_dep.s: Likewise. --- .gitignore | 2 +- Makefile.am | 4 ++-- Makefile.direct | 20 +++++++++---------- ...gs_in_stack.s => ia64_save_regs_in_stack.s | 0 src/sparc_mach_dep.S => sparc_mach_dep.S | 0 ...tbsd_mach_dep.s => sparc_netbsd_mach_dep.s | 0 ...nos4_mach_dep.s => sparc_sunos4_mach_dep.s | 0 7 files changed, 13 insertions(+), 13 deletions(-) rename src/ia64_save_regs_in_stack.s => ia64_save_regs_in_stack.s (100%) rename src/sparc_mach_dep.S => sparc_mach_dep.S (100%) rename src/sparc_netbsd_mach_dep.s => sparc_netbsd_mach_dep.s (100%) rename src/sparc_sunos4_mach_dep.s => sparc_sunos4_mach_dep.s (100%) diff --git a/.gitignore b/.gitignore index d8742dbb..498c6673 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ # Ignored files in bdwgc Git repo. -# Binary files (in root dir, cord, src, tests): +# Binary files (in root dir, cord, tests): *.dll *.exe *.gcda diff --git a/Makefile.am b/Makefile.am index ce91bf07..fc581b02 100644 --- a/Makefile.am +++ b/Makefile.am @@ -100,8 +100,8 @@ libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(ATOMIC_OPS_LIBS) libgc_la_DEPENDENCIES = @addobjs@ libgc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info 1:3:0 -no-undefined -EXTRA_libgc_la_SOURCES = src/ia64_save_regs_in_stack.s src/sparc_mach_dep.S \ - src/sparc_netbsd_mach_dep.s src/sparc_sunos4_mach_dep.s +EXTRA_libgc_la_SOURCES = ia64_save_regs_in_stack.s sparc_mach_dep.S \ + sparc_netbsd_mach_dep.s sparc_sunos4_mach_dep.s # C++ Interface diff --git a/Makefile.direct b/Makefile.direct index b5bcc73c..ee32f717 100644 --- a/Makefile.direct +++ b/Makefile.direct @@ -107,8 +107,8 @@ SRCS= $(CSRCS) \ include/gc_config_macros.h include/private/pthread_support.h \ include/private/pthread_stop_world.h include/private/darwin_semaphore.h \ include/private/darwin_stop_world.h include/private/thread_local_alloc.h \ - src/ia64_save_regs_in_stack.s src/sparc_mach_dep.S \ - src/sparc_netbsd_mach_dep.s src/sparc_sunos4_mach_dep.s $(CORD_SRCS) + ia64_save_regs_in_stack.s sparc_mach_dep.S \ + sparc_netbsd_mach_dep.s sparc_sunos4_mach_dep.s $(CORD_SRCS) DOC_FILES= README.QUICK TODO doc/README.Mac doc/README.OS2 \ doc/README.amiga doc/README.cords doc/debugging.html \ @@ -316,17 +316,17 @@ dyn_test: # gcc -shared -Wl,-soname=libgc.so.0 -o libgc.so.0 $(LIBOBJS) dyn_load.lo # touch liblinuxgc.so -mach_dep.o: $(srcdir)/mach_dep.c $(srcdir)/src/sparc_mach_dep.S \ - $(srcdir)/src/sparc_sunos4_mach_dep.s \ - $(srcdir)/src/ia64_save_regs_in_stack.s \ - $(srcdir)/src/sparc_netbsd_mach_dep.s $(UTILS) +mach_dep.o: $(srcdir)/mach_dep.c $(srcdir)/sparc_mach_dep.S \ + $(srcdir)/sparc_sunos4_mach_dep.s \ + $(srcdir)/ia64_save_regs_in_stack.s \ + $(srcdir)/sparc_netbsd_mach_dep.s $(UTILS) rm -f mach_dep.o - ./if_mach SPARC SOLARIS $(CC) -c -o mach_dep2.o $(srcdir)/src/sparc_mach_dep.S - ./if_mach SPARC OPENBSD $(AS) -o mach_dep2.o $(srcdir)/src/sparc_sunos4_mach_dep.s - ./if_mach SPARC NETBSD $(AS) -o mach_dep2.o $(srcdir)/src/sparc_netbsd_mach_dep.s + ./if_mach SPARC SOLARIS $(CC) -c -o mach_dep2.o $(srcdir)/sparc_mach_dep.S + ./if_mach SPARC OPENBSD $(AS) -o mach_dep2.o $(srcdir)/sparc_sunos4_mach_dep.s + ./if_mach SPARC NETBSD $(AS) -o mach_dep2.o $(srcdir)/sparc_netbsd_mach_dep.s ./if_mach SPARC "" $(CC) -c -o mach_dep1.o $(SPECIALCFLAGS) $(srcdir)/mach_dep.c ./if_mach SPARC "" ld -r -o mach_dep.o mach_dep1.o mach_dep2.o - ./if_mach IA64 "" as $(AS_ABI_FLAG) -o ia64_save_regs_in_stack.o $(srcdir)/src/ia64_save_regs_in_stack.s + ./if_mach IA64 "" as $(AS_ABI_FLAG) -o ia64_save_regs_in_stack.o $(srcdir)/ia64_save_regs_in_stack.s ./if_mach IA64 "" $(CC) -c -o mach_dep1.o $(SPECIALCFLAGS) $(srcdir)/mach_dep.c ./if_mach IA64 "" ld -r -o mach_dep.o mach_dep1.o ia64_save_regs_in_stack.o ./if_not_there mach_dep.o $(CC) -c $(SPECIALCFLAGS) $(srcdir)/mach_dep.c diff --git a/src/ia64_save_regs_in_stack.s b/ia64_save_regs_in_stack.s similarity index 100% rename from src/ia64_save_regs_in_stack.s rename to ia64_save_regs_in_stack.s diff --git a/src/sparc_mach_dep.S b/sparc_mach_dep.S similarity index 100% rename from src/sparc_mach_dep.S rename to sparc_mach_dep.S diff --git a/src/sparc_netbsd_mach_dep.s b/sparc_netbsd_mach_dep.s similarity index 100% rename from src/sparc_netbsd_mach_dep.s rename to sparc_netbsd_mach_dep.s diff --git a/src/sparc_sunos4_mach_dep.s b/sparc_sunos4_mach_dep.s similarity index 100% rename from src/sparc_sunos4_mach_dep.s rename to sparc_sunos4_mach_dep.s -- 2.40.0