From f9ba0c39282480f658a8f0f7917214ffa4a2bd73 Mon Sep 17 00:00:00 2001 From: midipix Date: Sun, 31 May 2015 13:33:20 -0400 Subject: normalize the midipix target builtins. + remove __NTAPI (never used, not needed). + change __MIDIPIX to __midipix__ (analogous to __linux__). + add __PE__ (analogous to __ELF__). signed-off by Z. Gilboa; see copying.midipix (9cd0746c) for additional information. --- gcc/config/i386/midipix.h | 4 ++-- libgcc/config/i386/64/_divtc3.c | 6 +++--- libgcc/config/i386/64/_multc3.c | 6 +++--- libgcc/config/i386/64/_powitf2.c | 6 +++--- libgcc/config/i386/64/eqtf2.c | 6 +++--- libgcc/config/i386/64/getf2.c | 6 +++--- libgcc/config/i386/64/letf2.c | 6 +++--- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/gcc/config/i386/midipix.h b/gcc/config/i386/midipix.h index 4abcda1f7..66dde99c6 100644 --- a/gcc/config/i386/midipix.h +++ b/gcc/config/i386/midipix.h @@ -371,8 +371,8 @@ static inline void midipix_extra_os_cpp_builtins(void) static inline void midipix_target_os_cpp_builtins(void) { - builtin_define_std("__NTAPI"); - builtin_define_std("__MIDIPIX"); + builtin_define_std("__PE__"); + builtin_define_std("__midipix__"); midipix_extra_os_cpp_builtins(); } diff --git a/libgcc/config/i386/64/_divtc3.c b/libgcc/config/i386/64/_divtc3.c index 9c5e19b1f..6b318cfc9 100644 --- a/libgcc/config/i386/64/_divtc3.c +++ b/libgcc/config/i386/64/_divtc3.c @@ -1,5 +1,5 @@ #ifdef SHARED -#ifndef __MIDIPIX +#ifndef __PE__ #define __divtc3 __divtc3_shared #endif #endif @@ -8,12 +8,12 @@ #include "libgcc2.c" #ifdef SHARED -#ifndef __MIDIPIX +#ifndef __PE__ #undef __divtc3 extern __typeof__ (__divtc3_shared) __divtc3_compat __attribute__((alias ("__divtc3_shared"))); #endif -#if !defined(_WIN32) && !defined(__MIDIPIX) +#if !defined(_WIN32) && !defined(__PE__) asm (".symver __divtc3_compat,__divtc3@GCC_4.0.0"); asm (".symver __divtc3_shared,__divtc3@@GCC_4.3.0"); #endif diff --git a/libgcc/config/i386/64/_multc3.c b/libgcc/config/i386/64/_multc3.c index 63f218060..d1ae5e178 100644 --- a/libgcc/config/i386/64/_multc3.c +++ b/libgcc/config/i386/64/_multc3.c @@ -1,5 +1,5 @@ #ifdef SHARED -#ifndef __MIDIPIX +#ifndef __PE__ #define __multc3 __multc3_shared #endif #endif @@ -8,12 +8,12 @@ #include "libgcc2.c" #ifdef SHARED -#ifndef __MIDIPIX +#ifndef __PE__ #undef __multc3 extern __typeof__ (__multc3_shared) __multc3_compat __attribute__((alias ("__multc3_shared"))); #endif -#if !defined(_WIN32) && !defined(__MIDIPIX) +#if !defined(_WIN32) && !defined(__PE__) asm (".symver __multc3_compat,__multc3@GCC_4.0.0"); asm (".symver __multc3_shared,__multc3@@GCC_4.3.0"); #endif diff --git a/libgcc/config/i386/64/_powitf2.c b/libgcc/config/i386/64/_powitf2.c index 4da3a18f0..591264129 100644 --- a/libgcc/config/i386/64/_powitf2.c +++ b/libgcc/config/i386/64/_powitf2.c @@ -1,5 +1,5 @@ #ifdef SHARED -#ifndef __MIDIPIX +#ifndef __PE__ #define __powitf2 __powitf2_shared #endif #endif @@ -8,12 +8,12 @@ #include "libgcc2.c" #ifdef SHARED -#ifndef __MIDIPIX +#ifndef __PE__ #undef __powitf2 extern __typeof__ (__powitf2_shared) __powitf2_compat __attribute__((alias ("__powitf2_shared"))); #endif -#if !defined(_WIN32) && !defined(__MIDIPIX) +#if !defined(_WIN32) && !defined(__PE__) asm (".symver __powitf2_compat,__powitf2@GCC_4.0.0"); asm (".symver __powitf2_shared,__powitf2@@GCC_4.3.0"); #endif diff --git a/libgcc/config/i386/64/eqtf2.c b/libgcc/config/i386/64/eqtf2.c index e257e834c..9327291b7 100644 --- a/libgcc/config/i386/64/eqtf2.c +++ b/libgcc/config/i386/64/eqtf2.c @@ -1,5 +1,5 @@ #ifdef SHARED -#ifndef __MIDIPIX +#ifndef __PE__ #define __netf2 __netf2_shared #endif #endif @@ -7,12 +7,12 @@ #include "config/soft-fp/eqtf2.c" #ifdef SHARED -#ifndef __MIDIPIX +#ifndef __PE__ #undef __netf2 strong_alias (__netf2_shared, __netf2_compat); #endif -#if !defined(_WIN32) && !defined(__MIDIPIX) +#if !defined(_WIN32) && !defined(__PE__) asm (".symver __netf2_compat,__netf2@GCC_3.0"); asm (".symver __netf2_shared,__netf2@@GCC_4.3.0"); #endif diff --git a/libgcc/config/i386/64/getf2.c b/libgcc/config/i386/64/getf2.c index 19cce1408..696c9a57b 100644 --- a/libgcc/config/i386/64/getf2.c +++ b/libgcc/config/i386/64/getf2.c @@ -1,5 +1,5 @@ #ifdef SHARED -#ifndef __MIDIPIX +#ifndef __PE__ #define __gttf2 __gttf2_shared #endif #endif @@ -7,12 +7,12 @@ #include "config/soft-fp/getf2.c" #ifdef SHARED -#ifndef __MIDIPIX +#ifndef __PE__ #undef __gttf2 strong_alias (__gttf2_shared, __gttf2_compat); #endif -#if !defined(_WIN32) && !defined(__MIDIPIX) +#if !defined(_WIN32) && !defined(__PE__) asm (".symver __gttf2_compat,__gttf2@GCC_3.0"); asm (".symver __gttf2_shared,__gttf2@@GCC_4.3.0"); #endif diff --git a/libgcc/config/i386/64/letf2.c b/libgcc/config/i386/64/letf2.c index 32b763d74..17497a85c 100644 --- a/libgcc/config/i386/64/letf2.c +++ b/libgcc/config/i386/64/letf2.c @@ -1,5 +1,5 @@ #ifdef SHARED -#ifndef __MIDIPIX +#ifndef __PE__ #define __lttf2 __lttf2_shared #endif #endif @@ -7,12 +7,12 @@ #include "config/soft-fp/letf2.c" #ifdef SHARED -#ifndef __MIDIPIX +#ifndef __PE__ #undef __lttf2 strong_alias (__lttf2_shared, __lttf2_compat); #endif -#if !defined(_WIN32) && !defined(__MIDIPIX) +#if !defined(_WIN32) && !defined(__PE__) asm (".symver __lttf2_compat,__lttf2@GCC_3.0"); asm (".symver __lttf2_shared,__lttf2@@GCC_4.3.0"); #endif -- cgit v1.2.3