From a4afe79f3d10338c09bb3705134245b8aa999462 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 21 Oct 2008 13:17:55 +0000 Subject: [PATCH] - Fixed GCC autoseg stuff for DECORATE variable initialization. SVN r1273 (trunk) --- src/autozend.cpp | 2 +- src/thingdef/thingdef.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/autozend.cpp b/src/autozend.cpp index 93e50befd..0e7c2e5da 100644 --- a/src/autozend.cpp +++ b/src/autozend.cpp @@ -58,7 +58,7 @@ void *MRegTail = 0; void *ARegTail __attribute__((section(AREG_SECTION))) = 0; void *CRegTail __attribute__((section(CREG_SECTION))) = 0; void *GRegTail __attribute__((section(GREG_SECTION))) = 0; -void *MRegTail __attribute__((section(GREG_SECTION))) = 0; +void *MRegTail __attribute__((section(MREG_SECTION))) = 0; #elif diff --git a/src/thingdef/thingdef.h b/src/thingdef/thingdef.h index 3f982f5a4..15a8132c5 100644 --- a/src/thingdef/thingdef.h +++ b/src/thingdef/thingdef.h @@ -326,11 +326,11 @@ int MatchString (const char *in, const char **strings); #define DEFINE_GLOBAL_VARIABLE(name) \ static FVariableInfo GlobalDef__##name = { #name, intptr_t(&name), NULL }; \ - MSVC_MSEG FVariableInfo *infoptr_GlobalDef__##name = &GlobalDef__##name; + MSVC_MSEG FVariableInfo *infoptr_GlobalDef__##name GCC_MSEG = &GlobalDef__##name; #define DEFINE_MEMBER_VARIABLE(name, cls) \ static FVariableInfo GlobalDef__##name = { #name, myoffsetof(cls, name), RUNTIME_CLASS(cls) }; \ - MSVC_MSEG FVariableInfo *infoptr_GlobalDef__##name = &GlobalDef__##name; + MSVC_MSEG FVariableInfo *infoptr_GlobalDef__##name GCC_MSEG = &GlobalDef__##name;