Some AIX changes:

- add -qtls flag needed for __thread support (used in ThreadLocalStorage.h)
- remove obsolete AIX 4 config.


git-svn-id: http://root.cern.ch/svn/root/trunk@43697 27541ba8-7e3a-0410-8455-c3a389f83636

config/ARCHS

-aix                  for AIX 4.x with xlC
 aix5                 for AIX 5.x with xlC
 aixgcc               for AIX 5.x with gcc >= 3
 alphacxx6            for DEC Unix with cxx6

config/Makefile.aix

-# -*- mode: makefile -*-
-#
-# Makefile of ROOT for AIX 4.x with xlC
-
-PLATFORM      = aix
-
-DEBUGFLAGS    = -g
-OPTFLAGS      = -O -qmaxmem=-1
-ifeq (debug,$(findstring debug,$(ROOTBUILD)))
-OPT           = $(DEBUGFLAGS)
-NOOPT         =
-else
-OPT           = $(OPTFLAGS)
-NOOPT         =
-endif
-
-# Compiler:
-CXX           = xlC
-CC            = xlC
-CXXFLAGS      = -qchars=signed -qnoro -qnoroconst $(EXTRA_CXXFLAGS)
-CFLAGS        = -qchars=signed -qnoro -qnoroconst $(EXTRA_CFLAGS)
-CINTCXXFLAGS  = -qchars=signed -qnoro -qnoroconst -DG__REGEXP \
-                -D_POSIX2_SOURCE -DG__P2FCAST -DG__SHAREDLIB -DG__OSFDLL \
-                -DG__ROOT -DG__REDIRECTIO $(EXTRA_CXXFLAGS)
-CINTCFLAGS    = -qchars=signed -qnoro -qnoroconst -DG__REGEXP -D_POSIX2_SOURCE \
-                -DG__P2FCAST -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT \
-                -DG__REDIRECTIO $(EXTRA_CFLAGS)
-MAKESHAREDLIB = cd \$$BuildDir ; $(CXX) -c $(OPT) $(CXXFLAGS) \$$IncludePath \
-                \$$SourceFiles ; /usr/ibmcxx/bin/makeC++SharedLib \
-                -o \$$SharedLib \$$LinkedLibs -p 0 \$$ObjectFiles
-
-# Linker:
-LD            = xlC
-LDFLAGS       = $(OPT) $(EXTRA_LDFLAGS)
-SOFLAGS       =
-SOEXT         = a
-
-# System libraries:
-SYSLIBS       = -lm -lld $(OSTHREADLIBDIR) $(OSTHREADLIB) \
-                $(ALLOCLIBDIR) $(ALLOCLIB)
-XLIBS         = $(XPMLIBDIR) $(XPMLIB) $(X11LIBDIR) -lXext -lX11
-CILIBS        = -lm -lld
-
-# Fortran:
-F77           = xlf
-F77FLAGS      = -qextname -qcharlen=32767
-F77LIBS       = -lxlf -lxlf90
-
-# Extras

config/Makefile.aix5

@@ -18,14 +18,14 @@ endif
 CXX           = xlC_r
 CC            = xlC_r
 CXXFLAGS      = -qchars=signed -qnoro -qnoroconst -qrtti=all -qstaticinline \
-                $(EXTRA_CXXFLAGS)
+                -qtls $(EXTRA_CXXFLAGS)
 CFLAGS        = -qchars=signed -qnoro -qnoroconst -qstaticinline \
-                $(EXTRA_CFLAGS)
+                -qtls $(EXTRA_CFLAGS)
 CINTCXXFLAGS  = -qchars=signed -qnoro -qnoroconst -qrtti=all -qstaticinline \
-                -DG__REGEXP -D_POSIX2_SOURCE -DG__P2FCAST -DG__SHAREDLIB \
+                -qtls -DG__REGEXP -D_POSIX2_SOURCE -DG__P2FCAST -DG__SHAREDLIB \
                 -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO $(EXTRA_CXXFLAGS)
 CINTCFLAGS    = -qchars=signed -qnoro -qnoroconst -qstaticinline \
