Merge branch 'develop' into 'develop'

Support for aix on 32 and 64 bit.

* add UNIX as *features* on aix to build asdf.
* configure thread and runlime linking.
* generalize print_lock macro as xlC complain on variadic
  macro arguments number.

See merge request !23

src/aclocal.m4

@@ -443,9 +443,14 @@ case "${host_os}" in
                 clibs="-Wld=-lrld"
                 ;;
 	aix*)
-		PICFLAG=''
+		PICFLAG='-DPIC'
 		thehost="aix"
-		shared="no"
+		THREAD_LIBS='-lpthread'
+                SHARED_LDFLAGS="-G -bsvr4 -brtl ${LDFLAGS}"
+                BUNDLE_LDFLAGS="-G -bsvr4 -brtl ${LDFLAGS}"
+                ECL_LDRPATH="-Wl,-R~A"
+                #SONAME="${SHAREDPREFIX}ecl.${SHAREDEXT}.SOVERSION"
+                #SONAME_LDFLAGS="-Wl,-soname,SONAME"
 		;;
         *)
                 thehost="$host_os"

src/c/ecl_features.h

@@ -35,7 +35,7 @@ ecl_def_string_array(feature_names,static,const) = {
 #endif
   ecl_def_string_array_elt("ECL-PDE"),
 #if defined(unix) || defined(netbsd) || defined(openbsd) || defined(linux) || defined(darwin) || \
-  defined(freebsd) || defined(dragonfly) || defined(kfreebsd) || defined(gnu) || defined(nsk)
+  defined(freebsd) || defined(dragonfly) || defined(kfreebsd) || defined(gnu) || defined(nsk) || defined(aix)
   ecl_def_string_array_elt("UNIX"),
 #endif
 #ifdef BSD

src/configure

@@ -5054,9 +5054,14 @@ LSP_FEATURES="(cons :android ${LSP_FEATURES})"
                 clibs="-Wld=-lrld"
                 ;;
 	aix*)
-		PICFLAG=''
+		PICFLAG='-DPIC'
 		thehost="aix"
-		shared="no"
+		THREAD_LIBS='-lpthread'
+                SHARED_LDFLAGS="-G -bsvr4 -brtl ${LDFLAGS}"
+                BUNDLE_LDFLAGS="-G -bsvr4 -brtl ${LDFLAGS}"
+                ECL_LDRPATH="-Wl,-R~A"
+                #SONAME="${SHAREDPREFIX}ecl.${SHAREDEXT}.SOVERSION"
+                #SONAME_LDFLAGS="-Wl,-soname,SONAME"
 		;;
         *)
                 thehost="$host_os"
@@ -10267,7 +10272,7 @@ ecl config.status 16.1.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C)  Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 

src/h/internal.h

@@ -488,7 +488,7 @@ extern cl_fixnum ecl_runtime(void);
 #ifdef ECL_THREADS
 extern void ecl_process_yield(void);
 extern void print_lock(char *s, cl_object lock, ...);
-#define print_lock(a,b,...) ((void)0)
+#define print_lock(...) ((void)0)
 extern void ecl_get_spinlock(cl_env_ptr env, cl_object *lock);
 extern void ecl_giveup_spinlock(cl_object *lock);
 extern cl_object ecl_wait_on(cl_env_ptr env, cl_object (*condition)(cl_env_ptr, cl_object), cl_object o);