[Git][cmucl/cmucl][sparc64-dev] 4 commits: Revert sparc64 changes.

[Raymond Toy]

Raymond Toy pushed to branch sparc64-dev at cmucl / cmucl


Commits:
a3a37628 by Raymond Toy at 2016-12-17T08:45:23-08:00
Revert sparc64 changes.

These were committed accidentally.  Revert to previous version.

- - - - -
b6e6372c by Raymond Toy at 2016-12-17T08:46:48-08:00
Revert sparc64 changes.

These were committed accidentally.  Revert to previous version.

- - - - -
934ca7bf by Raymond Toy at 2016-12-17T13:33:22-08:00
Merge branch 'master' into sparc64-dev

- - - - -
4352c211 by Raymond Toy at 2016-12-17T13:36:40-08:00
Move ASSEM_SRC to individual configs

ASSEM_SRC is no longer common on sparc so move it from
Config.sparc_common to Config.sparc_sunc and Config.sparc64_sunc.  For
sparc64, set it to sparc64-assem.S instead of just sparc-assem.S.
(Haven't updated sparc64-assem.S to sparc64 yet.)

- - - - -


3 changed files:

- src/lisp/Config.sparc64_sunc
- src/lisp/Config.sparc_common
- src/lisp/Config.sparc_sunc


Changes:

=====================================
src/lisp/Config.sparc64_sunc
=====================================
--- a/src/lisp/Config.sparc64_sunc
+++ b/src/lisp/Config.sparc64_sunc
@@ -24,7 +24,7 @@ CC_V8PLUS = -xarch=sparc
 AS_V8PLUS = -xarch=sparc
 endif
 
-ASSEM_SRC = sparcv9-assem.S
+ASSEM_SRC = sparc64-assem.S
 CFLAGS += -xlibmieee -O
 DEPEND_FLAGS = -xM
 ASFLAGS = $(AS_V8PLUS)


=====================================
src/lisp/Config.sparc_common
=====================================
--- a/src/lisp/Config.sparc_common
+++ b/src/lisp/Config.sparc_common
@@ -43,7 +43,6 @@ CPPFLAGS += -I. -I$(PATH1) $(CC_V8PLUS) $(CPP_DEFINE_OPTIONS)
 CFLAGS += -g $(CC_V8PLUS)
 
 NM = $(PATH1)/solaris-nm
-#ASSEM_SRC = sparc-assem.S
 ARCH_SRC = sparc-arch.c
 
 DEPEND=$(CC) 


=====================================
src/lisp/Config.sparc_sunc
=====================================
--- a/src/lisp/Config.sparc_sunc
+++ b/src/lisp/Config.sparc_sunc
@@ -20,11 +20,11 @@ include Config.sparc_common
 ifdef FEATURE_SPARC_V9
 # For SunStudio 11, use -xarch=v8plus.  For SunStudio 12, that is
 # deprecated; use -m32 -xarch=sparc.
-CC_V8PLUS = -xarch=sparc
-AS_V8PLUS = -xarch=sparc
+CC_V8PLUS = -m32 -xarch=sparc
+AS_V8PLUS = -m32 -xarch=sparc
 endif
 
-ASSEM_SRC = sparcv9-assem.S
+ASSEM_SRC = sparc-assem.S
 CFLAGS += -xlibmieee -O
 DEPEND_FLAGS = -xM
 ASFLAGS = $(AS_V8PLUS)



View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/compare/fe4f6806960ad5c0cdaab417661637f82b25ac89...4352c211018b3d7ad2626839b78ecc1c96bfa52a
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://mailman.common-lisp.net/pipermail/cmucl-cvs/attachments/20161217/f3fb4074/attachment-0001.html>