Merge pull request #371 from compnerd/llp64
BlocksRuntime: match the ABI specification for LLP64
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3aafa87..e895217 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -91,15 +91,15 @@
option(ENABLE_TESTING "build libdispatch tests" ON)
-option(USE_LLD_LINKER "use the lld linker" OFF)
+option(USE_LLD_LINKER "use the lld linker" FALSE)
-if(CMAKE_SYSTEM_NAME STREQUAL Linux OR
- CMAKE_SYSTEM_NAME STREQUAL FreeBSD OR
- CMAKE_SYSTEM_NAME STREQUAL Android AND
- NOT USE_LLD_LINKER)
- set(USE_GOLD_LINKER_DEFAULT ON)
+if(NOT USE_LLD_LINKER AND
+ (CMAKE_SYSTEM_NAME STREQUAL Linux OR
+ CMAKE_SYSTEM_NAME STREQUAL FreeBSD OR
+ CMAKE_SYSTEM_NAME STREQUAL Android))
+ set(USE_GOLD_LINKER_DEFAULT TRUE)
else()
- set(USE_GOLD_LINKER_DEFAULT OFF)
+ set(USE_GOLD_LINKER_DEFAULT FALSE)
endif()
option(USE_GOLD_LINKER "use the gold linker" ${USE_GOLD_LINKER_DEFAULT})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f01993b..b817674 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -63,7 +63,8 @@
PRIVATE
shims/generic_sys_queue.h
shims/generic_win_stubs.c
- shims/generic_win_stubs.h)
+ shims/generic_win_stubs.h
+ shims/getprogname.c)
endif()
if(DISPATCH_USE_INTERNAL_WORKQUEUE)
target_sources(dispatch
diff --git a/src/shims/getprogname.c b/src/shims/getprogname.c
new file mode 100644
index 0000000..996840a
--- /dev/null
+++ b/src/shims/getprogname.c
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2009-2010 Mark Heily <mark@heily.com>
+ * All rights reserved.
+ *
+ * @APPLE_APACHE_LICENSE_HEADER_START@
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @APPLE_APACHE_LICENSE_HEADER_END@
+ */
+
+#include "getprogname.h"
+
+#if !HAVE_GETPROGNAME
+
+#if defined(_WIN32)
+#define WIN32_LEAN_AND_MEAN
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT 0x0600
+#endif /* _WIN32_WINNT */
+#include <windows.h>
+#include <stdlib.h>
+
+static INIT_ONCE getprogname_init_once = INIT_ONCE_STATIC_INIT;
+static TCHAR progname[_MAX_FNAME];
+
+static BOOL CALLBACK
+getprogname_init_once_handler(PINIT_ONCE InitOnce, PVOID Parameter,
+ PVOID *lpContext)
+{
+ TCHAR path[MAX_PATH];
+ DWORD length = GetModuleFileName(NULL, path, sizeof(path));
+
+ if (length < 0) {
+ progname[0] = '\0';
+ return TRUE;
+ } else {
+ const char *filename;
+
+ path[MAX_PATH - 1] = '\0';
+ filename = strrchr(path, '\\');
+ if (filename != NULL) {
+ filename++;
+ } else {
+ filename = path;
+ }
+ strcpy_s(progname, sizeof(progname), filename);
+ return TRUE;
+ }
+}
+
+const char *
+getprogname(void)
+{
+ (void)InitOnceExecuteOnce(&getprogname_init_once,
+ getprogname_init_once_handler,
+ NULL,
+ NULL);
+ return progname;
+}
+#endif /* _WIN32 */
+#endif /* HAVE_GETPROGNAME */
diff --git a/src/shims/getprogname.h b/src/shims/getprogname.h
index 49c7187..a768eed 100644
--- a/src/shims/getprogname.h
+++ b/src/shims/getprogname.h
@@ -30,6 +30,10 @@
extern const char *__progname;
#endif /* __ANDROID */
+#if defined(_WIN32)
+const char *getprogname(void);
+#else
+
static inline char *
getprogname(void)
{
@@ -41,6 +45,7 @@
# error getprogname(3) is not available on this platform
# endif
}
+#endif /* _WIN32 */
#endif /* HAVE_GETPROGNAME */
#endif /* __DISPATCH_SHIMS_GETPROGNAME__ */
