build changes for linux/macos

diff --git a/rgrep/build/linux/i386/Makefile b/rgrep/build/linux/i386/Makefile
index 978ea8d..af54eb4 100644 (file)
--- a/rgrep/build/linux/i386/Makefile
+++ b/rgrep/build/linux/i386/Makefile
@@ -2,17 +2,19 @@ ARCHDIR = $(shell basename $(shell pwd))
 OUTDIR = out
 OS = $(shell uname | tr "[:upper:]" "[:lower:]")
 SRCDIR = ../../../..
-
+MACH = -m32
 
 CC = gcc
 AR = ar
+
+CFLAGS = $(MACH)
 ifeq ($(BLDCFG), release)
-CFLAGS = -O3
+CFLAGS += -O3
 else
 ifeq ($(BLDCFG), profile)
-CFLAGS = -O0 -pg
+CFLAGS += -O0 -pg
 else
-CFLAGS = -g -O0 -Wall 
+CFLAGS += -g -O0 -Wall 
 endif
 endif
 
@@ -20,9 +22,7 @@ ifeq ($(CCBLD), yes)
 CFLAGS += -fprofile-arcs -ftest-coverage
 endif
 
-CFLAGS += $(MACH) $(INCLUDE)
-
-CFLAGS := $(CFLAGS)
+CFLAGS += $(INCLUDE)
 LDFLAGS = $(MACH)
 
 

diff --git a/rgrep/build/linux/rgrep.mk b/rgrep/build/linux/rgrep.mk
index 10af5a0..a7a704f 100644 (file)
--- a/rgrep/build/linux/rgrep.mk
+++ b/rgrep/build/linux/rgrep.mk
@@ -17,7 +17,7 @@ RPAGREP       = rgrep
 all : $(OUTDIR) $(OUTDIR)/$(RPAGREP)
 
 $(OUTDIR)/$(RPAGREP) : $(OBJECTS)
-       $(CC) $(ARCH) -o $@ $^ $(LIBS)
+       $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
 
 
 $(OUTDIR)/%.o: $(RGREP_SRCDIR)/%.c

diff --git a/rgrep/build/linux/x86_64/Makefile b/rgrep/build/linux/x86_64/Makefile
index 978ea8d..efc6949 100644 (file)
--- a/rgrep/build/linux/x86_64/Makefile
+++ b/rgrep/build/linux/x86_64/Makefile
@@ -2,17 +2,19 @@ ARCHDIR = $(shell basename $(shell pwd))
 OUTDIR = out
 OS = $(shell uname | tr "[:upper:]" "[:lower:]")
 SRCDIR = ../../../..
-
+MACH = -m64
 
 CC = gcc
 AR = ar
+
+CFLAGS = $(MACH)
 ifeq ($(BLDCFG), release)
-CFLAGS = -O3
+CFLAGS += -O3
 else
 ifeq ($(BLDCFG), profile)
-CFLAGS = -O0 -pg
+CFLAGS += -O0 -pg
 else
-CFLAGS = -g -O0 -Wall 
+CFLAGS += -g -O0 -Wall 
 endif
 endif
 
@@ -20,9 +22,7 @@ ifeq ($(CCBLD), yes)
 CFLAGS += -fprofile-arcs -ftest-coverage
 endif
 
-CFLAGS += $(MACH) $(INCLUDE)
-
-CFLAGS := $(CFLAGS)
+CFLAGS += $(INCLUDE)
 LDFLAGS = $(MACH)
 
 

diff --git a/rjs/build/darwin/i386/Makefile b/rjs/build/darwin/i386/Makefile
index 91ff4e9..d9d48bf 100644 (file)
--- a/rjs/build/darwin/i386/Makefile
+++ b/rjs/build/darwin/i386/Makefile
@@ -3,10 +3,13 @@ ARCHDIR = $(shell basename $(shell pwd))
 OUTDIR = out
 OS = $(shell uname | tr "[:upper:]" "[:lower:]")
 INCLUDE = -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR)
+ELFARCH = elf32-i386
+BINARCH = i386
 
 CC = gcc
 AR = ar
 LD = ld
+OC = objcopy
 
 ifeq ($(BLDCFG), release)
 CFLAGS := -fPIC -O3

