about summary refs log tree commit diff stats
path: root/src
diff options
context:
space:
mode:
authorptitSeb <sebastien.chev@gmail.com>2024-01-06 10:30:31 +0100
committerptitSeb <sebastien.chev@gmail.com>2024-01-06 10:30:31 +0100
commitcbea2b544367675f710ebab74f4056ca1d18c203 (patch)
treed75880feec24f8a72ecd3982b74a059e486017c7 /src
parenta891e1f85da252aa609458ecdc4d71fe6d147189 (diff)
downloadbox64-cbea2b544367675f710ebab74f4056ca1d18c203.tar.gz
box64-cbea2b544367675f710ebab74f4056ca1d18c203.zip
Rollback commit 9201559 as it breaks some programs using getopts (should help #1190)
Diffstat (limited to 'src')
-rw-r--r--src/librarian/globalsymbols.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librarian/globalsymbols.c b/src/librarian/globalsymbols.c
index 6d96720b..462af7fb 100644
--- a/src/librarian/globalsymbols.c
+++ b/src/librarian/globalsymbols.c
@@ -20,7 +20,7 @@
     if (GetGlobalNoWeakSymbolStartEnd(my_context->maplib, #A, &globoffs, &globend, -1, NULL, NULL)) {     \

         printf_log(LOG_DEBUG, "Global " #A " workaround, @%p <- %p\n", (void*)globoffs, &A);              \

         memcpy((void*)globoffs, &A, sizeof(A));                                                           \

-    } else                                                                                                \

+    }                                                                                                     \

     if (B && GetGlobalNoWeakSymbolStartEnd(my_context->maplib, #A, &globoffs, &globend, -1, NULL, B)) {   \

         printf_log(LOG_DEBUG, "Global " #A " workaround, @%p <- %p\n", (void*)globoffs, &A);              \

         memcpy((void*)globoffs, &A, sizeof(A));                                                           \

@@ -30,7 +30,7 @@
     if (GetGlobalNoWeakSymbolStartEnd(my_context->maplib, #A, &globoffs, &globend, -1, NULL, NULL)) {     \

         printf_log(LOG_DEBUG, "Global " #A " workaround, @%p -> %p\n", (void*)globoffs, &A);              \

         memcpy(&A, (void*)globoffs, sizeof(A));                                                           \

-    } else                                                                                                \

+    }                                                                                                     \

     if (B && GetGlobalNoWeakSymbolStartEnd(my_context->maplib, #A, &globoffs, &globend, -1, NULL, B)) {   \

         printf_log(LOG_DEBUG, "Global " #A " workaround, @%p -> %p\n", (void*)globoffs, &A);              \

         memcpy(&A, (void*)globoffs, sizeof(A));                                                           \