Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README/ReleaseNotes/v642/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ The following people have contributed to this new version:
* The **JsMVA** feature for interactive TMVA training in Jupyter notebooks is now removed. It was not functional for years and was therefore already excluded from ROOT 6.38. This also removes the `TMVA::IPythonInteractive` class and the related interactive-training interfaces from the TMVA method and fitter classes, such as `MethodBase::ExitFromTraining()` or `FitterBase::SetIPythonInteractive()`.
* The **RooStats::DebuggingSampler** and **RooStats::DebuggingTestStat** classes are removed. They were mock implementations of the `TestStatSampler` and `TestStatistic` interfaces that returned uniform random numbers independent of the data, only meant for debugging the RooStats framework itself during its initial development.
* The `RooTrace` class is deprecated and will be removed in ROOT 6.44. It was a RooFit-specific memory tracer whose instrumentation hooks are compiled out by default, so it has been inert and untested for years. For memory debugging, please use general-purpose tools such as AddressSanitizer or Valgrind instead.
* Support for the AIX operating system has been removed from the codebase. This support has not been tested since the late v5 releases and the LLVM JIT is not yet supporting AIX.

## Build System

Expand Down
19 changes: 0 additions & 19 deletions config/root-config.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
# Author: Fons Rademakers, 06/06/99

readlink=readlink
if [ `uname` = "AIX" ]; then
readlink=echo
fi

# work around readlink versions not having -f option
fullpath1=`$readlink "$0"`
Expand Down Expand Up @@ -158,22 +155,6 @@ cxxversionflag="@configstd@ "
auxcflags="${cxxversionflag} "

case $arch in
aix5)
# IBM AIX
auxcflags="-qnoro -qnoroconst -qmaxmem=-1 -qrtti=all"
auxlibs=
#forcelibs=$rootulibs
#forceglibs=$rootuglibs
#forceevelibs=$rootuevelibs
;;
aixgcc)
# IBM AIX with g++
auxcflags+="-fsigned-char -fsized-deallocation"
auxlibs=
#forcelibs=$rootulibs
#forceglibs=$rootuglibs
#forceevelibs=$rootuevelibs
;;
solarisgcc)
# Solaris g++ 2.8.x
auxlibs="-L/usr/ccs/lib -lm -lsocket -lgen -ldl"
Expand Down
6 changes: 0 additions & 6 deletions config/thisroot.csh
Original file line number Diff line number Diff line change
Expand Up @@ -219,12 +219,6 @@ else
setenv SHLIB_PATH @libdir@
endif

if ($?LIBPATH) then
setenv LIBPATH @libdir@:$LIBPATH # AIX
else
setenv LIBPATH @libdir@
endif