diff --git a/rjs/build/darwin/rjs.mk b/rjs/build/darwin/rjs.mk
index 8bd3d1f..3ca8f61 100644 (file)
--- a/rjs/build/darwin/rjs.mk
+++ b/rjs/build/darwin/rjs.mk
@@ -43,7 +43,7 @@ $(RJS_SO): $(RJS_OBJECTS)
        $(CC) $(LDFLAGS) -shared -Wl,-soname,librjs.so -o $@ $^
 
 $(OUTDIR)/%.o: $(RJS_SRCDIR)/%.rpa
-       $(LD) -r -b binary -o $(OUTDIR)/$*.o $(RJS_SRCDIR)/$*.rpa
+       $(OC) --input binary --output $(ELFARCH) --binary-architecture $(BINARCH) $(RJS_SRCDIR)/$*.rpa $(OUTDIR)/$*.o
 
 $(OUTDIR):
        @mkdir $(OUTDIR)

diff --git a/rjs/build/linux/i386/Makefile b/rjs/build/linux/i386/Makefile
index 91ff4e9..50cf9a8 100644 (file)
--- a/rjs/build/linux/i386/Makefile
+++ b/rjs/build/linux/i386/Makefile
@@ -3,22 +3,26 @@ ARCHDIR = $(shell basename $(shell pwd))
 OUTDIR = out
 OS = $(shell uname | tr "[:upper:]" "[:lower:]")
 INCLUDE = -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR)
+MACH = -m32
+ELFARCH = elf32-i386
+BINARCH = i386
 
 CC = gcc
 AR = ar
 LD = ld
+OC = objcopy
 
 ifeq ($(BLDCFG), release)
-CFLAGS := -fPIC -O3
+CFLAGS := $(MACH) -fPIC -O3
 else
-CFLAGS := -fPIC -O0 -g -Wall 
+CFLAGS := $(MACH) -fPIC -O0 -g -Wall 
 endif
 
 ifeq ($(CCBLD), yes)
 CFLAGS += -fprofile-arcs -ftest-coverage
 endif
 
-CFLAGS += $(MACH) $(INCLUDE)
+CFLAGS += $(INCLUDE)
 LDFLAGS := $(MACH)
 
 

diff --git a/rjs/build/linux/rjs.mk b/rjs/build/linux/rjs.mk
index a2aef19..c441a75 100644 (file)
--- a/rjs/build/linux/rjs.mk
+++ b/rjs/build/linux/rjs.mk
@@ -33,7 +33,7 @@ all: $(OUTDIR) $(RJS_LIB)
 endif
 
 $(RJS_EXEC) : $(RJSEXEC_OBJECTS) $(RJS_LIB) $(RJS_OBJECTS)
-       $(CC) $(ARCH) -o $@ $< $(LIBS)
+       $(CC) $(LDFLAGS) -o $@ $< $(LIBS)
 
 $(OUTDIR)/%.o: $(RJS_SRCDIR)/%.c
        $(CC) $(CFLAGS) -o $(OUTDIR)/$*.o -c $(RJS_SRCDIR)/$*.c
@@ -48,7 +48,7 @@ $(RJS_SO): $(RJS_OBJECTS)
        $(CC) $(LDFLAGS) -shared -Wl,-soname,librjs.so -o $@ $^
 
 $(OUTDIR)/%.o: $(RJS_SRCDIR)/%.rpa
-       $(LD) -r -b binary -o $(OUTDIR)/$*.o $(RJS_SRCDIR)/$*.rpa
+       $(OC) --input binary --output $(ELFARCH) --binary-architecture $(BINARCH) $(RJS_SRCDIR)/$*.rpa $(OUTDIR)/$*.o
 
 $(OUTDIR):
        @mkdir $(OUTDIR)
@@ -61,6 +61,7 @@ clean:
        @rm -f $(RJS_LIB)
        @rm -f $(RJS_SO)
        @rm -f $(RJS_OBJECTS)