-                -DG__REGEXP -D_POSIX2_SOURCE -DG__P2FCAST -DG__SHAREDLIB \
+                -qtls -DG__REGEXP -D_POSIX2_SOURCE -DG__P2FCAST -DG__SHAREDLIB \
                 -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO $(EXTRA_CFLAGS)
 MAKESHAREDLIB = cd \$$BuildDir ; $(CXX) -c $(OPT) $(CXXFLAGS) \$$IncludePath \
                 \$$SourceFiles ; /usr/vacpp/bin/makeC++SharedLib \

etc/Makefile.arch

@@ -100,18 +100,8 @@ LDFLAGS       = $(OPT2)
 SOFLAGS       = -shared
 endif
 
-ifeq ($(ARCH),aix)
-# IBM AIX xlC 4.x
-CXX           = xlC
-CXXFLAGS      = $(OPT)
-LD            = xlC
-LDFLAGS       = $(OPT)
-SOFLAGS       =
-DllSuf        = a
-endif
-
 ifeq ($(ARCH),aix5)
-# IBM AIX xlC 5.x
+# IBM AIX >5.x xlC
 CXX           = xlC
 CXXFLAGS      = $(OPT)
 LD            = xlC
@@ -121,7 +111,7 @@ DllSuf        = a
 endif
 
 ifeq ($(ARCH),aixgcc)
-# IBM AIX with GCC
+# IBM AIX >5.x with GCC
 CXX           = g++
 CXXFLAGS      = $(OPT)
 LD            = g++

test/Makefile

@@ -287,6 +287,10 @@ PROGRAMS      = $(EVENT) $(EVENTMTSO) $(HWORLD) $(HSIMPLE) $(MINEXAM) $(TSTRING)
 OBJS         += $(GUITESTO) $(GUIVIEWERO) $(TETRISO)
 PROGRAMS     += $(GUITEST) $(GUIVIEWER) $(TETRISSO)
 
+ifeq ($(ARCH),aix5)
+MAKESHARED    = /usr/vacpp/bin/makeC++SharedLib
+endif
+
 #------------------------------------------------------------------------------
 
 .SUFFIXES: .$(SrcSuf) .$(ObjSuf) .$(DllSuf)
@@ -295,11 +299,8 @@ PROGRAMS     += $(GUITEST) $(GUIVIEWER) $(TETRISSO)
 all:            $(PROGRAMS)
 
 $(EVENTSO):     $(EVENTO)
-ifeq ($(ARCH),aix)
-		/usr/ibmcxx/bin/makeC++SharedLib $(OutPutOpt) $@ $(LIBS) -p 0 $^
-else
 ifeq ($(ARCH),aix5)
-		/usr/vacpp/bin/makeC++SharedLib $(OutPutOpt) $@ $(LIBS) -p 0 $^
+		$(MAKESHARED) $(OutPutOpt) $@ $(LIBS) -p 0 $^
 else
 ifeq ($(PLATFORM),macosx)
 # We need to make both the .dylib and the .so
@@ -321,16 +322,12 @@ else
 		$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(EXPLLINKLIBS)
 endif
 endif
-endif
 endif
 		@echo "$@ done"
 
 $(EVENTMTSO):     $(EVENTMTO)
-ifeq ($(ARCH),aix)
-		/usr/ibmcxx/bin/makeC++SharedLib $(OutPutOpt) $@ $(LIBS) -p 0 $^
-else
 ifeq ($(ARCH),aix5)
-		/usr/vacpp/bin/makeC++SharedLib $(OutPutOpt) $@ $(LIBS) -p 0 $^
+		$(MAKESHARED) $(OutPutOpt) $@ $(LIBS) -p 0 $^
 else
 ifeq ($(PLATFORM),macosx)
 # We need to make both the .dylib and the .so
@@ -352,7 +349,6 @@ else
 		$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(EXPLLINKLIBS)
 endif
 endif
-endif
 endif
 		@echo "$@ done"
 
@@ -444,17 +440,9 @@ else
 endif
 		@echo "$@ done"
 
-
-
-
-
-
 $(TRACKMATHLIB):	$(TRACKMATHOBJ)
