Ticket #11810: 0001-tools-build-convert-sun-__sun-for-strict-ISO-compile.patch

File 0001-tools-build-convert-sun-__sun-for-strict-ISO-compile.patch, 2.9 KB (added by Richard PALO <richard@…>, 7 years ago)

patchset for tools/build convert 'sun' => 'sun'

  • src/engine/boehm_gc/include/gc_config_macros.h 

    From f5fadf1016be1efdf91b1ff5c3323df54a101382 Mon Sep 17 00:00:00 2001
From: Richard PALO <richard@NetBSD.org>
Date: Sat, 21 Nov 2015 06:57:09 +0100
Subject: [PATCH] tools/build convert sun=>__sun for strict ISO compilers

Signed-off-by: Richard PALO <richard@NetBSD.org>
---
 src/engine/boehm_gc/include/gc_config_macros.h |  2 +-
 src/engine/boehm_gc/include/private/gcconfig.h | 10 +++++-----
 src/engine/jam.h                               |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/engine/boehm_gc/include/gc_config_macros.h b/src/engine/boehm_gc/include/gc_config_macros.h
index 762162a..21d870f 100644
    a b  
    9595#   define GC_PTHREADS
    9696# endif
    9797# if defined(__sparc) && !defined(__linux__) \
    98      || defined(sun) && (defined(i386) || defined(__i386__))
     98     || defined(__sun) && (defined(i386) || defined(__i386__))
    9999#   define GC_SOLARIS_THREADS
    100100#   define GC_PTHREADS
    101101# endif

  • src/engine/boehm_gc/include/private/gcconfig.h 

    diff --git a/src/engine/boehm_gc/include/private/gcconfig.h b/src/engine/boehm_gc/include/private/gcconfig.h
index 61cf9ea..be54b6b 100644
    a b  
    6969#      define mach_type_known
    7070#    endif
    7171# endif
    72 # if defined(sun) && defined(mc68000)
     72# if defined(__sun) && defined(mc68000)
    7373#    error SUNOS4 no longer supported
    7474# endif
    7575# if defined(hp9000s300)
    … …  
    141141#    define SEQUENT
    142142#    define mach_type_known
    143143# endif
    144 # if defined(sun) && (defined(i386) || defined(__i386__))
     144# if defined(__sun) && (defined(i386) || defined(__i386__))
    145145#    define I386
    146146#    define SOLARIS
    147147#    define mach_type_known
    148148# endif
    149 # if defined(sun) && defined(__amd64)
     149# if defined(__sun) && defined(__amd64)
    150150#    define X86_64
    151151#    define SOLARIS
    152152#    define mach_type_known
    … …  
    159159# if defined(ibm032)
    160160#   error IBM PC/RT no longer supported.
    161161# endif
    162 # if defined(sun) && (defined(sparc) || defined(__sparc))
     162# if defined(__sun) && (defined(sparc) || defined(__sparc))
    163163#   define SPARC
    164164    /* Test for SunOS 5.x */
    165165#     include <errno.h>
    166166#     define SOLARIS
    167167#   define mach_type_known
    168168# endif
    169 # if defined(sparc) && defined(unix) && !defined(sun) && !defined(linux) \
     169# if defined(sparc) && defined(unix) && !defined(__sun) && !defined(linux) \
    170170     && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__) \
    171171     && !defined(__DragonFly__)
    172172#   define SPARC

  • src/engine/jam.h 

    diff --git a/src/engine/jam.h b/src/engine/jam.h
index b9d415e..db3a37f 100644
    a b  
    257257    #define OSMINOR "OS=SINIX"
    258258    #define OS_SINIX
    259259#endif
    260 #ifdef sun
     260#ifdef __sun
    261261    #if defined(__svr4__) || defined(__SVR4)
    262262        #define OSMINOR "OS=SOLARIS"
    263263        #define OS_SOLARIS