From 66a5031c4c3b418eab9561bed429e9efc3e432a3 Mon Sep 17 00:00:00 2001
From: Jacob Alexander <haata@kiibohd.com>
Date: Sun, 14 Sep 2014 20:07:40 -0700
Subject: [PATCH] Fixing Mac OSX arm build options.

- Bootloader doesn't build correctly on gcc 4.7.3 (LTO issues)
- Even disabling isn't good enough
- 4.9.1 is known to work on Arch Linux
---
 Bootloader/CMakeLists.txt | 13 +++++++++++++
 Lib/CMake/arm.cmake       |  5 ++---
 Lib/CMake/build.cmake     |  4 ++--
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/Bootloader/CMakeLists.txt b/Bootloader/CMakeLists.txt
index b8cb8a0..00a9c16 100644
--- a/Bootloader/CMakeLists.txt
+++ b/Bootloader/CMakeLists.txt
@@ -112,6 +112,19 @@ endif()
 
 
 
+###
+# Disable -Wl,-search_paths_first for OSX (not supported by arm-none-eabi-gcc)
+#
+
+if ( APPLE )
+	string ( REPLACE "-Wl,-search_paths_first" "" CMAKE_C_LINK_FLAGS ${CMAKE_C_LINK_FLAGS} )
+	string ( REPLACE "-Wl,-search_paths_first" "" CMAKE_CXX_LINK_FLAGS ${CMAKE_CXX_LINK_FLAGS} )
+
+	message ( AUTHOR_WARNING "Bootloader binary may not fit on device (must be less than 4096 bytes). Macports arm-none-eabi-gcc 4.7.3 doesn't seem to work properly with -flto. However, even disabling it doesn't shrink the binary enough... 4.9.1 is known to work on Arch Linux." )
+endif ()
+
+
+
 ###
 # Build Targets
 #
diff --git a/Lib/CMake/arm.cmake b/Lib/CMake/arm.cmake
index be2c8b3..4b3d320 100644
--- a/Lib/CMake/arm.cmake
+++ b/Lib/CMake/arm.cmake
@@ -122,7 +122,7 @@ set( WARN "-Wall -ggdb3" )
 #|  -f...:        tuning, see GCC manual
 #| NOTE: -fshort-wchar is specified to allow USB strings be passed conveniently
 if( BOOTLOADER )
-	set( TUNING "-D_bootloader_ -Wno-main -msoft-float -mthumb -fplan9-extensions -ffunction-sections -fdata-sections -fno-builtin -fstrict-volatile-bitfields -flto -fno-use-linker-plugin" )
+	set( TUNING "-D_bootloader_ -Wno-main -msoft-float -mthumb -fplan9-extensions -ffunction-sections -fdata-sections -fno-builtin -fstrict-volatile-bitfields -flto -fno-use-linker-plugin -nostdlib" )
 	#set( TUNING "-mthumb -fdata-sections -ffunction-sections -fno-builtin -msoft-float -fstrict-volatile-bitfields -flto -fno-use-linker-plugin -fwhole-program -Wno-main -nostartfiles -fplan9-extensions -D_bootloader_" )
 else()
 	set( TUNING "-mthumb -nostdlib -fdata-sections -ffunction-sections -fshort-wchar -fno-builtin -nostartfiles" )
@@ -156,10 +156,9 @@ add_definitions( "-mcpu=${CPU} -DF_CPU=${F_CPU} -D_${CHIP}_=1 -O${OPT} ${TUNING}
 if( BOOTLOADER )
 	# Bootloader linker flags
 	set( LINKER_FLAGS "${TUNING} -Wl,--gc-sections -fwhole-program -T${CMAKE_CURRENT_SOURCE_DIR}/../Lib/${CHIP}.bootloader.ld -nostartfiles -Wl,-Map=link.map" )
-	#set( LINKER_FLAGS "-Wl,-Map=link.map,--cref -Wl,--gc-sections -Wl,--no-wchar-size-warning -T${CMAKE_CURRENT_SOURCE_DIR}/../Lib/${CHIP}.bootloader.ld" )
 else()
 	# Normal linker flags
-	set( LINKER_FLAGS "-Wl,-Map=link.map,--cref -Wl,--gc-sections -Wl,--no-wchar-size-warning -T${CMAKE_CURRENT_SOURCE_DIR}/Lib/${CHIP}.ld" )
+	set( LINKER_FLAGS "${TUNING} -Wl,-Map=link.map,--cref -Wl,--gc-sections -Wl,--no-wchar-size-warning -T${CMAKE_CURRENT_SOURCE_DIR}/Lib/${CHIP}.ld" )
 endif()
 
 
diff --git a/Lib/CMake/build.cmake b/Lib/CMake/build.cmake
index 54f2fd2..ece5ee2 100644
--- a/Lib/CMake/build.cmake
+++ b/Lib/CMake/build.cmake
@@ -8,10 +8,10 @@
 
 
 ###
-# Disable -Wl,-search_paths_first for AVR on OSX (not supported by avr-gcc)
+# Disable -Wl,-search_paths_first for OSX (not supported by avr-gcc or arm-none-eabi-gcc)
 #
 
-if ( "${CPU}" STREQUAL "megaAVR" AND APPLE )
+if ( APPLE )
 	string ( REPLACE "-Wl,-search_paths_first" "" CMAKE_C_LINK_FLAGS ${CMAKE_C_LINK_FLAGS} )
 	string ( REPLACE "-Wl,-search_paths_first" "" CMAKE_CXX_LINK_FLAGS ${CMAKE_CXX_LINK_FLAGS} )
 endif ()