Merge pull request #142 from andreas-schwab/master

Fix compilation on arm by adjusting asm ifunc directive
amonakov · Jul 11, 2014 · 4e00012 · 4e00012
2 parents 0748176 + 3cc169b
commit 4e00012
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/libglfork.cpp b/libglfork.cpp
@@ -915,7 +915,7 @@ ret name par \
 #define DEF_GLX_PROTO(ret, name, par, ...) \
 static ret l##name par \
 { return primus.afns.name(__VA_ARGS__); } \
-asm(".type " #name ", @gnu_indirect_function"); \
+asm(".type " #name ", %gnu_indirect_function"); \
 void *ifunc_##name(void) asm(#name) __attribute__((visibility("default"))); \
 void *ifunc_##name(void) \
 { return primus.afns.handle ? real_dlsym(primus.afns.handle, #name) : (void*)l##name; }
@@ -1006,7 +1006,7 @@ const char *glXQueryExtensionsString(Display *dpy, int screen)
 
 // OpenGL extension forwarders
 #define P(name) \
-asm(".type " #name ", @gnu_indirect_function"); \
+asm(".type " #name ", %gnu_indirect_function"); \
 void *ifunc_##name(void) asm(#name) __attribute__((visibility("default"))); \
 void *ifunc_##name(void) \
 { return primus.afns.handle ? real_dlsym(primus.afns.handle, #name) : NULL; }