Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
From 5e756d4d8df2949cb3b6e51532d3016cbb276fd7 Mon Sep 17 00:00:00 2001
From: Ivan Maidanski <ivmai@mail.ru>
Date: Fri, 27 Feb 2015 21:32:22 +0300
Subject: [PATCH 004/135] Revert "Move asm machine-dependent files to 'src'
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
* 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.
Makefile.direct | 20 +++++++-------
ia64_save_regs_in_stack.s | 11 ++++++++
sparc_mach_dep.S | 61 +++++++++++++++++++++++++++++++++++++++++
sparc_netbsd_mach_dep.s | 34 +++++++++++++++++++++++
sparc_sunos4_mach_dep.s | 32 +++++++++++++++++++++
src/ia64_save_regs_in_stack.s | 11 --------
src/sparc_mach_dep.S | 61 -----------------------------------------
src/sparc_netbsd_mach_dep.s | 34 -----------------------
src/sparc_sunos4_mach_dep.s | 32 ---------------------
11 files changed, 151 insertions(+), 151 deletions(-)
create mode 100644 ia64_save_regs_in_stack.s
create mode 100644 sparc_mach_dep.S
create mode 100644 sparc_netbsd_mach_dep.s
create mode 100644 sparc_sunos4_mach_dep.s
delete mode 100644 src/ia64_save_regs_in_stack.s
delete mode 100644 src/sparc_mach_dep.S
delete mode 100644 src/sparc_netbsd_mach_dep.s
delete mode 100644 src/sparc_sunos4_mach_dep.s
diff --git a/Makefile.am b/Makefile.am
index f8057db..1688be2 100644
@@ -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
diff --git a/Makefile.direct b/Makefile.direct
index d64598b..8ab80e8 100644
@@ -108,8 +108,8 @@ SRCS= $(CSRCS) \
include/gc_config_macros.h include/private/pthread_support.h \
include/private/pthread_stop_world.h include/private/darwin_semaphore.h \