summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--winsup/mingw/ChangeLog6
-rwxr-xr-xwinsup/mingw/cpu_features.c2
-rw-r--r--winsup/mingw/crt1.c2
3 files changed, 8 insertions, 2 deletions
diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index 55bd53656..6cebfaa6d 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,5 +1,11 @@
2009-07-18 Gregory McGarry <gregorymcgarry@users.sourceforge.net>
+ * cpu_features.c: replace gcc-specific construct with portable alternative
+ and match the code a few lines above.
+ * crt1.c: remove gcc-specific noreturn attribute with mingw alternative
+
+2009-07-18 Gregory McGarry <gregorymcgarry@users.sourceforge.net>
+
* include/_mingw.h: Changes required for PCC compiler.
2009-07-18 Jeff Lu <jll544@yahoo.com>
diff --git a/winsup/mingw/cpu_features.c b/winsup/mingw/cpu_features.c
index 5e2c26557..00697347b 100755
--- a/winsup/mingw/cpu_features.c
+++ b/winsup/mingw/cpu_features.c
@@ -19,7 +19,7 @@
#define EDX_LM (1 << 29) /*LONG MODE */
#define __cpuid(level,a,b,c,d) \
- __asm__ __volatile__ ("cpuid;" \
+ asm volatile ("cpuid;" \
: "=a" (a), "=b" (b), "=c" (c), "=d" (d)\
: "0" (level))
diff --git a/winsup/mingw/crt1.c b/winsup/mingw/crt1.c
index 6ab7c1d56..ad3ed7147 100644
--- a/winsup/mingw/crt1.c
+++ b/winsup/mingw/crt1.c
@@ -181,7 +181,7 @@ _gnu_exception_handler (EXCEPTION_POINTERS * exception_data)
/*
* The function mainCRTStartup is the entry point for all console programs.
*/
-static void __attribute__((noreturn))
+static void __MINGW_ATTRIB_NORETURN
__mingw_CRTStartup (void)
{
int nRet;