--- a/asm/Makefile
+++ b/asm/Makefile
@@ -1,7 +1,7 @@
CC = gcc -g -ggdb
CFLAGS = -Wall -O2 -Iinclude
LDFLAGS =
- NASM = nasm -f elf -Iinclude/
+ NASM = nasm -f elf64 -Iinclude/
TARGET = stackinfo
OBJECTS = main.o
OBJECTS += get_sp.o
--- a/asm/get_sp.asm
+++ b/asm/get_sp.asm
@@ -7,26 +7,26 @@
segment .data
label1 db "NASM Powered...", 10, 0
-reg_format db "EAX=%08x EBX=%08x ECX=%08x EDX=%08x", 10, 0
-st_format db "EBP=%08x ESP=%08x ESI=%08x EDI=%08x", 10, 10, 0
-trace_fmt db "[EBP-20] = %08x", 10, \
- "[EBP-16] = %08x", 10, "[EBP-12] = %08x", 10, \
- "[EBP- 8] = %08x", 10, "[EBP- 4] = %08x", 10, \
- "[EBP+ 0] = %08x", 10, "[EBP+ 4] = %08x", 10, \
- "[EBP+ 8] = %08x", 10, "[EBP+12] = %08x", 10, \
- "[EBP+16] = %08x", 10, "[EBP+20] = %08x", 10, 10, 0
+reg_format db "EAX=%08x EBX=%08x ECX=%08x EDX=%08x", 10, 0
+st_format db "EBP=%08x ESP=%08x ESI=%08x EDI=%08x", 10, 10, 0
+trace_fmt db "[EBP-20] = %08x", 10, \
+ "[EBP-16] = %08x", 10, "[EBP-12] = %08x", 10, \
+ "[EBP- 8] = %08x", 10, "[EBP- 4] = %08x", 10, \
+ "[EBP+ 0] = %08x", 10, "[EBP+ 4] = %08x", 10, \
+ "[EBP+ 8] = %08x", 10, "[EBP+12] = %08x", 10, \
+ "[EBP+16] = %08x", 10, "[EBP+20] = %08x", 10, 10, 0
segment .bss
savexp resd 1 ;; uninitialized dword value
- ;; currently not used
+ ;; currently not used
segment .text
global get_sp
get_sp:
- enter 4,0 ;; push ebp ;; Save Base-Pointer
- ;; mov ebp, esp ;; Copy Stackpointer for !!local usage!!
- ;; sub esp, 4 ;; Make room for 1 DWORD
+ enter 4,0 ;; push ebp ;; Save Base-Pointer
+ ;; mov ebp, esp ;; Copy Stackpointer for !!local usage!!
+ ;; sub esp, 4 ;; Make room for 1 DWORD
mov [ebp-4], esp ;; Store result in !! local variable !!
@@ -46,5 +46,5 @@
;; clean up
mov eax, [ebp-4] ;; return local var
- leave ;; mov esp, ebp pop ebp
- ret ;; return eax
+ leave ;; mov esp, ebp pop ebp
+ ret ;; return eax
--- a/asm/include/asm/tools.inc
+++ b/asm/include/asm/tools.inc
@@ -15,7 +15,7 @@
push reg_format
call printf ;; printf modifies eax
- mov eax, [esp+4] ;; restore eax
+ mov eax, [esp+4] ;; restore eax
leave
ret
--- a/bluetooth/Makefile
+++ b/bluetooth/Makefile
@@ -26,11 +26,11 @@
bluetooth: bluetooth.o
@echo Linking $< ...
- @$(CC) $(LDFLAGS) -lbluetooth -o $@ $<
+ @$(CC) $< $(LDFLAGS) -lbluetooth -o $@
bluetooth-client: bluetooth-client.o
@echo Linking $< ...
- @$(CC) $(LDFLAGS) -lbluetooth -o $@ $<
+ @$(CC) $< $(LDFLAGS) -lbluetooth -o $@
.PHONY: beauty clean uninstall
--- a/libConsole/Makefile
+++ b/libConsole/Makefile
@@ -13,10 +13,10 @@
ifdef JAVA_HOME
JAVA_DIR="$(JAVA_HOME)"
else
- JAVA_DIR=/usr/lib/jvm/java-6-sun
+ JAVA_DIR=/usr/lib/jvm/java-6-openjdk-amd64
endif
-INCLUDE = -I$(JAVA_DIR)/include -I$(JAVA_DIR)/include/linux -Iinclude
+INCLUDE = -I$(JAVA_DIR)/include -I$(JAVA_DIR)/include/linux -Iinclude -fPIC
.SUFFIXES: .java
--- a/lsflib/tools/Makefile
+++ b/lsflib/tools/Makefile
@@ -5,7 +5,7 @@
RM = rm -f
CFLAGS = -Wall -Wstrict-prototypes
INCLUDE = -I/usr/local/include
- LDFLAGS = -L/usr/local/lib/ -llsf -Wl,--rpath,lib
+ LDFLAGS = -L/usr/local/lib/ -llsf -lcrypto -Wl,--rpath,lib
OBJECTS = cpuid.o
OBJECTS += main.o
@@ -21,10 +21,10 @@
all: progs
progs: $(OBJECTS)
- $(CC) $(LDFLAGS) digest.o -o digest
- $(CC) $(LDFLAGS) dump.o -o dump
- $(CC) $(LDFLAGS) cpuid.o main.o -o cpuid
- $(CC) $(LDFLAGS) list.o -o list
+ $(CC) digest.o -o digest $(LDFLAGS)
+ $(CC) dump.o -o dump $(LDFLAGS)
+ $(CC) cpuid.o main.o -o cpuid $(LDFLAGS)
+ $(CC) list.o -o list $(LDFLAGS)
$(STRIP) digest
$(STRIP) cpuid
--- a/pmc/Makefile
+++ b/pmc/Makefile
@@ -22,7 +22,7 @@
$(TARGET): $(OBJECTS)
- $(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) -o $@
+ $(CC) $(CFLAGS) $(OBJECTS) -o $@ $(LDFLAGS)
.PHONY: clean