i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reverted r21757 which is now fixed by the following

Browse Source 
added $(HAIKU_GCC_LIBGCC) to HAIKU_KERNEL_ADDON_END_GLUE_CODE as suggested by Ingo


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21795 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2007-08-02 17:50:17 +00:00
parent 69f6c88d58
commit d96381dd5d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildSetup
+2 -2
View File
@@ -306,7 +306,7 @@ HAIKU_EXECUTABLE_BEGIN_GLUE_CODE =
; ;
HAIKU_EXECUTABLE_END_GLUE_CODE = $(HAIKU_LIBRARY_END_GLUE_CODE) ; HAIKU_EXECUTABLE_END_GLUE_CODE = $(HAIKU_LIBRARY_END_GLUE_CODE) ;
HAIKU_KERNEL_ADDON_BEGIN_GLUE_CODE = crtbegin.o ; HAIKU_KERNEL_ADDON_BEGIN_GLUE_CODE = crtbegin.o ;
HAIKU_KERNEL_ADDON_END_GLUE_CODE = crtend.o ; HAIKU_KERNEL_ADDON_END_GLUE_CODE = $(HAIKU_GCC_LIBGCC) crtend.o ;
SEARCH on crtbegin.o crtend.o = $(HAIKU_GCC_LIB_DIR) ; SEARCH on crtbegin.o crtend.o = $(HAIKU_GCC_LIB_DIR) ;
@@ -747,7 +747,7 @@ if $(TARGET_PLATFORM) = libbe_test {
# common stuff # common stuff
# start with a clean slate # start with a clean state
CCFLAGS = ; CCFLAGS = ;
C++FLAGS = ; C++FLAGS = ;
DEFINES = ; DEFINES = ;
src/add-ons/kernel/partitioning_systems/intel/intel.cpp
+1 -1
View File
@@ -1542,7 +1542,7 @@ move_partition(int fd, off_t fromOffset, off_t toOffset, off_t size,
return error; return error;
fromOffset += buffer_size; fromOffset += buffer_size;
toOffset += buffer_size; toOffset += buffer_size;
update_disk_device_job_progress(job, i * 1.0 / cycleCount); update_disk_device_job_progress(job, (float)i / cycleCount);
} }
if (remainingSize) if (remainingSize)
error = move_block(fd, fromOffset, toOffset, buffer, remainingSize); error = move_block(fd, fromOffset, toOffset, buffer, remainingSize);