diff options
author | Mike Pall <mike> | 2013-06-03 17:32:09 +0200 |
---|---|---|
committer | Mike Pall <mike> | 2013-06-03 17:32:09 +0200 |
commit | e92d64a841a068a29364a58357063b71c5b774a2 (patch) | |
tree | 0c7a57105e03ad61e832414ff97980ad1e25611a /src/host/buildvm.c | |
parent | 45f3ee87945e69f9e601dbe5d5f3708d00926e4d (diff) | |
parent | 338e9863c220462201fde0e725aba4002310c849 (diff) | |
download | luajit-e92d64a841a068a29364a58357063b71c5b774a2.tar.gz luajit-e92d64a841a068a29364a58357063b71c5b774a2.tar.bz2 luajit-e92d64a841a068a29364a58357063b71c5b774a2.zip |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/host/buildvm.c')
-rw-r--r-- | src/host/buildvm.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/host/buildvm.c b/src/host/buildvm.c index ef5f7fb9..ce892006 100644 --- a/src/host/buildvm.c +++ b/src/host/buildvm.c | |||
@@ -108,10 +108,16 @@ static const char *sym_decorate(BuildCtx *ctx, | |||
108 | sprintf(name, "%s%s%s", symprefix, prefix, suffix); | 108 | sprintf(name, "%s%s%s", symprefix, prefix, suffix); |
109 | p = strchr(name, '@'); | 109 | p = strchr(name, '@'); |
110 | if (p) { | 110 | if (p) { |
111 | #if LJ_TARGET_X86ORX64 | ||
111 | if (!LJ_64 && (ctx->mode == BUILD_coffasm || ctx->mode == BUILD_peobj)) | 112 | if (!LJ_64 && (ctx->mode == BUILD_coffasm || ctx->mode == BUILD_peobj)) |
112 | name[0] = '@'; | 113 | name[0] = '@'; |
113 | else | 114 | else |
114 | *p = '\0'; | 115 | *p = '\0'; |
116 | #elif (LJ_TARGET_PPC || LJ_TARGET_PPCSPE) && !LJ_TARGET_CONSOLE | ||
117 | /* Keep @plt. */ | ||
118 | #else | ||
119 | *p = '\0'; | ||
120 | #endif | ||
115 | } | 121 | } |
116 | p = (char *)malloc(strlen(name)+1); /* MSVC doesn't like strdup. */ | 122 | p = (char *)malloc(strlen(name)+1); /* MSVC doesn't like strdup. */ |
117 | strcpy(p, name); | 123 | strcpy(p, name); |