-ifeq ($(ARCH),aix)
-		/usr/ibmcxx/bin/makeC++SharedLib $(OutPutOpt) $@ $(LIBS) -p 0 $^
-else
 ifeq ($(ARCH),aix5)
-		/usr/vacpp/bin/makeC++SharedLib $(OutPutOpt) $@ $(LIBS) -p 0 $^
+		$(MAKESHARED) $(OutPutOpt) $@ $(LIBS) -p 0 $^
 else
 ifeq ($(PLATFORM),macosx)
 # We need to make both the .dylib and the .so
@@ -469,7 +457,6 @@ else
 		$(MT_DLL)
 endif
 endif
-endif
 
 $(STRESSMATH):   $(STRESSMATHO) $(TRACKMATHLIB)
 ifeq ($(PLATFORM),win32)
@@ -629,11 +616,8 @@ $(BENCH):       $(BENCHO) $(TBENCHSO)
 
 Hello:          $(HELLOSO)
 $(HELLOSO):     $(HELLOO)
-ifeq ($(ARCH),aix)
-		/usr/ibmcxx/bin/makeC++SharedLib $(OutPutOpt) $@ $(LIBS) -p 0 $^
-else
 ifeq ($(ARCH),aix5)
-		/usr/vacpp/bin/makeC++SharedLib $(OutPutOpt) $@ $(LIBS) -p 0 $^
+		$(MAKESHARED) $(OutPutOpt) $@ $(LIBS) -p 0 $^
 else
 ifeq ($(PLATFORM),macosx)
 # We need to make both the .dylib and the .so
@@ -648,15 +632,11 @@ else
 		$(MT_DLL)
 endif
 endif
-endif
 
 Aclock:         $(ACLOCKSO)
 $(ACLOCKSO):    $(ACLOCKO)
-ifeq ($(ARCH),aix)
-		/usr/ibmcxx/bin/makeC++SharedLib $(OutPutOpt) $@ $(LIBS) -p 0 $^
-else
 ifeq ($(ARCH),aix5)
-		/usr/vacpp/bin/makeC++SharedLib $(OutPutOpt) $@ $(LIBS) -p 0 $^
+		$(MAKESHARED) $(OutPutOpt) $@ $(LIBS) -p 0 $^
 else
 ifeq ($(PLATFORM),macosx)
 # We need to make both the .dylib and the .so
@@ -671,15 +651,11 @@ else
 		$(MT_DLL)
 endif
 endif
-endif
 
 Tetris:         $(TETRISSO)
 $(TETRISSO):    $(TETRISO)
-ifeq ($(ARCH),aix)
-		/usr/ibmcxx/bin/makeC++SharedLib $(OutPutOpt) $@ $(GLIBS) -p 0 $^
-else
 ifeq ($(ARCH),aix5)
-		/usr/vacpp/bin/makeC++SharedLib $(OutPutOpt) $@ $(GLIBS) -p 0 $^
+		$(MAKESHARED) $(OutPutOpt) $@ $(GLIBS) -p 0 $^
 else
 ifeq ($(PLATFORM),macosx)
 # We need to make both the .dylib and the .so
@@ -694,14 +670,10 @@ else
 		$(MT_DLL)
 endif
 endif
-endif
 
 $(TBENCHSO):    $(TBENCHO)
-ifeq ($(ARCH),aix)
-		/usr/ibmcxx/bin/makeC++SharedLib $(OutPutOpt) $@ $(LIBS) -p 0 $^
-else
 ifeq ($(ARCH),aix5)
-		/usr/vacpp/bin/makeC++SharedLib $(OutPutOpt) $@ $(LIBS) -p 0 $^
+		$(MAKESHARED) $(OutPutOpt) $@ $(LIBS) -p 0 $^
 else
 ifeq ($(PLATFORM),macosx)
 # We need to make both the .dylib and the .so
@@ -716,7 +688,6 @@ else
 		$(MT_DLL)
 endif
 endif
-endif
 
 $(STRESSINTERP): $(STRESSINTERPO) 
 		$(LD) $(LDFLAGS) $^ $(LIBS) $(OutPutOpt)$@