From 274b12a6cdad58431c985400449d80306fb12c7d Mon Sep 17 00:00:00 2001 From: Minero Aoki Date: Sun, 21 Jun 2009 08:14:50 +0000 Subject: [PATCH] * net/loveruby/cflat/compiler/Options.java: rename option: --readonly-plt -> --readonly-got. git-svn-id: file:///Users/aamine/c/gitwork/public/cbc/trunk@4297 1b9489fe-b721-0410-924e-b54b9192deb8 --- ChangeLog | 5 +++++ net/loveruby/cflat/compiler/Options.java | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e7f8010..5499013 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jun 21 17:14:19 2009 Minero Aoki + + * net/loveruby/cflat/compiler/Options.java: rename option: + --readonly-plt -> --readonly-got. + Sun Jun 21 03:48:12 2009 Minero Aoki * net/loveruby/cflat/sysdep/GNULinker.java: parameterize linker diff --git a/net/loveruby/cflat/compiler/Options.java b/net/loveruby/cflat/compiler/Options.java index 4d3e027..dbd18a1 100644 --- a/net/loveruby/cflat/compiler/Options.java +++ b/net/loveruby/cflat/compiler/Options.java @@ -197,7 +197,7 @@ class Options { else if (arg.equals("-pie")) { ldOptions.generatingPIE = true; } - else if (arg.equals("--readonly-plt")) { + else if (arg.equals("--readonly-got")) { addLdArg("-z"); addLdArg("combreloc"); addLdArg("-z"); @@ -375,7 +375,7 @@ class Options { out.println(" -shared Generates shared library rather than executable."); out.println(" -static Linkes only with static libraries."); out.println(" -pie Generates PIE."); - out.println(" --readonly-plt Generates read-only PLT."); + out.println(" --readonly-got Generates read-only GOT (ld -z combreloc -z now -z relro)."); out.println(" -nostartfiles Do not link startup files."); out.println(" -nodefaultlibs Do not link default libraries."); out.println(" -nostdlib Enables -nostartfiles and -nodefaultlibs.");