~ chicken-core (chicken-5) df072494ee5dd85bbb811bc7857abfb81f38730d

commit df072494ee5dd85bbb811bc7857abfb81f38730d
Author:     Peter Bex <sjamaan@frohike.homeunix.org>
AuthorDate: Tue Sep 21 18:11:09 2010 +0200
Commit:     Peter Bex <sjamaan@frohike.homeunix.org>
CommitDate: Tue Sep 21 18:11:09 2010 +0200

    Fix SunW compiler linking options on Solaris. Get rid of a warning on x86 and x86_64 Solaris regarding -xannotate=no

diff --git a/Makefile.solaris b/Makefile.solaris
index 163020e2..c6ce2691 100644
--- a/Makefile.solaris
+++ b/Makefile.solaris
@@ -68,10 +68,15 @@ endif
 endif
 endif
 
-ifeq ($(C_COMPILER),cc)
-LINKER_LINK_SHARED_LIBRARY_OPTIONS = -xannotate=no -G
-LINKER_LINK_SHARED_DLOADABLE_OPTIONS = -xannotate=no -G
-LINKER_LINK_SHARED_PROGRAM_OPTIONS =
+ifeq ($(C_COMPILER),cc) # Assuming 'cc' means SunW/SunStudio compiler
+ifneq (,$(filter-out x86 x86-64,$(ARCH))) # -xannotate=no is not supported on x86/x86-64
+DISABLE_ANNOTATIONS=-xannotate=no
+else
+DISABLE_ANNOTATIONS=
+endif
+LINKER_LINK_SHARED_LIBRARY_OPTIONS = -G $(DISABLE_ANNOTATIONS)
+LINKER_LINK_SHARED_DLOADABLE_OPTIONS = -G $(DISABLE_ANNOTATIONS) -R"$(RUNTIME_LINKER_PATH)" -L.
+LINKER_LINK_SHARED_PROGRAM_OPTIONS = -R"$(RUNTIME_LINKER_PATH)"
 else
 LINKER_LINK_SHARED_LIBRARY_OPTIONS = -shared
 LINKER_LINK_SHARED_DLOADABLE_OPTIONS = -shared -Wl,-R"$(RUNTIME_LINKER_PATH)" -Wl,-L.