if ($?PYTHONPATH) then
setenv PYTHONPATH @libdir@:$PYTHONPATH
else
Expand Down
7 changes: 0 additions & 7 deletions core/dictgen/src/rootcling_impl.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -1193,23 +1193,16 @@ void WriteNamespaceInit(const clang::NamespaceDecl *cl,

dictStream << " namespace ROOTDict {" << std::endl;

#if !defined(R__AIX)
dictStream << " inline ::ROOT::TGenericClassInfo *GenerateInitInstance();" << std::endl;
#endif

if (!Namespace__HasMethod(cl, "Dictionary", interp))
dictStream << " static TClass *" << mappedname.c_str() << "_Dictionary();" << std::endl;
dictStream << std::endl

<< " // Function generating the singleton type initializer" << std::endl

#if !defined(R__AIX)
<< " inline ::ROOT::TGenericClassInfo *GenerateInitInstance()" << std::endl
<< " {" << std::endl
#else
<< " ::ROOT::TGenericClassInfo *GenerateInitInstance()" << std::endl
<< " {" << std::endl
#endif

<< " static ::ROOT::TGenericClassInfo " << std::endl

Expand Down
8 changes: 0 additions & 8 deletions core/foundation/inc/ROOT/RConfig.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,6 @@
# endif
#endif

#ifdef _AIX
# define R__AIX
# define R__UNIX
# define ANSICPP
# define R__SEEK64
# define NEED_STRCASECMP
#endif

#if defined(__linux) || defined(__linux__)
# ifndef linux
# define linux
Expand Down
2 changes: 1 addition & 1 deletion core/foundation/inc/ThreadLocalStorage.h
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
# define R__HAS_PTHREAD
# endif
#endif
#if defined(R__LINUX) || defined(R__AIX)
#if defined(R__LINUX)
# define R__HAS___THREAD
#endif
#if defined(R__SOLARIS) && !defined(R__HAS_PTHREAD)
Expand Down
4 changes: 0 additions & 4 deletions core/textinput/src/textinput/TerminalConfigUnix.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@ namespace textinput {
// Solaris doesn't define sig_t
typedef SIG_TYP sig_t;
#endif
#if defined(_AIX) && !defined(sig_t)
// AIX doesn't define sig_t
typedef void (*sig_t)(int);
#endif

class TerminalConfigUnix {
private:
Expand Down
53 changes: 8 additions & 45 deletions core/unix/src/TUnixSystem.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
#include <unistd.h>
#include <cstdlib>
#include <sys/types.h>
#if defined(R__SUN) || defined(R__AIX) || \
#if defined(R__SUN) || \
defined(R__LINUX) || defined(R__SOLARIS) || \
defined(R__FBSD) || defined(R__OBSD) || \
defined(R__MACOSX) || defined(R__HURD)
Expand All @@ -62,12 +62,12 @@
#if defined(ULTRIX) || defined(R__SUN)
# include <sgtty.h>
#endif
#if defined(R__AIX) || defined(R__LINUX) || \
#if defined(R__LINUX) || \
defined(R__FBSD) || defined(R__OBSD) || \
defined(R__LYNXOS) || defined(R__MACOSX) || defined(R__HURD)
# include <sys/ioctl.h>
#endif
#if defined(R__AIX) || defined(R__SOLARIS)
#if defined(R__SOLARIS)
# include <sys/select.h>
#endif
#if defined(R__MACOSX)
Expand Down Expand Up @@ -108,17 +108,7 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
#if defined(R__AIX)
# define _XOPEN_EXTENDED_SOURCE
# include <arpa/inet.h>
# undef _XOPEN_EXTENDED_SOURCE
# if !defined(_AIX41) && !defined(_AIX43)
// AIX 3.2 doesn't have it
# define HASNOT_INETATON
# endif
#else
# include <arpa/inet.h>
#endif
#include <arpa/inet.h>
#include <sys/un.h>
#include <netdb.h>
#include <fcntl.h>
Expand Down Expand Up @@ -149,7 +139,7 @@
# endif
#endif

#if defined(R__AIX) || defined(R__FBSD) || \
#if defined(R__FBSD) || \
defined(R__OBSD) || defined(R__LYNXOS) || \
(defined(R__MACOSX) && !defined(MAC_OS_X_VERSION_10_5))
# define UTMP_NO_ADDR
Expand Down Expand Up @@ -721,7 +711,7 @@ const char *TUnixSystem::GetError()
if (err == 0 && GetLastErrorString() != "")
return GetLastErrorString();

#if defined(R__SOLARIS) || defined (R__LINUX) || defined(R__AIX) || \
#if defined(R__SOLARIS) || defined (R__LINUX) || \
defined(R__FBSD) || defined(R__OBSD) || defined(R__HURD)
return strerror(err);
#else
Expand Down Expand Up @@ -1667,11 +1657,7 @@ int TUnixSystem::Link(const char *from, const char *to)

int TUnixSystem::Symlink(const char *from, const char *to)
{
#if defined(R__AIX)
return ::symlink((char*)from, (char*)to);
#else
return ::symlink(from, to);
#endif
}

////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -1815,18 +1801,9 @@ Bool_t TUnixSystem::ExpandPathName(TString &patbuf0)

// read first argument
patbuf0 = "";
int cnt = 0;
#if defined(R__AIX)
again:
#endif
for (ch = fgetc(pf); ch != EOF && ch != ' ' && ch != '\n'; ch = fgetc(pf)) {
patbuf0.Append(ch);
cnt++;
}
#if defined(R__AIX)
// Work around bug timing problem due to delay in forking a large program
if (cnt == 0 && ch == EOF) goto again;
#endif

// skip rest of pipe
while (ch != EOF) {
Expand Down Expand Up @@ -2324,11 +2301,6 @@ void TUnixSystem::StackTrace()
delete [] gdb;
return;

#elif defined(R__AIX)
TString script = "procstack ";
script += GetPid();
Exec(script);
return;
#elif defined(R__SOLARIS)
char *cppfilt = Which(Getenv("PATH"), "c++filt", kExecutePermission);
TString script = "pstack ";
Expand Down Expand Up @@ -2877,7 +2849,7 @@ const char *TUnixSystem::GetLinkedLibraries()
ClosePipe(p);
}
#endif
#elif defined(R__LINUX) || defined(R__SOLARIS) || defined(R__AIX)
#elif defined(R__LINUX) || defined(R__SOLARIS)
#if defined(R__WINGCC )
const char *cLDD="cygcheck";
const char *cSOEXT=".dll";
Expand All @@ -2895,13 +2867,8 @@ const char *TUnixSystem::GetLinkedLibraries()
TRegexp sovers = "\\.so\\.[0-9]+";
#else
const char *cLDD="ldd";
#if defined(R__AIX)
const char *cSOEXT=".a";
TRegexp sovers = "\\.a\\.[0-9]+";
#else
const char *cSOEXT=".so";
TRegexp sovers = "\\.so\\.[0-9]+";
#endif
#endif
FILE *p = OpenPipe(TString::Format("%s '%s'", cLDD, exe), "r");
if (p) {
Expand Down Expand Up @@ -3282,10 +3249,8 @@ void TUnixSystem::CloseConnection(int sock, Bool_t force)
{
if (sock < 0) return;

#if !defined(R__AIX) || defined(_AIX41) || defined(_AIX43)
if (force)
::shutdown(sock, 2); // will also close connection of parent
#endif

while (::close(sock) == -1 && GetErrno() == EINTR)
ResetErrno();
Expand Down Expand Up @@ -4639,9 +4604,7 @@ static const char *DynamicPath(const char *newpath = nullptr, Bool_t reset = kFA
rdynpath = ".:"; rdynpath += TROOT::GetLibDir();
}
TString ldpath;
#if defined (R__AIX)
ldpath = gSystem->Getenv("LIBPATH");
#elif defined(R__MACOSX)
#if defined(R__MACOSX)
ldpath = gSystem->Getenv("DYLD_LIBRARY_PATH");
if (!ldpath.IsNull())
ldpath += ":";
Expand Down
21 changes: 0 additions & 21 deletions etc/Makefile.arch
Original file line number Diff line number Diff line change
Expand Up @@ -95,27 +95,6 @@ LDFLAGS = $(OPT2)
SOFLAGS = -shared
endif

ifeq ($(ARCH),aix5)
# IBM AIX >5.x xlC
CXX = xlC
CXXFLAGS = $(OPT)
LD = xlC
LDFLAGS = $(OPT)
SOFLAGS =
DllSuf = a
endif

ifeq ($(ARCH),aixgcc)
# IBM AIX >5.x with GCC
CXX = g++
CXXFLAGS = $(OPT)
LD = g++
LDFLAGS = $(OPT)
SOFLAGS = -shared
DllSuf = a
EXPLLINKLIBS = $(ROOTGLIBS)
endif

ifeq ($(ARCH),solaris)
# Solaris CC
CXX = /opt/SUNWspro/bin/CC
Expand Down
5 changes: 0 additions & 5 deletions graf2d/x11/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,3 @@ ROOT_STANDARD_LIBRARY_PACKAGE(GX11

target_include_directories(GX11 PRIVATE ${X11_INCLUDE_DIR})
target_include_directories(GX11 PRIVATE ../gifencode)


if(AIX)
target_include_directories(GX11 PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/inc)
endif()
3 changes: 0 additions & 3 deletions graf2d/x11/src/TGX11.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,6 @@ by Olivier Couet (package X11INT).
#include <cstdlib>
#include <cctype>
#include <unistd.h>
#ifdef R__AIX
# include <sys/socket.h>
#endif

#include "gifencode.h"
#include "gifdecode.h"
Expand Down
2 changes: 1 addition & 1 deletion io/dcache/src/TDCacheFile.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ TFile behaviour.
#ifndef R__WIN32
#include <unistd.h>
#if defined(R__SUN) || defined(R__HPUX) || \
defined(R__AIX) || defined(R__LINUX) || defined(R__SOLARIS) || \
defined(R__LINUX) || defined(R__SOLARIS) || \
defined(R__HIUX) || defined(R__FBSD) || defined(R__MACOSX) || \
defined(R__HURD) || defined(R__OBSD)
#define HAS_DIRENT
Expand Down
Loading
Loading