uhk/bootloader
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: uhk:v1.0.1
Branches Tags
uhk:master uhk:chore-change-xcode-project-settings
uhk:v1.0.1 uhk:v1.0.0 uhk:1.0.0 uhk:before-por
...
compare: uhk:chore-change-xcode-project-settings
Branches Tags
uhk:master uhk:chore-change-xcode-project-settings
uhk:v1.0.1 uhk:v1.0.0 uhk:1.0.0 uhk:before-por

3 Commits
v1.0.1 ... chore-chan

Author SHA1 Message Date
Róbert Kiss
3ae1ff231d chore: add mac blhost binary 2018-08-21 21:02:40 +02:00
Róbert Kiss
0ca41901b5 chore: change xcode configuration to be similar with linux settings 2018-08-21 20:42:48 +02:00
László Monda
85892581f7 In order to avoid blhost segfaults, statically link it, and set its architecture to x86-64 so that it won't contain special instructions. 
This change was made by @iprok. See https://github.com/UltimateHackingKeyboard/agent/issues/681#issuecomment-403057795
 2018-07-08 18:21:43 +02:00
3 changed files with 675 additions and 675 deletions
Expand all files Collapse all files

BIN
bin/Tools/blhost/mac/blhost
View File

Binary file not shown.

8
validation/blhost.xcodeproj/project.pbxproj
View File

@@ -566,7 +566,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LIBRARY = "libc++"; CLANG_CXX_LIBRARY = "libc++";
CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_EMPTY_BODY = YES;
@@ -574,7 +574,7 @@
CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
GCC_C_LANGUAGE_STANDARD = gnu99; GCC_C_LANGUAGE_STANDARD = c99;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
@@ -604,7 +604,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LIBRARY = "libc++"; CLANG_CXX_LIBRARY = "libc++";
CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_EMPTY_BODY = YES;
@@ -613,7 +613,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_C_LANGUAGE_STANDARD = gnu99; GCC_C_LANGUAGE_STANDARD = c99;
GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
NDEBUG, NDEBUG,

6
validation/blhost/gcc/Makefile
View File

@@ -38,8 +38,8 @@ INCLUDES += $(BOOT_ROOT)/validation/blhost/src \
$(BOOT_ROOT)/src/drivers/common \ $(BOOT_ROOT)/src/drivers/common \
$(BOOT_ROOT)/src/bm_usb $(BOOT_ROOT)/src/bm_usb
CXXFLAGS := -D LINUX -D BOOTLOADER_HOST -std=c++11 CXXFLAGS := -D LINUX -D BOOTLOADER_HOST -std=c++11 -march=x86-64 -mtune=generic
CFLAGS := -std=c99 -D LINUX -D BOOTLOADER_HOST -D _GNU_SOURCE CFLAGS := -std=c99 -D LINUX -D BOOTLOADER_HOST -D _GNU_SOURCE -mtune=generic -march=x86-64
LD := g++ LD := g++
SOURCES := $(BOOT_ROOT)/validation/blhost/src/blhost.cpp \ SOURCES := $(BOOT_ROOT)/validation/blhost/src/blhost.cpp \
@@ -199,7 +199,7 @@ $(MAKE_TARGET): $(OBJECTS_ALL)
@$(call printmessage,link,Linking, $(APP_NAME)) @$(call printmessage,link,Linking, $(APP_NAME))
$(at)$(LD) $(LDFLAGS) \ $(at)$(LD) $(LDFLAGS) \
$(OBJECTS_ALL) \ $(OBJECTS_ALL) \
-lc -lstdc++ -lm -ludev \ -static -lc -lstdc++ -lm -ludev -lrt \
-o $@ -o $@
@echo "Output binary:" ; echo " $(APP_NAME)" @echo "Output binary:" ; echo " $(APP_NAME)"