Merge branch 'develop' into mobile

This commit is contained in:
Daniel Kochmański 2015-10-28 18:41:55 +01:00
commit 060fa6b4bf
7 changed files with 30 additions and 4 deletions

View file

@ -40,7 +40,7 @@
ecl_import_current_thread ecl_import_current_thread
ecl_release_current_thread ecl_release_current_thread
- When cl-truename encounters a broken symlink it returns it's path - When cl-truename encounters a broken symlink, it returns its path
instead of signalling a file-error instead of signalling a file-error
- Deprecated variables has been removed - Deprecated variables has been removed
@ -55,6 +55,15 @@
- C99 supporting compiler is mandatory for C backend. - C99 supporting compiler is mandatory for C backend.
- COMPILER::*cc_is_cxx*: New variable to switch the output extension of
emitted compiler code to ".cxx" when configured with "--with-c++". This
eliminates compiler warnings that compiling C++ with a ".c" extension is
deprecated; this is seen mostly with Clang++.
- Added Clang-specific pragmas to disable return type, unused value and
excessive parentheses warnings, which are fairly harmless, but annoying
and clutter user output.
** Enhancements: ** Enhancements:
- Added code walker (present as *feature* :walker) - Added code walker (present as *feature* :walker)

View file

@ -28,11 +28,13 @@
src/lsp/format.lsp ; CMUCL's format src/lsp/format.lsp ; CMUCL's format
and the directories and the directories
contrib/ ; User contributed extensions contrib/ ; User contributed extensions
examples/ ; Examples for the ECL usage
src/clx/ ; portable CLX library from Telent src/clx/ ; portable CLX library from Telent
Look the precise copyright of these extensions in the corresponding Look the precise copyright of these extensions in the corresponding
files. files.
Examples are licensed under: (SPDX-License-Identifier) BSD-2-Clause
Report bugs, comments, suggestions to the ecl mailing list: Report bugs, comments, suggestions to the ecl mailing list:
ecls-list@lists.sourceforge.net. ecl-devel@common-lisp.net.
---- END OF COPYRIGHT FOR THE ECL CORE ENVIRONMENT ------------------ ---- END OF COPYRIGHT FOR THE ECL CORE ENVIRONMENT ------------------

View file

@ -52,6 +52,9 @@ coprocessor).")
(t (t
"~A -I. \"-I~A\" ~A ~:[~*~;~A~] -w -c \"~A\" -o \"~A\"~{ '~A'~}"))) "~A -I. \"-I~A\" ~A ~:[~*~;~A~] -w -c \"~A\" -o \"~A\"~{ '~A'~}")))
(defvar *cc-is-cxx* @CC_IS_CXX@
"ECL's compiler is really the C++ compiler, not a C compiler.")
#-dlopen #-dlopen
(defvar *ld-flags* "@LDFLAGS@ -lecl @CORE_LIBS@ @FASL_LIBS@ @LIBS@") (defvar *ld-flags* "@LDFLAGS@ -lecl @CORE_LIBS@ @FASL_LIBS@ @LIBS@")
#+dlopen #+dlopen

View file

@ -57,7 +57,7 @@ the environment variable TMPDIR to a different value." template))
((:static-library :library :lib) (setf format +static-library-format+)) ((:static-library :library :lib) (setf format +static-library-format+))
(:data (setf extension "data")) (:data (setf extension "data"))
(:sdata (setf extension "sdat")) (:sdata (setf extension "sdat"))
(:c (setf extension "c")) (:c (setf extension (if (not *cc-is-cxx*) "c" "cxx")))
(:h (setf extension "eclh")) (:h (setf extension "eclh"))
(:object (setf extension +object-file-extension+)) (:object (setf extension +object-file-extension+))
(:program (setf format +executable-file-format+)) (:program (setf format +executable-file-format+))

5
src/configure vendored
View file

@ -627,6 +627,7 @@ ECL_EXTRA_LISP_FILES
CHAR_CODE_LIMIT CHAR_CODE_LIMIT
ECL_CHARACTER ECL_CHARACTER
CLX_INFO CLX_INFO
CC_IS_CXX
ECL_CC ECL_CC
POW_LIB POW_LIB
LIBOBJS LIBOBJS
@ -9353,9 +9354,13 @@ fi
if test ${with_cxx} = "no" ; then if test ${with_cxx} = "no" ; then
ECL_CC=${CC} ECL_CC=${CC}
CC_IS_CXX="nil"
else else
ECL_CC=${CXX} ECL_CC=${CXX}
CC_IS_CXX="t"
boehm_configure_flags="${boehm_configure_flags} --enable-cplusplus" boehm_configure_flags="${boehm_configure_flags} --enable-cplusplus"
fi fi

View file

@ -746,8 +746,10 @@ dnl ----------------------------------------------------------------------
dnl Do we use C or C++ compiler to compile ecl? dnl Do we use C or C++ compiler to compile ecl?
if test ${with_cxx} = "no" ; then if test ${with_cxx} = "no" ; then
AC_SUBST([ECL_CC], [${CC}]) AC_SUBST([ECL_CC], [${CC}])
AC_SUBST([CC_IS_CXX], ["nil"])
else else
AC_SUBST([ECL_CC], [${CXX}]) AC_SUBST([ECL_CC], [${CXX}])
AC_SUBST([CC_IS_CXX], ["t"])
boehm_configure_flags="${boehm_configure_flags} --enable-cplusplus" boehm_configure_flags="${boehm_configure_flags} --enable-cplusplus"
fi fi

View file

@ -21,6 +21,11 @@
* defined */ * defined */
#define _WINSOCKAPI_ #define _WINSOCKAPI_
#endif /* __CYGWIN__ */ #endif /* __CYGWIN__ */
/* Disable a couple of clang's more annoying diagnostics */
#pragma clang diagnostic ignored "-Wreturn-type"
#pragma clang diagnostic ignored "-Wunused-value"
#pragma clang diagnostic ignored "-Wparentheses-equality"
#include <ecl/ecl.h> #include <ecl/ecl.h>
#include <math.h> /* for inline mathematics */ #include <math.h> /* for inline mathematics */
#include <ecl/ecl-inl.h> #include <ecl/ecl-inl.h>