[AIX][test-suite]Workaround other benchmarks affected by the _ALL_SOURCE issue on AIX

[amyk]

Summary

On AIX, there are typedefs and struct definitions required by test-suite tests that are only accessible when _ALL_SOURCE is set, but setting this macro causes side effects such as typedef redefinition. To fix them on AIX, we build test-suite with standard compatible mode (e.g., XOPEN_SOURCE=700), and either add missing definitions to the tests or adjust the tests to recognize that the extensions are disabled. This patch fixes benchmarks that were not handled in D118622.

[hubert.reinterpretcast]

LGTM; thanks!

MultiSource/Applications/ClamAV/clamscan_clamscan.c

 struct s_info info;
 short recursion = 0, printinfected = 0, bell = 0;
 
 int main(int argc, char **argv)
 {
   int ds, dms, ret;
   double mb;
   struct timeval t1, t2;
-#ifndef C_WINDOWS
+#if !defined(C_WINDOWS) && (!defined(_AIX) || defined(_ALL_SOURCE))
   struct timezone tz;
 #endif
   struct optstruct *opt;
   const char *pt;
 
 #if defined(C_WINDOWS) && defined(CL_THREAD_SAFE)
     if(!pthread_win32_process_attach_np()) {
   mprintf("!Can't start the win32 pthreads layer\n");

 
 #ifdef C_WINDOWS
     _set_fmode(_O_BINARY);
 #ifdef CL_DEBUG
     {
   _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_FILE);
   _CrtSetReportFile(_CRT_ERROR, _CRTDBG_FILE_STDERR);
     }
-#endif  
+#endif
+#endif
+#if defined(C_WINDOWS) || (defined(_AIX) && !defined(_ALL_SOURCE))
     gettimeofday(&t1, NULL);
 #else
     gettimeofday(&t1, &tz);
 #endif
 
     ret = scanmanager(opt);
 
     if(!opt_check(opt, "disable-summary") && !opt_check(opt, "no-summary")) {
-#ifdef C_WINDOWS
+#if defined(C_WINDOWS) || (defined(_AIX) && !defined(_ALL_SOURCE))
   gettimeofday(&t2, NULL);
 #else
   gettimeofday(&t2, &tz);
 #endif
   ds = t2.tv_sec - t1.tv_sec;
   dms = t2.tv_usec - t1.tv_usec;
   ds -= (dms < 0) ? (1):(0);
   dms += (dms < 0) ? (1000000):(0);

MultiSource/Benchmarks/MallocBench/espresso/port.h

 #ifndef PORT_H
 #define PORT_H
 
 #ifdef SABER
 #define volatile
 #endif
 
-#ifdef _IBMR2
-#define _BSD
-#ifndef _POSIX_SOURCE
-#define _POSIX_SOURCE   /* Argh!  IBM strikes again */
-#endif
-#ifndef _ALL_SOURCE
-#define _ALL_SOURCE   /* Argh!  IBM strikes again */
-#endif
-#ifndef _ANSI_C_SOURCE
-#define _ANSI_C_SOURCE    /* Argh!  IBM strikes again */
-#endif
-#endif
-
 /*
  * int32 should be defined as the most economical sized integer capable of
  * holding a 32 bit quantity
  * int16 should be similarly defined
  */
 
 /* XXX hack */
 #ifndef MACHDEP_INCLUDED

MultiSource/Benchmarks/MallocBench/gs/gp_unix.c

 copies.  */
 
 /* gp_unix.c */
 /* Unix-specific routines for Ghostscript */
 #include "string_.h"
 #include "gx.h"
 #include <time.h>
 #include <sys/time.h>
+#if _AIX && !defined(_ALL_SOURCE)
+struct timezone {
+  int tz_minuteswest;
+  int tz_dsttime;
+};
+#endif
 
 /* Do platform-dependent initialization */
 void
 gp_init()
 {
 }
 
 /* Read the current date (in days since Jan. 1, 1980) */

MultiSource/Benchmarks/MiBench/consumer-lame/formatBitstream.h

 #ifndef MAX_CHANNELS
 #define MAX_CHANNELS 2
 #endif
 
 #ifndef MAX_GRANULES
 #define MAX_GRANULES 2
 #endif
 
+#if _AIX && !defined(_ALL_SOURCE)
+typedef unsigned int   u_int;
+typedef unsigned short u_short;
+#endif
+
 /*
   This is the prototype for the function pointer you must
   provide to write bits to the bitstream. It should write
   'length' bits from 'value,' msb first. Bits in value are
   assumed to be right-justified.
 */
 void putMyBits( u_int value, u_int length );
 

MultiSource/Benchmarks/MiBench/consumer-lame/util.h

typedef struct  bit_stream_struc {
     int         buf_byte_idx;   /* pointer to top byte in buffer */
     int         buf_bit_idx;    /* pointer to top bit of top byte in buffer */
     
     /* format of file in rd mode (BINARY/ASCII) */
 } Bit_stream_struc;
 
 #include "l3side.h"
 
+#if _AIX && !defined(_ALL_SOURCE)
+typedef unsigned char  u_char;
+typedef unsigned int   u_int;
+typedef unsigned short u_short;
+typedef unsigned long  u_long;
+#endif
+
 /***********************************************************************
 *
 *  Global Variable External Declarations
 *
 ***********************************************************************/
 
 extern int      bitrate_table[2][15];
 

MultiSource/Benchmarks/MiBench/office-ispell/term.c

  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 /*
  * $Log$
+ *
+ * Revision 1.2  2020/03/23 12:59:43  stevenwan
+ * Add IBM AIX workaround.
+ *
  * Revision 1.1  2007/01/09 23:57:18  lattner
  * initial recheckin of mibench
  *
  * Revision 1.1.1.1  2007/01/09 02:59:05  evancheng
  * Add selected tests from MiBench 1.0 to LLVM test suite.
  *
  * Revision 1.48  1994/10/25  05:46:11  geoff
  * Fix a couple of places where ifdefs were omitted, though apparently

 #else
 #ifdef USG
 #include <termio.h>
 #else
 #include <sgtty.h>
 #endif
 #endif
 
+#if _AIX && !defined(_ALL_SOURCE)
+#ifdef TIOCGWINSZ
+#undef TIOCGWINSZ
+#endif
+#endif
+
 void    erase P ((void));
 void    move P ((int row, int col));
 void    inverse P ((void));
 void    normal P ((void));
 void    backup P ((void));
 static int  putch P ((int c));
 void    terminit P ((void));
 SIGNAL_TYPE done P ((int signo));

MultiSource/Benchmarks/Prolangs-C/archie-client/support.c

 /*
  * Copyright (c) 1989, 1990, 1991 by the University of Washington
  *
  * For copying and distribution information, please see the file
  * <copyright.h>.
  *
+ * V1.2.3 - 06/18/20 (sw)  - add IBM AIX fix
  * v1.2.2 - 11/19/91 (mmt) - added MSDOS & OS2 stuff
  * v1.2.1 - 09/23/91 (gf)  - made it use regex.h---much nicer
  * v1.2.0 - 09/17/91 (bpk) - added BULL & USG stuff, thanks to Jim Sillas
  * v1.1.1 - 08/30/91 (bpk) - added VMS support; cast index()
  */
 
 /*
  * Miscellaneous routines pulled from ~beta/lib/pfs and ~beta/lib/filters

 #  include <string.h>
 # else
 #  include <strings.h>
 # endif
 # ifndef CUTCP
 #  include <netdb.h>
 # endif
 # if !defined(MSDOS) || defined(OS2)
+// The header <sys/file.h> implicitly uses 'ushort', which is an
+// unknown type name to AIX when '_ALL_SOURCE' is not defined.
+#  if _AIX && !defined(_ALL_SOURCE)
+    typedef unsigned short ushort;
+#  endif
 #  include <sys/file.h>
 #  include <sys/param.h>
 # endif
 #endif /* VMS */
 
 #include <pfs.h>
 #include <pprot.h>
 #include <perrno.h>