+       @rm -f $(RJS_EXEC)
        @rm -f *~
        @rm -f $(SRCDIR)/*~
 

diff --git a/rjs/build/linux/x86_64/Makefile b/rjs/build/linux/x86_64/Makefile
index 91ff4e9..ca7efbe 100644 (file)
--- a/rjs/build/linux/x86_64/Makefile
+++ b/rjs/build/linux/x86_64/Makefile
@@ -3,22 +3,26 @@ ARCHDIR = $(shell basename $(shell pwd))
 OUTDIR = out
 OS = $(shell uname | tr "[:upper:]" "[:lower:]")
 INCLUDE = -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR)
+MACH = -m64
+ELFARCH = elf64-x86-64
+BINARCH = i386:x86-64
 
 CC = gcc
 AR = ar
 LD = ld
+OC = objcopy
 
 ifeq ($(BLDCFG), release)
-CFLAGS := -fPIC -O3
+CFLAGS := $(MACH) -fPIC -O3
 else
-CFLAGS := -fPIC -O0 -g -Wall 
+CFLAGS := $(MACH) -fPIC -O0 -g -Wall 
 endif
 
 ifeq ($(CCBLD), yes)
 CFLAGS += -fprofile-arcs -ftest-coverage
 endif
 
-CFLAGS += $(MACH) $(INCLUDE)
+CFLAGS += $(INCLUDE)
 LDFLAGS := $(MACH)
 
 

diff --git a/rlib/build/linux/i386/Makefile b/rlib/build/linux/i386/Makefile
index 0bafae4..09876c0 100644 (file)
--- a/rlib/build/linux/i386/Makefile
+++ b/rlib/build/linux/i386/Makefile
@@ -3,19 +3,21 @@ ARCHDIR = $(shell basename $(shell pwd))
 OUTDIR = out
 OS = $(shell uname | tr "[:upper:]" "[:lower:]")
 INCLUDE = -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR)
+MACH = -m32
 
 CC = gcc
 AR = ar
 LD = ld
 
+CFLAGS := $(MACH)
 ifeq ($(BLDCFG), release)
-CFLAGS := -fPIC -O3
+CFLAGS += -fPIC -O3
 else 
 ifeq ($(BLDCFG), profile)
-CFLAGS := -fPIC -O0 -pg -Wall 
+CFLAGS += -fPIC -O0 -pg -Wall
 CFLAGS += -DR_DEBUG_MEMALLOC
 else
-CFLAGS := -fPIC -O0 -g -Wall 
+CFLAGS += -fPIC -O0 -g -Wall
 CFLAGS += -DR_DEBUG_MEMALLOC
 endif
 endif
@@ -24,7 +26,7 @@ ifeq ($(CCBLD), yes)
 CFLAGS += -fprofile-arcs -ftest-coverage
 endif
 
-CFLAGS += $(MACH) $(INCLUDE)
+CFLAGS +=  $(INCLUDE)
 LDFLAGS := $(MACH)
 
 include $(SRCDIR)/build/$(OS)/include.mk

diff --git a/rlib/build/linux/x86_64/Makefile b/rlib/build/linux/x86_64/Makefile
index 0bafae4..f55e903 100644 (file)
--- a/rlib/build/linux/x86_64/Makefile
+++ b/rlib/build/linux/x86_64/Makefile
@@ -3,19 +3,21 @@ ARCHDIR = $(shell basename $(shell pwd))
 OUTDIR = out
 OS = $(shell uname | tr "[:upper:]" "[:lower:]")
 INCLUDE = -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR)
+MACH = -m64
 
 CC = gcc
 AR = ar
 LD = ld
 
+CFLAGS := $(MACH)
 ifeq ($(BLDCFG), release)
-CFLAGS := -fPIC -O3
+CFLAGS += -fPIC -O3
 else 
 ifeq ($(BLDCFG), profile)
-CFLAGS := -fPIC -O0 -pg -Wall 
+CFLAGS += -fPIC -O0 -pg -Wall
 CFLAGS += -DR_DEBUG_MEMALLOC
 else
-CFLAGS := -fPIC -O0 -g -Wall 
+CFLAGS += -fPIC -O0 -g -Wall
 CFLAGS += -DR_DEBUG_MEMALLOC
 endif
 endif
@@ -24,7 +26,7 @@ ifeq ($(CCBLD), yes)
 CFLAGS += -fprofile-arcs -ftest-coverage
 endif
 
-CFLAGS += $(MACH) $(INCLUDE)
+CFLAGS +=  $(INCLUDE)
 LDFLAGS := $(MACH)
 
 include $(SRCDIR)/build/$(OS)/include.mk

diff --git a/rpa/build/linux/i386/Makefile b/rpa/build/linux/i386/Makefile
index 68f3657..06a4a53 100644 (file)
--- a/rpa/build/linux/i386/Makefile
+++ b/rpa/build/linux/i386/Makefile
@@ -3,23 +3,25 @@ ARCHDIR = $(shell basename $(shell pwd))
 OUTDIR = out
 OS = $(shell uname | tr "[:upper:]" "[:lower:]")
 INCLUDE = -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR)
+MACH = -m32
 
 CC = gcc
 AR = ar
 LD = ld
 
+CFLAGS := $(MACH)
 ifeq ($(BLDCFG), release)
-CFLAGS := -fPIC -O3
+CFLAGS += -fPIC -O3
 else
-CFLAGS := -fPIC -O0 -g -Wall 
+CFLAGS += -fPIC -O0 -g -Wall 
 endif
 
 ifeq ($(CCBLD), yes)
 CFLAGS += -fprofile-arcs -ftest-coverage
 endif
 
-CFLAGS += $(MACH) $(INCLUDE)
+CFLAGS += $(INCLUDE)
 LDFLAGS := $(MACH)
 
-include ../../../../build/$(OS)/include.mk
+include $(SRCDIR)/build/$(OS)/include.mk
 include ../rpa.mk

diff --git a/rpa/build/linux/x86_64/Makefile b/rpa/build/linux/x86_64/Makefile
index 86d3f9d..1a333c0 100644 (file)
--- a/rpa/build/linux/x86_64/Makefile
+++ b/rpa/build/linux/x86_64/Makefile
@@ -3,22 +3,24 @@ ARCHDIR = $(shell basename $(shell pwd))
 OUTDIR = out
 OS = $(shell uname | tr "[:upper:]" "[:lower:]")
 INCLUDE = -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR)
+MACH = -m64
 
 CC = gcc
 AR = ar
 LD = ld
 
+CFLAGS := $(MACH)
 ifeq ($(BLDCFG), release)
-CFLAGS := -fPIC -O3
+CFLAGS += -fPIC -O3
 else
-CFLAGS := -fPIC -O0 -g -Wall 
+CFLAGS += -fPIC -O0 -g -Wall 
 endif
 
 ifeq ($(CCBLD), yes)
 CFLAGS += -fprofile-arcs -ftest-coverage
 endif
 
-CFLAGS += $(MACH) $(INCLUDE)
+CFLAGS += $(INCLUDE)
 LDFLAGS := $(MACH)
 
 include $(SRCDIR)/build/$(OS)/include.mk

diff --git a/rvm/build/linux/i386/Makefile b/rvm/build/linux/i386/Makefile
index ace6ca2..0b1cbe9 100644 (file)
--- a/rvm/build/linux/i386/Makefile
+++ b/rvm/build/linux/i386/Makefile
@@ -3,18 +3,20 @@ ARCHDIR = $(shell basename $(shell pwd))
 OUTDIR = out
 OS = $(shell uname | tr "[:upper:]" "[:lower:]")
 INCLUDE = -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR)
+MACH = -m32
 
 CC = gcc
 AR = ar
 LD = ld
 
+CFLAGS += $(MACH)
 ifeq ($(BLDCFG), release)
-CFLAGS := -fPIC -O3
+CFLAGS += -fPIC -O3
 else
 ifeq ($(BLDCFG), profile)
-CFLAGS := -fPIC -O0 -pg -Wall 
+CFLAGS += -fPIC -O0 -pg -Wall 
 else
-CFLAGS := -fPIC -O0 -g -Wall 
+CFLAGS += -fPIC -O0 -g -Wall 
 endif
 endif
 
@@ -23,7 +25,7 @@ CFLAGS += -fprofile-arcs -ftest-coverage
 endif
 
 
-CFLAGS += $(MACH) $(INCLUDE)
+CFLAGS += $(INCLUDE)
 LDFLAGS := $(MACH)
 
 include $(SRCDIR)/build/$(OS)/include.mk

diff --git a/rvm/build/linux/x86_64/Makefile b/rvm/build/linux/x86_64/Makefile
index ace6ca2..a64eff9 100644 (file)
--- a/rvm/build/linux/x86_64/Makefile
+++ b/rvm/build/linux/x86_64/Makefile
@@ -3,18 +3,20 @@ ARCHDIR = $(shell basename $(shell pwd))
 OUTDIR = out
 OS = $(shell uname | tr "[:upper:]" "[:lower:]")
 INCLUDE = -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR)
+MACH = -m64
 
 CC = gcc
 AR = ar
 LD = ld
 
+CFLAGS += $(MACH)
 ifeq ($(BLDCFG), release)
-CFLAGS := -fPIC -O3
+CFLAGS += -fPIC -O3
 else
 ifeq ($(BLDCFG), profile)
-CFLAGS := -fPIC -O0 -pg -Wall 
+CFLAGS += -fPIC -O0 -pg -Wall 
 else
-CFLAGS := -fPIC -O0 -g -Wall 
+CFLAGS += -fPIC -O0 -g -Wall 
 endif
 endif
 
@@ -23,7 +25,7 @@ CFLAGS += -fprofile-arcs -ftest-coverage
 endif
 
 
-CFLAGS += $(MACH) $(INCLUDE)
+CFLAGS += $(INCLUDE)
 LDFLAGS := $(MACH)
 
 include $(SRCDIR)/build/$(OS)/include.mk

diff --git a/tests/testmisc/build/linux/i386/Makefile b/tests/testmisc/build/linux/i386/Makefile
index d1ea48f..22e06b7 100644 (file)
--- a/tests/testmisc/build/linux/i386/Makefile
+++ b/tests/testmisc/build/linux/i386/Makefile
@@ -2,7 +2,7 @@ ARCHDIR = $(shell basename $(shell pwd))
 OUTDIR = out
 OS = $(shell uname | tr "[:upper:]" "[:lower:]")
 SRCDIR = ../../../../..
-
+MACH = -m32
 
 CC = gcc
 AR = ar

diff --git a/tests/testmisc/build/linux/x86_64/Makefile b/tests/testmisc/build/linux/x86_64/Makefile
index d1ea48f..afe6f4e 100644 (file)
--- a/tests/testmisc/build/linux/x86_64/Makefile
+++ b/tests/testmisc/build/linux/x86_64/Makefile
@@ -2,7 +2,7 @@ ARCHDIR = $(shell basename $(shell pwd))
 OUTDIR = out
 OS = $(shell uname | tr "[:upper:]" "[:lower:]")
 SRCDIR = ../../../../..
-
+MACH = -m64
 
 CC = gcc
 AR = ar

diff --git a/tests/testrjs/build/linux/i386/Makefile b/tests/testrjs/build/linux/i386/Makefile
index d629c1d..82589ef 100644 (file)
--- a/tests/testrjs/build/linux/i386/Makefile
+++ b/tests/testrjs/build/linux/i386/Makefile
@@ -2,7 +2,7 @@ ARCHDIR = $(shell basename $(shell pwd))
 OUTDIR = out
 OS = $(shell uname | tr "[:upper:]" "[:lower:]")
 SRCDIR = ../../../../..
-
+MACH = -m32
 
 CC = gcc
 AR = ar

diff --git a/tests/testrjs/build/linux/x86_64/Makefile b/tests/testrjs/build/linux/x86_64/Makefile
index d629c1d..f2fb1cb 100644 (file)
--- a/tests/testrjs/build/linux/x86_64/Makefile
+++ b/tests/testrjs/build/linux/x86_64/Makefile
@@ -2,7 +2,7 @@ ARCHDIR = $(shell basename $(shell pwd))
 OUTDIR = out
 OS = $(shell uname | tr "[:upper:]" "[:lower:]")
 SRCDIR = ../../../../..
-
+MACH = -m64
 
 CC = gcc
 AR = ar

diff --git a/tests/testrpa/build/linux/i386/Makefile b/tests/testrpa/build/linux/i386/Makefile
index 1598920..7b11aef 100644 (file)
--- a/tests/testrpa/build/linux/i386/Makefile
+++ b/tests/testrpa/build/linux/i386/Makefile
@@ -2,7 +2,7 @@ ARCHDIR = $(shell basename $(shell pwd))
 OUTDIR = out
 OS = $(shell uname | tr "[:upper:]" "[:lower:]")
 SRCDIR = ../../../../..
-
+MACH = -m32
 
 CC = gcc
 AR = ar

diff --git a/tests/testrpa/build/linux/x86_64/Makefile b/tests/testrpa/build/linux/x86_64/Makefile
index 1598920..ebad7dc 100644 (file)
--- a/tests/testrpa/build/linux/x86_64/Makefile
+++ b/tests/testrpa/build/linux/x86_64/Makefile
@@ -2,7 +2,7 @@ ARCHDIR = $(shell basename $(shell pwd))
 OUTDIR = out
 OS = $(shell uname | tr "[:upper:]" "[:lower:]")
 SRCDIR = ../../../../..
-
+MACH = -m64
 
 CC = gcc
 AR = ar